Try to make mac usable

.gitmodules

@@ -109,3 +109,18 @@
 [submodule "bundle/unimpaired"]
 	path = bundle/unimpaired
 	url = https://github.com/tpope/vim-unimpaired.git
+[submodule "bundle/match-up"]
+	path = bundle/match-up
+	url = https://github.com/andymass/vim-matchup.git
+[submodule "bundle/vim-ruby"]
+	path = bundle/vim-ruby
+	url = https://github.com/vim-ruby/vim-ruby.git
+[submodule "bundle/fastfold"]
+	path = bundle/fastfold
+	url = https://github.com/Konfekt/FastFold.git
+[submodule "bundle/vim-lsc"]
+	path = bundle/vim-lsc
+	url = https://github.com/natebosch/vim-lsc
+[submodule "rust.vim"]
+	path = rust.vim
+	url = https://github.com/rust-lang/rust.vim.git

init/keybindings.vim

@@ -15,17 +15,17 @@ let maplocalleader = ";"
 "vmap <leader>s  :s/
 
 " Split screen
-map <leader>v   :vsp<CR>
+"map <leader>v   :vsp<CR>
 
 " Move between screens
 "map <leader>w   ^Ww
 "map <leader>=   ^W=
 "map <leader>j   ^Wj
 "map <leader>k   ^Wk
-nmap <C-h>      <C-w>h<CR>
-nmap <C-j>      <C-w>j<CR>
-nmap <C-k>      <C-w>k<CR>
-nmap <C-l>      <C-w>l<CR>
+nmap <C-h>      <C-w>h
+nmap <C-j>      <C-w>j
+nmap <C-k>      <C-w>k
+nmap <C-l>      <C-w>l
 
 " Open .vimrc file in new tab. Think Command + , [Preferences...] but with Shift.
 "map <D-<>       :tabedit ~/.vimrc<CR>
@@ -55,8 +55,8 @@ map \           :NERDTreeToggle<CR>
 map \|          :NERDTreeFind<CR>
 
 " Previous/next quickfix file listings (e.g. search results)
-map <M-D-Down>  :cn<CR>
-map <M-D-Up>    :cp<CR>
+"map <M-D-Down>  :cn<CR>
+"map <M-D-Up>    :cp<CR>
 
 " Previous/next buffers
 map <M-D-Left>  :bp<CR>
@@ -76,16 +76,16 @@ vmap <s-tab> <gv
 "map <D-N> :FufFile **/<CR>
 
 " refresh the FuzzyFinder cache
-map <leader>rf :FufRenewCache<CR>
+"map <leader>rf :FufRenewCache<CR>
 
 " Command-T
 "map <D-N>       :CommandTFlush<CR>:CommandT<CR>
 "map <leader>f   :CommandTFlush<CR>:CommandT<CR>
 map <leader>f   :CtrlP<CR>
 
 " ctags with rails load path
-map <leader>rt  :!rails runner 'puts $LOAD_PATH.join(" ")' \| xargs /usr/local/bin/ctags -R public/javascripts<CR>
-map <leader>T   :!rails runner 'puts $LOAD_PATH.join(" ")' \| xargs rdoc -f tags<CR>
+"map <leader>rt  :!rails runner 'puts $LOAD_PATH.join(" ")' \| xargs /usr/local/bin/ctags -R public/javascripts<CR>
+"map <leader>T   :!rails runner 'puts $LOAD_PATH.join(" ")' \| xargs rdoc -f tags<CR>
 
 " Git blame
 map <leader>g   :Gblame<CR>
@@ -96,10 +96,10 @@ map <D-/>       <plug>NERDCommenterToggle
 imap <D-/>      <Esc><plug>NERDCommenterToggle i
 
 " In command-line mode, <C-A> should go to the front of the line, as in bash.
-cmap <C-A> <C-B>
+"cmap <C-A> <C-B>
 
 " Copy current file path to system pasteboard
-map <silent> <D-C> :let @* = expand("%")<CR>:echo "Copied: ".expand("%")<CR>
+map <leader>c :let @* = expand("%")<CR>:echo "Copied: ".expand("%")<CR>
 map <leader>C :let @* = expand("%").":".line(".")<CR>:echo "Copied: ".expand("%").":".line(".")<CR>
 
 " Disable middle mouse button, F1

init/options.vim

@@ -3,10 +3,14 @@ set guioptions-=T               " Remove GUI toolbar
 set guioptions-=e               " Use text tab bar, not GUI
 set guioptions-=rL              " Remove scrollbars
 set visualbell                  " Suppress audio/visual error bell
-set notimeout                   " No command timeout
 set showcmd                     " Show typed command prefixes while waiting for operator
 "set mouse=a                     " Use mouse support in XTerm/iTerm.
 
+" following line causes odd behavior when exiting insert mode. When <ESC> is
+" pressed to leave insert mode, the `-- INSERT --` marker does not go away
+" until another key is pressed
+"set notimeout                   " No command timeout
+
 set expandtab                   " Use soft tabs
 set tabstop=2                   " Tab settings
 set autoindent
@@ -37,7 +41,7 @@ set scrolloff=3                 " Scroll when the cursor is 3 lines from edge
 set cursorline                  " Highlight current line
 
 " More detailed status line
-set statusline=[%n]\ %f\ %m\ %y
+set statusline=[tab\ %{tabpagenr()}][buf\ %n]\ %f\ %m\ %y
 set statusline+=%{fugitive#statusline()} " Show git details"
 set statusline+=%{exists('g:loaded_rvm')?rvm#statusline():''} " Show RVM details"
 set statusline+=%w              " [Preview]

init/tabline.vim

@@ -22,9 +22,11 @@ if exists("+showtabline")
             let file = bufname(bufnr)
             let buftype = getbufvar(bufnr, 'buftype')
             if buftype == 'nofile'
-                if file =~ '\/.'
-                    let file = substitute(file, '.*\/\ze.', '', '')
-                endif
+              if file =~ '\/.'
+                let file = substitute(file, '.*\/\ze.', '', '')
+              endif
+            else
+              let file = pathshorten(bufname(bufnr))
             endif
             if file == ''
                 let file = '[No Name]'
@@ -41,3 +43,76 @@ if exists("+showtabline")
     set showtabline=1
     highlight link TabNum Special
 endif
+
+" set showtabline=1  " 1 to show tabline only when more than one tab is present
+" set tabline=%!MyTabLine()  " custom tab pages line
+" function! MyTabLine() " acclamation to avoid conflict
+"   let s = '' " complete tabline goes here
+"   " loop through each tab page
+"   for t in range(tabpagenr('$'))
+"     " set highlight
+"     if t + 1 == tabpagenr()
+"       let s .= '%#TabLineSel#'
+"     else
+"       let s .= '%#TabLine#'
+"     endif
+"     " set the tab page number (for mouse clicks)
+"     let s .= '%' . (t + 1) . 'T'
+"     let s .= ' '
+"     " set page number string
+"     let s .= t + 1 . ' '
+"     " get buffer names and statuses
+"     let n = ''      "temp string for buffer names while we loop and check buftype
+"     let m = 0       " &modified counter
+"     " let bc = len(tabpagebuflist(t + 1))     "counter to avoid last ' '
+"     " loop through each buffer in a tab
+" 
+"     " for b in tabpagebuflist(t + 1)
+"     "   " buffer types: quickfix gets a [Q], help gets [H]{base fname}
+"     "   " others get 1dir/2dir/3dir/fname shortened to 1/2/3/fname
+"     "   if getbufvar( b, "&buftype" ) == 'help'
+"     "     let n .= '[H]' . fnamemodify( bufname(b), ':t:s/.txt$//' )
+"     "   elseif getbufvar( b, "&buftype" ) == 'quickfix'
+"     "     let n .= '[Q]'
+"     "   else
+"     "     let n .= pathshorten(bufname(b))
+"     "   endif
+"     "   " check and ++ tab's &modified count
+"     "   if getbufvar( b, "&modified" )
+"     "     let m += 1
+"     "   endif
+"     "   " no final ' ' added...formatting looks better done later
+"     "   if bc > 1
+"     "     let n .= ' '
+"     "   endif
+"     "   let bc -= 1
+"     " endfor
+"     " add modified label [n+] where n pages in tab are modified
+"     if m > 0
+"       let s .= '[' . m . '+]'
+"     endif
+"     " select the highlighting for the buffer names
+"     " my default highlighting only underlines the active tab
+"     " buffer names.
+"     if t + 1 == tabpagenr()
+"       let s .= '%#TabLineSel#'
+"     else
+"       let s .= '%#TabLine#'
+"     endif
+"     " add buffer names
+"     if n == ''
+"       let s.= '[New]'
+"     else
+"       let s .= n
+"     endif
+"     " switch to no underlining and add final space to buffer list
+"     let s .= ' '
+"   endfor
+"   " after the last tab fill with TabLineFill and reset tab page nr
+"   let s .= '%#TabLineFill#%T'
+"   " right-align the label to close the current tab page
+"   if tabpagenr('$') > 1
+"     let s .= '%=%#TabLineFill#%999Xclose'
+"   endif
+"   return s
+" endfunction