Cleanup vimrc

1 files changed, 5 insertions, 50 deletions

diff --git a/vim/.vimrc b/vim/.vimrc
index 5a44f30..a9034ad 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -14,29 +14,21 @@ Plugin 'gmarik/Vundle.vim', {'pinned': 1}
 
 " Special syntaxes
 Plugin 'groenewege/vim-less'                  " Less
-Plugin 'digitaltoad/vim-jade'                 " Jade
+Plugin 'digitaltoad/vim-pug'                  " Pug
 Plugin 'lervag/vimtex'                        " TeX
 Plugin 'andymass/vim-matchup'                 " TeX parentheses; see https://github.com/lervag/vimtex/issues/1143
-Plugin 'derekwyatt/vim-scala'                 " Scala
 Plugin 'Shirk/vim-gas'                        " GNU Assembly
-Plugin 'git@github.com:alisdair/vim-armasm'   " ARM Assembly
 Plugin 'git@gitlab.com:clean-and-itasks/vim-clean' " Clean
-Plugin 'git@github.com:camilstaps/vim-bb'     " Blackboard feedback
 Plugin 'camilstaps/vim-fuspel', {'pinned': 1} " Fuspel
 Plugin 'camilstaps/vim-sil', {'pinned': 1}    " Sil
-Plugin 'camilstaps/vim-smv', {'pinned': 1}    " SMV
-Plugin 'camilstaps/vim-torxakis', {'pinned': 1} " Torxakis
 Plugin 'rust-lang/rust.vim'                   " Rust
 Plugin 'rhysd/vim-llvm'                       " LLVM
 Plugin 'rhysd/vim-wasm'                       " WebAssembly text
 
 " Other plugins
 Plugin 'mg979/vim-visual-multi'       " Multiple cursors
-Plugin 'scrooloose/syntastic'         " Syntastic
 Plugin 'tpope/vim-surround'           " cs)] to replace parenthesis pairs, e.g.
-Plugin 'rickhowe/diffchar.vim'        " diffing on character level
 Plugin 'airblade/vim-gitgutter'       " git diff in gutter
-Plugin 'godlygeek/tabular'            " tabularize things
 Plugin 'google/vim-searchindex'       " shows '[N/M]' when searching
 
 " Color schemes
@@ -59,9 +51,9 @@ autocmd! BufWritePost .Xresources !xrdb -merge %
 
 " Common settings
 set tabstop=4 shiftwidth=4
-set cc=80
+set colorcolumn=80
 set linebreak
-set nu
+set number
 set path+=**
 set dir=~/.swp
 set listchars=nbsp:¬,tab:▸\ ,extends:»,precedes:«,trail:•
@@ -143,35 +135,8 @@ let g:VM_case_setting = 'sensitive'
 let g:matchup_matchparen_status_offscreen=0
 
 " Clean
-let g:clean_load_cloogle_tags = 1
-let g:clean_warnings_hide_libraries =
-			\ [ "ArgEnv"
-			\ , "Dynamics"
-			\ , "GraphCopy"
-			\ , "iTasks"
-			\ , "StdEnv"
-			\ , "TCPIP"
-			\ ]
 set statusline+=%{cleanvim#tags#statusline()}
 
-" Syntastic
-set statusline+=%#warningmsg#
-set statusline+=%{SyntasticStatuslineFlag()}
-set statusline+=%*
-
-let g:syntastic_always_populate_loc_list = 1
-let g:syntastic_auto_loc_list = 1
-let g:syntastic_check_on_open = 1
-let g:syntastic_check_on_wq = 0
-
-let g:syntastic_python_checkers = ['pylint', 'pep8']
-let g:syntastic_python_pylint_exec = 'pylint.sh'
-let g:syntastic_python_pylint_args = '--guess'
-
-let g:syntastic_mode_map = {
-			\ "mode": "passive",
-			\ "passive_filetypes": [] }
-
 " Git gutter
 set updatetime=300
 
@@ -191,28 +156,18 @@ let g:matchup_override_vimtex = 1
 " Assembly
 let asmsyntax='gas'
 
-" Mutt
-au BufRead /tmp/mutt-* set tw=72
-
 " X clipboard manipulation using xsel
 " See: http://vim.wikia.com/wiki/Accessing_the_system_clipboard
-" Use :cz in visual mode to copy to clipboard, :pz for pasting
+" Use :Cz in visual mode to copy to clipboard, :Pz for pasting
 " x instead of z for primary selection, v for secondary selection
 command! -range Cz :silent :<line1>,<line2>w !xsel -i -b
 command! -range Cx :silent :<line1>,<line2>w !xsel -i -p
 command! -range Cv :silent :<line1>,<line2>w !xsel -i -s
-cabbrev cv Cv
-cabbrev cz Cz
-cabbrev cx Cx
 
 command! -range Pz :silent :r !xsel -o -b
 command! -range Px :silent :r !xsel -o -p
 command! -range Pv :silent :r !xsel -o -s
 
-cabbrev pz Pz
-cabbrev px Px
-cabbrev pv Pv
-
 " For syntax definition debugging
 "function! SyntaxItem()
 "  return synIDattr(synID(line("."),col("."),1),"name")
@@ -220,5 +175,5 @@ cabbrev pv Pv
 "set statusline+=%{SyntaxItem()}
 "set laststatus=2
 
-" https://unix.stackexchange.com/a/243667/37050
+" Emulate the default statusline: https://unix.stackexchange.com/a/243667
 set statusline+=%=%(%l,%c%V\ %=\ %P%)