From 684309ec7a64daa85c24058af771e86bfa840573 Mon Sep 17 00:00:00 2001
From: Florian Fischer <florian.fl.fischer@fau.de>
Date: Thu, 12 Nov 2015 14:52:00 +0100
Subject: reorganise fish setup and add wd plugin

1) reduce symlinking
2) add wd plugin as git submodule
---
 .gitmodules             |  3 +++
 Makefile                |  1 -
 config/fish/config.fish | 11 ++++++++++-
 config/fish/wd          |  1 +
 4 files changed, 14 insertions(+), 2 deletions(-)
 create mode 160000 config/fish/wd

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
diff --git a/Makefile b/Makefile
index d4b53f6..ceab328 100644
--- a/Makefile
+++ b/Makefile
@@ -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
index 0000000..8fe5afd
--- /dev/null
+++ b/config/fish/wd
@@ -0,0 +1 @@
+Subproject commit 8fe5afd6e5effe1ea78dacbeabfb66a36056f249
-- 
cgit v1.2.3