622e08ad5e40

--- a/fish/config.fish	Wed Jul 13 12:14:17 2016 +0000
+++ b/fish/config.fish	Wed Jul 13 12:29:14 2016 +0000
@@ -1,18 +1,18 @@
 # Useful functions {{{
 
-function eb; vim ~/Dropbox/bitly.txt; end
-function ed; vim ~/.vim/custom-dictionary.utf-8.add; end
-function ef; vim ~/.config/fish/config.fish; end
-function eff; vim ~/.config/fish/functions; end
-function eg; vim ~/.gitconfig; end
-function eh; vim ~/.hgrc; end
-function ei; vim ~/Dropbox/inventory.markdown; end
-function ek; vim ~/lib/dotfiles/keymando/keymandorc.rb; end
-function em; vim ~/.mutt/muttrc; end
-function es; vim ~/.slate; end
-function et; vim ~/.tmux.conf; end
-function ev; vim ~/.vimrc; end
-function ez; vim ~/lib/dotfiles/zsh; end
+function eb; nvim ~/Dropbox/bitly.txt; end
+function ed; nvim ~/.vim/custom-dictionary.utf-8.add; end
+function ef; nvim ~/.config/fish/config.fish; end
+function eff; nvim ~/.config/fish/functions; end
+function eg; nvim ~/.gitconfig; end
+function eh; nvim ~/.hgrc; end
+function ei; nvim ~/Dropbox/inventory.markdown; end
+function ek; nvim ~/lib/dotfiles/keymando/keymandorc.rb; end
+function em; nvim ~/.mutt/muttrc; end
+function es; nvim ~/.slate; end
+function et; nvim ~/.tmux.conf; end
+function ev; nvim ~/.vimrc; end
+function ez; nvim ~/lib/dotfiles/zsh; end
 
 function ..;    cd ..; end
 function ...;   cd ../..; end
@@ -80,7 +80,7 @@
 set BROWSER open
 
 set -g -x fish_greeting ''
-set -g -x EDITOR vim
+set -g -x EDITOR nvim
 set -g -x COMMAND_MODE unix2003
 set -g -x RUBYOPT rubygems
 set -g -x CLASSPATH "$CLASSPATH:/usr/local/Cellar/clojure-contrib/1.2.0/clojure-contrib.jar"

--- a/fish/functions/ep.fish	Wed Jul 13 12:14:17 2016 +0000
+++ b/fish/functions/ep.fish	Wed Jul 13 12:29:14 2016 +0000
@@ -1,3 +1,3 @@
 function ep -d "Edit .plan"
-    vim ~/.plan/README.markdown; and hg -R ~/.plan ci -m 'Update'
+    nvim ~/.plan/README.markdown; and hg -R ~/.plan ci -m 'Update'
 end

--- a/vim/custom-dictionary.utf-8.add	Wed Jul 13 12:14:17 2016 +0000
+++ b/vim/custom-dictionary.utf-8.add	Wed Jul 13 12:29:14 2016 +0000
@@ -194,3 +194,5 @@
 GC
 GGP
 GDC
+neovim
+janky