diff --git a/config/fish/config.fish b/config/fish/config.fish
index ec61573..d204dfa 100644
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -11,7 +11,15 @@ if [ -e $HOME/Android/Sdk ]
     set PATH $HOME/Android/Sdk/platform-tools $PATH
 end
 
-set EDITOR emacsclient -nt
+if [ -e $HOME/.cargo/bin ]
+    set PATH $HOME/.cargo/bin $PATH
+end
+
+if [ -e $HOME/go/bin ]
+    set PATH $HOME/go/bin $PATH
+end
+
+set EDITOR kak
 
 alias vim nvim
 alias v nvim