diff options
| author | Florian Fischer <florian.fl.fischer@fau.de> | 2015-11-12 14:52:00 +0100 |
|---|---|---|
| committer | Florian Fischer <florian.fl.fischer@fau.de> | 2015-11-27 02:32:50 +0100 |
| commit | 684309ec7a64daa85c24058af771e86bfa840573 (patch) | |
| tree | e9fb3e853541ddeb7737edd499054888caf1f48f | |
| parent | de962a6d97282a3f90f5c697e309c33d1b37cebd (diff) | |
| download | dotfiles-684309ec7a64daa85c24058af771e86bfa840573.tar.gz dotfiles-684309ec7a64daa85c24058af771e86bfa840573.zip | |
reorganise fish setup and add wd plugin
1) reduce symlinking
2) add wd plugin as git submodule
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | config/fish/config.fish | 11 | ||||
| m--------- | config/fish/wd | 0 |
4 files changed, 13 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index 3cfea36..52ef865 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [submodule "vim/bundle/nerdcommenter"] path = vim/bundle/nerdcommenter url = https://github.com/scrooloose/nerdcommenter.git +[submodule "config/fish/wd"] + path = config/fish/wd + url = https://github.com/fischerling/plugin-wd @@ -21,7 +21,6 @@ terminator_t: config/terminator/config fish_t: config/fish mkdir -p ~/.config/fish ln -s $(PWD)/config/fish/config.fish ~/.config/fish/config.fish - ln -s $(PWD)/config/fish/functions ~/.config/fish/functions zsh_t: zshrc ln -s $(PWD)/zshrc ~/.zshrc diff --git a/config/fish/config.fish b/config/fish/config.fish index d347215..52e5992 100644 --- a/config/fish/config.fish +++ b/config/fish/config.fish @@ -1,5 +1,14 @@ +# autoload functions and completions in .dotfiles +set fish_function_path /home/fischerling/.dotfiles/config/fish/functions $fish_function_path +set fish_completion_path /home/fischerling/.dotfiles/config/fish/completions $fish_completion_path + + # add git-alias subdirectory to functions path -set fish_function_path /home/fischerling/.config/fish/functions/git-alias $fish_function_path +set fish_function_path /home/fischerling/.dotfiles/config/fish/functions/git-alias $fish_function_path + +# include wd +set fish_function_path /home/fischerling/.dotfiles/config/fish/wd/functions $fish_function_path +set fish_completion_path /home/fischerling/.dotfiles/config/fish/wd/completions $fish_completion_path if not set -q __fish_git_prompt_show_informative_status set -Ux __fish_git_prompt_show_informative_status true diff --git a/config/fish/wd b/config/fish/wd new file mode 160000 +Subproject 8fe5afd6e5effe1ea78dacbeabfb66a36056f24 |