Add Neovim navigation keybindings

.gitignore

@@ -4,3 +4,6 @@ vim/*
 .vim/tmp/
 .vim/tags
 ctags*
+*.un~
+.claude/
+ctags-patterns-for-javascript/

Rakefile

@@ -12,13 +12,13 @@ task :install do
   /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
   brew install direnv
   brew install ripgrep bat fzf
-  brew install vim --with-lua #https://github.com/Shougo/neocomplete.vim#vim-for-mac-os-x
+  brew install vim neovim
   `curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
       https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim`
 
   system %Q{ cp -r $HOME/dotfiles/bin/* /usr/local/bin/}
   replace_all = ENV['REPLACE_ALL'] || false
-  files = Dir['*'] - %w[Rakefile README.md LICENSE"]
+  files = Dir['*'] - %w[Rakefile README.md LICENSE]
   files.each do |file|
     system %Q{mkdir -p "$HOME/.#{File.dirname(file)}"} if file =~ /\//
     if File.exist?(File.join(ENV['PWD'], "#{file.sub(/\.erb$/, '')}"))
@@ -65,9 +65,6 @@ def link_file(file)
     File.open(File.join(ENV['HOME'], ".#{file.sub(/\.erb$/, '')}"), 'w') do |new_file|
     new_file.write ERB.new(File.read(file)).result(binding)
   end
-  elsif file =~ /zshrc$/ # copy zshrc instead of link
-    puts "copying ~/.#{file}"
-    system %Q{cp "$PWD/#{file}" "$HOME/.#{file}"}
   else
     puts "linking ~/.#{file}"
     system %Q{ln -fs "$PWD/#{file}" "$HOME/.#{file}"}

bashrc

@@ -15,12 +15,10 @@ if [ -f ~/.git-prompt.sh ]; then
   export PS1='\h \w$(__git_ps1 "(%s)") \$ '
 fi
 
-# Fix tmux vim color
 export LESS='-NR'
 alias more='less'
 
 alias bower='noglob bower'
-alias tmux="TERM=screen-256color-bce $HOME/dotfiles/bin/tmux"
 
 # find a file and less it
 function lgrep {
@@ -42,7 +40,7 @@ fbr() {
   local branches branch
   branches=$(git for-each-ref --count=30 --sort=-committerdate refs/heads/ --format="%(refname:short)") &&
   branch=$(echo "$branches" |
-           fzf-tmux -d $(( 2 + $(wc -l <<< "$branches") )) +m) &&
+           fzf -d $(( 2 + $(wc -l <<< "$branches") )) +m) &&
   git checkout $(echo "$branch" | sed "s/.* //" | sed "s#remotes/[^/]*/##")
 }
 fshow() {
@@ -140,8 +138,12 @@ function cdpc {
   eval "$(docker-machine env $1)"
 }
 
+# nvm: if running under zsh, ~/.zshrc has already set up a lazy loader.
+# Only source nvm eagerly for real bash sessions.
 export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+if [ -z "$ZSH_NAME" ]; then
+  [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+  [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
+fi
 
 [ -z "$ZSH_NAME" ] && [ -f ~/.fzf.bash ] && source ~/.fzf.bash

gitconfig

@@ -1,8 +1,7 @@
+[include]
+	path = ~/.gitconfig.local
 [github]
   user = gregory
-[user]
-	name = gregory
-	email = greg2502@gmail.com
 [alias]
   lg = log -g --format=raw --date=relative
   l  = log --format=raw --name-status --abbrev-commit --date=local
@@ -47,12 +46,6 @@
   default = simple
 [pull]
   rebase = true
-[difftool "sourcetree"]
-	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
-	path =
-[mergetool "sourcetree"]
-	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
-	trustExitCode = true
 [url "https://"]
 	insteadOf = git://
 [filter "media"]