diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8ca7adf
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+fish/fish_variables
+fish/local.fish
diff --git a/fish/config.fish b/fish/config.fish
index 24f6806..28c6811 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -2,7 +2,9 @@ set -x DOTFILES $HOME/dotfiles
 
 if test -z "$FISH_SETUP_PATH"
     set -xp PATH $HOME/.pyenv/bin
+    set -xp PATH $HOME/.local/bin
     set -xp PATH $HOME/dotfiles/bin
+    set -xp PATH $HOME/bin
     set -xp PATH .
 
     set -x FISH_SETUP_PATH
@@ -21,3 +23,14 @@ end
 
 alias dc="docker-compose"
 alias drh="docker run -it --rm -v (pwd):/usr/(pwd) -w /usr/(pwd)"
+
+
+fish_vi_key_bindings
+
+
+# Include local config if present
+
+if test -r $DOTFILES/fish/local.fish
+  source $DOTFILES/fish/local.fish
+end
+