iTerm2 integration for Fish

fish/config.fish

@@ -9,10 +9,11 @@ set -g -x ALTERNATE_EDITOR "vim"
 # Add ~/bin to PATH
 set -g -x PATH ~/bin $PATH
 
-# Machine-local config
-if test -e ~/.config/fish/local.fish
-  source ~/.config/fish/local.fish
-end
+# Disable Fish greeting banner
+set --universal fish_greeting
+
+# iTerm2 integration
+source ~/.config/fish/fish_startup.in
 
 # OS-specific configuration
 switch (uname)
@@ -24,8 +25,10 @@ switch (uname)
     echo 'Unknown OS. No specifc config'
 end
 
-# Disable Fish greeting banner
-set --universal fish_greeting
+# Machine-local config
+if test -e ~/.config/fish/local.fish
+  source ~/.config/fish/local.fish
+end
 
 # ========
 # Autojump
@@ -47,11 +50,6 @@ function ip
   curl icanhazip.com
 end
 
-# edit config.fish (this file)
-function cf
-  ec ~/.config/fish/config.fish
-end
-
 # reload your Fish config
 function src
   source ~/.config/fish/config.fish; and clear