Add neovim setup

.gitignore

@@ -3,3 +3,4 @@ vim/view
 vim/.netrwhist
 vim/tmp/*
 .notebook
+vim/init.vim

.gitmodules

@@ -78,10 +78,6 @@
   path = vim/bundle/vim-airline
   url = https://github.com/vim-airline/vim-airline.git
   ignore = dirty
-[submodule "vim/bundle/vim-airline-themes"]
-	path = vim/bundle/vim-airline-themes
-	url = https://github.com/vim-airline/vim-airline.git
-  ignore = dirty
 [submodule "vim/bundle/vim-coffee-script"]
   path = vim/bundle/vim-coffee-script
   url = https://github.com/kchmck/vim-coffee-script.git
@@ -91,25 +87,25 @@
   url = https://github.com/mileszs/ack.vim.git
   ignore = dirty
 [submodule "vim/bundle/vim-bundler"]
-	path = vim/bundle/vim-bundler
-	url = https://github.com/tpope/vim-bundler.git
+  path = vim/bundle/vim-bundler
+  url = https://github.com/tpope/vim-bundler.git
   ignore = dirty
 [submodule "vim/bundle/vim-cucumber"]
   path = vim/bundle/vim-cucumber
-	url = https://github.com/tpope/vim-cucumber.git
+  url = https://github.com/tpope/vim-cucumber.git
   ignore = dirty
 [submodule "vim/bundle/tabular"]
   path = vim/bundle/tabular
   url = https://github.com/godlygeek/tabular.git
   ignore = dirty
 [submodule "vim/bundle/vim-rspec"]
-	path = vim/bundle/vim-rspec
-	url = https://github.com/tpope/vim-rspec.git
+  path = vim/bundle/vim-rspec
+  url = https://github.com/tpope/vim-rspec.git
   ignore = dirty
 [submodule "vim/bundle/tabular.vim"]
-	path = vim/bundle/tabular.vim
-	url = https://github.com/godlygeek/tabular.git
+  path = vim/bundle/tabular.vim
+  url = https://github.com/godlygeek/tabular.git
   ignore = dirty
 [submodule "vim/bundle/vim-airline-themes"]
-	path = vim/bundle/vim-airline-themes
-	url = https://github.com/vim-airline/vim-airline-themes.git
+  path = vim/bundle/vim-airline-themes
+  url = https://github.com/vim-airline/vim-airline-themes.git

bashrc

@@ -59,12 +59,7 @@ fi
 
 # allow ctrl+S in vim to save files, ie pass the command to vim when vim is open.
 export EDITOR="vim"
-vim() {
-  local STTYOPTS="$(stty --save)"
-  stty stop '' -ixoff
-  command vim --servername vim "$@"
-  stty "$STTYOPTS"
-}
+alias vim="nvim"
 
 dot_sync() {
   current_branch=$(git branch | grep '\*.*' | cut -d '*' -f 2 | tr -d ' ')

bin/manage_dotfiles.sh

@@ -74,6 +74,10 @@ install_dotfiles() {
     link "$HOME" "$conf"
   done
 
+  # For neovim
+  ln -sn $DIR/vim $HOME/.config/nvim
+  ln -sn $DIR/vimrc $HOME/.config/nvim/init.vim
+
   # Finish up linking and directory stuff
   ln -fsn "$DIR"/vim/pathogen/autoload "$DIR"/vim/
   mkdir -p "$DIR"/vim/tmp/{backup,swap,undo}

vim/vim/bundle/vim-airline-themes

@@ -0,0 +1 @@
+Subproject commit 97a042a57af7f04e25fddb6e694d75be1d55be02

vimrc

@@ -309,13 +309,15 @@ function! DeleteTrailingWS()
 endfunction
 autocmd BufWrite * :call DeleteTrailingWS()
 
-" Allow the use of ALT as a function key.
-let c='a'
-while c <= 'z'
-  exec "set <A-".c.">=\e".c
-  exec "imap \e".c." <A-".c.">"
-  let c = nr2char(1+char2nr(c))
-endw
+if !has("nvim")
+  " Allow the use of ALT as a function key.
+  let c='a'
+  while c <= 'z'
+    exec "set <A-".c.">=\e".c
+    exec "imap \e".c." <A-".c.">"
+    let c = nr2char(1+char2nr(c))
+  endw
+endif
 
 " Close current window or quit vim if no active windows
 autocmd BufDelete * if len(filter(range(1, bufnr('$')), '!empty(bufname(v:val)) && buflisted(v:val)')) == 1 | q | endif

zshrc

@@ -21,13 +21,8 @@ eval "$(hub alias -s)"
 
 # Allow ctrl+S in vim to save files, ie pass
 # the command to vim when vim is open.
-vim() {
-  local STTYOPTS="$(stty --save)"
-  stty stop '' -ixoff
-  command vim --servername vim "$@"
-  stty "$STTYOPTS"
-}
 export EDITOR="vim"
+alias vim="nvim"
 
 dot_sync() {
   current_branch=$(git branch | grep '\*.*' | cut -d '*' -f 2 | tr -d ' ')