Commits

Brodie Rao committed afed1c7

Remove unused settings and plugins

Comments (0)

Files changed (2)

 [submodule "bundle/gundo"]
 	path = bundle/gundo
 	url = https://github.com/sjl/gundo.vim.git
-[submodule "bundle/ack"]
-	path = bundle/ack
-	url = https://github.com/mileszs/ack.vim.git
 [submodule "bundle/indentpython"]
 	path = bundle/indentpython
 	url = https://github.com/brodie/indentpython.vim.git
     set mouse=a " Enable the mouse
 endif
 set ruler " Show cursor information
-set scrolloff=3
+set scrolloff=1
 set sidescroll=1
-set sidescrolloff=10
+set sidescrolloff=5
 if has("showcmd")
     set showcmd
 endif
 set textwidth=78
 if has("autocmd")
     autocmd FileType css,html,htmldjango,xhtml,xml
-                   \ setlocal shiftwidth=2 softtabstop=2
+                   \ setlocal formatoptions-=t shiftwidth=2 softtabstop=2
     autocmd FileType go,make setlocal noexpandtab shiftwidth=8 softtabstop=0
     autocmd FileType go,make let b:yaifa_disabled=1
 endif
 endif
 if has("autocmd")
     autocmd FileType python highlight PyFlakes gui=bold guibg=#aa2222
+    autocmd BufNewFile,BufRead *.t set filetype=cram
 endif
 
 " Leader bindings
 let mapleader = ","
 let maplocalleader = "\\"
-nnoremap ; :
 
 " Ctrl-P bindings
 let g:ctrlp_map = '<Leader>f'
 nnoremap <Leader>a <Esc>:Ack!<Space>
 nnoremap <Leader>n <Esc>:setlocal number!<CR>
 
-" Select (charwise) the contents of the current line, excluding indentation.
-nnoremap vv ^vg_
-
-" Keep the cursor in place while joining lines
-nnoremap J mzJ`z
-
-" Split line (sister to [J]oin lines)
-" The normal use of S is covered by cc, so don't worry about shadowing it.
-nnoremap S i<CR><Esc>^mwgk:silent! s/\v +$//<CR>:noh<CR>`w
-
-" Reformat line.
-nnoremap ql ^vg_gq
-
-" Formatting, TextMate-style
-nnoremap Q gqip
-vnoremap Q gq
-
-" HTML tag closing
-inoremap <C-_> <Space><BS><Esc>:call InsertCloseTag()<CR>a
-
 " System clipboard interaction.
 nnoremap <Leader>y "*y
 nnoremap <Leader>p <Esc>:set paste<CR>"*p<CR>:set nopaste<CR>
 nnoremap <Leader>P <Esc>:set paste<CR>"*P<CR>:set nopaste<CR>
 vnoremap <Leader>y "*ygv
 
-" Select entire buffer
-nnoremap vaa ggvGg_
-nnoremap Vaa ggVG
-
 " Emacs bindings in command line mode
 cnoremap <C-a> <Home>
 cnoremap <C-e> <End>
 inoremap <C-f> <C-x><C-f>
 inoremap <C-]> <C-x><C-]>
 
-" gi already moves to "last place you exited insert mode", so we'll map gI to
-" something similar: move to last change
-nnoremap gI `.
-
-" Ack for the last search.
-nnoremap <silent> <Leader>/ <Esc>:execute "Ack! '" . substitute(substitute(substitute(@/, "\\\\<", "\\\\b", ""), "\\\\>", "\\\\b", ""), "\\\\v", "", "") . "'"<CR>
-
 " Heresy
 inoremap <C-a> <Esc>I
 inoremap <C-e> <Esc>A
     colorscheme molokai
 endif
 
-" Enable spell checking (vim7 only)
+" Enable spell checking
 if has("spell")
     set spelllang=en_us " Global spell checking
     set spellfile=~/.vim/custom-dictionary.utf-8.add
     highlight ColorColumn ctermbg=232
 endif
 
-let g:vimroom_guibackground='#1B1E1F'
-let g:vimroom_width=79
-
 " Highlight the 80th column
 if has("autocmd") && (has("gui") || &t_Co == 256)
     function! SmartColorColumn()
 
 " GUI settings
 if has("gui")
-    set guioptions-=T " Disable toolbar
-    set guioptions-=r " Disable scrollbar
-    set guioptions-=L " Disable left-hand scrollbar
+    set guioptions-=TrL " Disable toolbar and scrollbars
     set columns=80 lines=50 " Set default window size
 endif
 
 if has("gui_macvim")
     set guifont=Menlo:h12
     set linespace=2
-    map <silent> <Leader>t <Esc>:silent !open -a Terminal<CR>
 endif
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.