diff --git a/fish/config.fish b/fish/config.fish
index 36c9a3d01..3c7b71aad 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -1,14 +1,26 @@
 function fish_prompt
     set_color blue
     echo -n (whoami)
-    set_color cyan
-    echo -n '@'
     set_color magenta
-    echo -n (prompt_pwd)
+    echo -n (vcprompt -f "(%s:%b%a%m)")
     set_color cyan
     echo -n '> '
 end
 
+function fish_right_prompt
+   set_color --bold yellow
+   echo -n '['
+   set_color --bold blue
+   echo -n (prompt_pwd)
+   set_color --bold yellow
+   echo -n ']'
+end
+   
+
+set -gx EDITOR emacsclient
+set -gx ALTERNATE_EDITOR emacs
+set -gx VISUAL emacsclient
+
 set fish_greeting ""
 
 set PATH /usr/local/bin ~/Library/Haskell/bin ~/bin/ /Users/vincent/Source/management-scripts/google-apps/ $PATH
diff --git a/fish/functions/edit.fish b/fish/functions/edit.fish
new file mode 100644
index 000000000..83f6eb854
--- /dev/null
+++ b/fish/functions/edit.fish
@@ -0,0 +1,3 @@
+function edit
+    emacsclient -no-wait $argv
+end
\ No newline at end of file