More concise .vimrc with softtabstop

diff --git a/.vimrc b/.vimrc
index 9bef07d..1634f7c 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -1,97 +1,32 @@
-
-"                Colin's vimrc
-"
-"            ||   www                %%%
-"     vwv    ||   )_(,;;;,        ,;,\_/ www
-"     )_(    ||   \|/ \_/         )_(\|  (_)
-"     \|   \ || /\\|/  |/         \| \|// |
-" "___\|//V\\||//_\V/_\|//_______\\|//V/\\|/__
-
-"*************** navigation ***************
-set history=500
-set tags=./tags;../../../../
-
-"*************** search stuff ***************
+"""""""""" Colin's vimrc """"""""""
 set incsearch
 set hlsearch
 set showmatch
 set nowrapscan
 set ignorecase
 set smartcase
-
-"*************** syntax highlighting ***************
-syntax on
-
-" Use the new regular expression engine to avoid slowness with TypeScript.
-set re=0
-
-"*************** formatting ***************
-:filetype plugin on
-:filetype indent on
 set linebreak
-set ai
+set autoindent
 set ruler
-"highlight Comment ctermfg=darkcyan
-"highlight Constant ctermfg=red
-"highlight Search cterm=reverse
-"highlight Error ctermfg=white ctermbg=1
-set t_Co=256
-set sw=4
-set ts=4
-set et
-set modelines=0
-
-"*************** bell ***************
-set vb t_vb="."
-set visualbell
-
-"*************** movement stuff ***************
+set modelines=0 " modelines are insecure
+set nomodeline  " modelines are insecure
 set splitbelow
 set splitright
-"imap <BS> <ESC>
 set pastetoggle=<F2>
-
-"*************** gui stuff ***************
-"set guifont=fixed
-set guioptions-=T
-set laststatus=2
-"noremap \ 2 <PageUp>
-
-"*************** comand-mode stuff ***************
-" This abbreviation makes it easier to type :e <filename>.
-" When you type '%%' in command mode, it will be expanded to the directory name
-" of the file you're currently editing.
 cabbr <expr> %% expand('%:p:h')
-
-"*************** colin's auto-commenter ***************
 map ,/ :s/^/\/\//<CR>:nohlsearch<CR>
 map ,,/ :s/^\/\///<CR>:nohlsearch<CR>
 map ,# :s/^/#/<CR>:nohlsearch<CR>
 map ,,# :s/^#//<CR>:nohlsearch<CR>
 map ," :s/^/\"/<CR>:nohlsearch<CR>
 map ,," :s/^\"//<CR>:nohlsearch<CR>
-
-" whitespace stripper
 map ,w :s/[\t ][\t ]*$//<CR>
-
-" More ergonomic key binding for omni-complete
-inoremap <C-k><C-k> <C-x><C-o>
-
-"*************** shortcuts **************
-map \b :ConqueTermSplit /bin/bash<CR>
-map \B :ConqueTermVSplit /bin/bash<CR>
-"command Bash execute ":ConqueTerm bash"
-
-"*************** grep plugin ***************
-:let Grep_Default_Filelist = '*.c *.cpp *.cc *.hpp *.rb *.h *.t *.py *.rst *.go *.java *.S *.scala'
-:let Grep_Skip_Files = 'core.* *.svn *~ *.swp *.swo *.bak cscope.out cscope.files'
-
-"*************** pre-filled registers ******************
-let @w="Signed-off-by: Colin McCabe <cmccabe@alumni.cmu.edu>"
-let @s="Signed-off-by: Colin Patrick McCabe <cmccabe@cloudera.com>"
-
-set t_Co=256
-highlight DiffAdd    ctermfg=NONE ctermbg=grey 
-highlight DiffDelete ctermfg=NONE ctermbg=grey
-highlight DiffChange ctermfg=NONE ctermbg=grey
-highlight DiffText   ctermfg=NONE ctermbg=grey
+syntax on
+filetype indent off
+set re=0 " Fix syntax highlighting slowness
+set laststatus=2
+set expandtab
+set tabstop=8
+set softtabstop=4
+set shiftwidth=4
+"""""""""""""""""""""""""""""""""""