From 75a8af2d142c0447a2bf90efd22fd9f723183021 Mon Sep 17 00:00:00 2001 From: druckdev <63563978+druckdev@users.noreply.github.com> Date: Sat, 7 Nov 2020 03:07:59 +0100 Subject: [PATCH] repo: Move fzf to non zsh-dependant location Since fzf is not really only a zsh plugin this moves it to .local/bin. I am not quite sure it will stay there. The submodule was also updated in this process. Update all links and references. Add .local/share directory that contains the man pages. By that dotbot just globs all of them and symlinks them. This makes it more modular and a bit more transparent on how an installed system looks like, just by looking through the repo structure. --- .config/zsh/plugins/fzf | 2 +- .gitmodules | 6 +++--- .local/bin/fzf | 2 +- .local/bin/fzf-repo | 1 + .local/share/man/man1/fzf-tmux.1 | 1 + .local/share/man/man1/fzf.1 | 1 + meta/install.conf.yaml | 5 +++-- 7 files changed, 11 insertions(+), 7 deletions(-) mode change 160000 => 120000 .config/zsh/plugins/fzf create mode 160000 .local/bin/fzf-repo create mode 120000 .local/share/man/man1/fzf-tmux.1 create mode 120000 .local/share/man/man1/fzf.1 diff --git a/.config/zsh/plugins/fzf b/.config/zsh/plugins/fzf deleted file mode 160000 index c144c95..0000000 --- a/.config/zsh/plugins/fzf +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c144c95cdab7dbf8a2c2430c007493813b1cad19 diff --git a/.config/zsh/plugins/fzf b/.config/zsh/plugins/fzf new file mode 120000 index 0000000..6ea2af5 --- /dev/null +++ b/.config/zsh/plugins/fzf @@ -0,0 +1 @@ +../../../.local/bin/fzf-repo/ \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index e047a91..e6af34d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,9 +34,6 @@ [submodule ".config/vim/pack/plugins/opt/vim-surround"] path = .config/vim/pack/plugins/opt/vim-surround url = https://github.com/tpope/vim-surround -[submodule ".config/zsh/plugins/fzf"] - path = .config/zsh/plugins/fzf - url = https://github.com/junegunn/fzf [submodule ".config/zsh/plugins/fzf-tab"] path = .config/zsh/plugins/fzf-tab url = https://github.com/Aloxaf/fzf-tab @@ -52,3 +49,6 @@ [submodule ".config/zsh/plugins/zsh-syntax-highlighting"] path = .config/zsh/plugins/zsh-syntax-highlighting url = https://github.com/zsh-users/zsh-syntax-highlighting.git +[submodule ".local/bin/fzf-repo"] + path = .local/bin/fzf-repo + url = https://github.com/junegunn/fzf diff --git a/.local/bin/fzf b/.local/bin/fzf index 802d228..952a193 120000 --- a/.local/bin/fzf +++ b/.local/bin/fzf @@ -1 +1 @@ -../../.config/zsh/plugins/fzf/bin/fzf \ No newline at end of file +fzf-repo/bin/fzf \ No newline at end of file diff --git a/.local/bin/fzf-repo b/.local/bin/fzf-repo new file mode 160000 index 0000000..d099941 --- /dev/null +++ b/.local/bin/fzf-repo @@ -0,0 +1 @@ +Subproject commit d099941360e061587bf7d42cd029c91650ef5a44 diff --git a/.local/share/man/man1/fzf-tmux.1 b/.local/share/man/man1/fzf-tmux.1 new file mode 120000 index 0000000..34af296 --- /dev/null +++ b/.local/share/man/man1/fzf-tmux.1 @@ -0,0 +1 @@ +../../../bin/fzf-repo/man/man1/fzf-tmux.1 \ No newline at end of file diff --git a/.local/share/man/man1/fzf.1 b/.local/share/man/man1/fzf.1 new file mode 120000 index 0000000..3e1bce9 --- /dev/null +++ b/.local/share/man/man1/fzf.1 @@ -0,0 +1 @@ +../../../bin/fzf-repo/man/man1/fzf.1 \ No newline at end of file diff --git a/meta/install.conf.yaml b/meta/install.conf.yaml index c4dbe7b..52831bc 100644 --- a/meta/install.conf.yaml +++ b/meta/install.conf.yaml @@ -37,9 +37,10 @@ create: true glob: true path: .local/bin/* - ~/.local/share/man/man1/fzf.1: + ~/.local/share/man/man1/: create: true - path: .config/zsh/plugins/fzf/man/man1/fzf.1 + glob: true + path: .local/share/man/man1/* ~/.local/share/nvim/site/pack: create: true path: .config/vim/pack