Update 5/11/16

.aliases.zsh

@@ -12,9 +12,6 @@ alias gx='gem uninstall'
 # BUNDLER
 alias bi='bundle install && restart && stop'
 
-# RSPEC
-alias rspec='bin/rspec --format VimFormatter --out quickfix.out --format progress'
-
 # RAILS
 alias restart='mkdir -p tmp && touch tmp/restart.txt'
 alias stop='spring stop 2>/dev/null'

.nvimrc

@@ -24,6 +24,7 @@ Plug 'majutsushi/tagbar'
 Plug 'mhinz/vim-grepper'
 Plug 'osyo-manga/vim-over'
 Plug 'dkprice/vim-easygrep'
+Plug 'nelstrom/vim-qargs'
 
 " Autocomplete
 Plug 'Shougo/context_filetype.vim'
@@ -130,7 +131,7 @@ set nobackup
 set noswapfile
 set lazyredraw
 set scrolloff=1
-set synmaxcol=300
+set synmaxcol=1000
 set nojoinspaces
 set nostartofline
 set wildmenu
@@ -318,7 +319,7 @@ augroup neomake_config
 
     let g:neomake_javascript_enabled_makers = ['eslint']
     let g:neomake_jsx_enabled_makers = ['eslint']
-    let g:neomake_ruby_enabled_makers = []
+    let g:neomake_ruby_enabled_makers = ['mri', 'rubocop']
     let g:neomake_open_list = 0
     let g:neomake_verbose = 0
 
@@ -636,9 +637,8 @@ augroup END
 augroup splitjoin_config
   autocmd!
 
-  " Disable temporarily as I don't use Ruby that much anymore
-  nnoremap S :SplitjoinJoin<cr>
-  nnoremap s :SplitjoinSplit<cr>
+  autocmd FileType ruby nnoremap S :SplitjoinJoin<cr>
+  autocmd FileType ruby nnoremap s :SplitjoinSplit<cr>
 augroup END
 
 augroup folding_config
@@ -733,7 +733,10 @@ augroup END
 augroup extradite_config
   autocmd!
 
-  let g:extradite_width = 80
+  let g:extradite_width = 120
+  let g:extradite_showhash = 1
+
+  autocmd FileType extradite,diff setlocal colorcolumn=0
 augroup END
 
 augroup rooter_config
@@ -811,6 +814,8 @@ augroup easygrep_config
 
   let g:EasyGrepJumpToMatch = 0
   let g:EasyGrepIgnoreCase = 0
+  let g:EasyGrepRoot = 'repository'
+
   nmap <silent> F <plug>EgMapGrepCurrentWord_V
 augroup END
 

com.googlecode.iterm2.plist

@@ -234,6 +234,8 @@
 	<string>~/Documents</string>
 	<key>NSNavPanelExpandedSizeForOpenMode</key>
 	<string>{712, 448}</string>
+	<key>NSNavPanelExpandedSizeForSaveMode</key>
+	<string>{712, 565}</string>
 	<key>NSQuotedKeystrokeBinding</key>
 	<string></string>
 	<key>NSRepeatCountBinding</key>
@@ -265,19 +267,21 @@
 		<integer>1</integer>
 	</dict>
 	<key>NSWindow Frame NSFontPanel</key>
-	<string>356 317 467 123 0 0 1440 877 </string>
+	<string>532 98 467 77 0 0 1920 1057 </string>
 	<key>NSWindow Frame Preferences</key>
 	<string>127 444 606 456 0 0 1440 900 </string>
 	<key>NSWindow Frame SUAutomaticUpdateAlert</key>
-	<string>652 663 616 174 0 0 1920 1057 </string>
+	<string>972 932 616 174 0 0 2560 1417 </string>
 	<key>NSWindow Frame SUStatusFrame</key>
 	<string>760 804 400 129 0 0 1920 1200 </string>
 	<key>NSWindow Frame SUUpdateAlert</key>
 	<string>410 382 620 392 0 0 1440 900 </string>
+	<key>NSWindow Frame SharedPreferences</key>
+	<string>456 249 796 474 0 0 2560 1440 </string>
 	<key>NSWindow Frame UKCrashReporter</key>
 	<string>99 156 592 584 0 0 1440 877 </string>
 	<key>NSWindow Frame iTerm Window 0</key>
-	<string>0 0 1440 900 0 0 1440 877 </string>
+	<string>0 0 2560 1440 0 0 2560 1417 </string>
 	<key>New Bookmarks</key>
 	<array>
 		<dict>
@@ -1083,6 +1087,8 @@
 	</dict>
 	<key>PrefsCustomFolder</key>
 	<string>/Users/mikekreeki/.dotfiles/</string>
+	<key>Print In Black And White</key>
+	<true/>
 	<key>PromptOnQuit</key>
 	<true/>
 	<key>QuitWhenAllWindowsClosed</key>
@@ -1102,7 +1108,9 @@
 	<key>SUHasLaunchedBefore</key>
 	<true/>
 	<key>SULastCheckTime</key>
-	<date>2016-06-29T13:00:09Z</date>
+	<date>2016-10-18T13:58:30Z</date>
+	<key>SUSkippedVersion</key>
+	<string>3.0.10</string>
 	<key>SavePasteHistory</key>
 	<false/>
 	<key>ShowBookmarkName</key>
@@ -1164,7 +1172,7 @@
 	<key>findRegex_iTerm</key>
 	<false/>
 	<key>iTerm Version</key>
-	<string>3.0.2</string>
+	<string>3.0.8</string>
 	<key>kCommandHistoryHasEverBeenUsed</key>
 	<true/>
 </dict>

git/.gitignore

@@ -14,6 +14,7 @@ Thumbs.db
 
 # NVM
 .node-version
+node_modules_bak
 
 # NPM
 npm-debug.log