diff --git a/colors/pitchblack.vim b/colors/pitchblack.vim index 4359bc8..cefaf72 100644 --- a/colors/pitchblack.vim +++ b/colors/pitchblack.vim @@ -30,7 +30,7 @@ hi TabLine cterm=NONE ctermbg=8 ctermfg=15 gui=NONE guibg=#808080 hi TabLineFill cterm=NONE ctermbg=8 gui=NONE guibg=#808080 hi TabLineSel cterm=bold ctermfg=15 ctermbg=0 gui=bold guifg=#ffffff guibg=#000000 hi StatusLineNormal gui=bold guibg=#585858 guifg=#ffffff cterm=bold ctermbg=240 ctermfg=15 -hi StatusLineInsert gui=bold guibg=#00c000 guifg=#ffffff cterm=bold ctermbg=2 ctermfg=15 +hi StatusLineInsert gui=bold guibg=#005800 guifg=#ffffff cterm=bold ctermbg=22 ctermfg=15 hi! link StatusLine StatusLineNormal hi StatusLineNc gui=NONE guibg=#585858 guifg=#808080 cterm=NONE ctermbg=240 ctermfg=7 diff --git a/colors/snowhite.vim b/colors/snowhite.vim index fd2361f..d5603d6 100644 --- a/colors/snowhite.vim +++ b/colors/snowhite.vim @@ -31,7 +31,7 @@ hi TabLine cterm=NONE ctermbg=7 gui=NONE guibg=#c0c0c0 hi TabLineFill cterm=NONE ctermbg=7 gui=NONE guibg=#c0c0c0 hi TabLineSel cterm=bold ctermfg=0 ctermbg=15 gui=bold guifg=#000000 guibg=#ffffff hi StatusLineNormal gui=bold guibg=#c0c0c0 guifg=#000000 cterm=bold ctermbg=7 ctermfg=0 -hi StatusLineInsert gui=bold guibg=#80c080 guifg=#000000 cterm=bold ctermbg=10 ctermfg=0 +hi StatusLineInsert gui=bold guibg=#80c080 guifg=#000000 cterm=bold ctermbg=108 ctermfg=0 hi! link StatusLine StatusLineNormal hi StatusLineNc gui=NONE guibg=#c0c0c0 guifg=#808080 cterm=NONE ctermbg=7 ctermfg=8 hi Title cterm=bold ctermfg=0 gui=bold guifg=#000000 diff --git a/ftplugin/c.vim b/ftplugin/c.vim index 8c3a5cd..78cf857 100644 --- a/ftplugin/c.vim +++ b/ftplugin/c.vim @@ -1,9 +1,9 @@ iabbrev prn printf("\n"); nnoremap fb ][% nnoremap fe ][ -nnoremap c mcI//`c:delm c -vnoremap c `>o*/` -nnoremap xc mx?//xxx`x:noh:delm x -nnoremap xb mx?\/\*dd/\*\/dd`x:noh:delm x +nnoremap c mcI//`c:delm c +vnoremap c `>o*/` +nnoremap xc mx?//xxx`x:noh:delm x +nnoremap xb mx?\/\*dd/\*\/dd`x:noh:delm x setlocal foldmethod=syntax foldlevel=99 diff --git a/ftplugin/java.vim b/ftplugin/java.vim index 0d5f74d..16a8a36 100644 --- a/ftplugin/java.vim +++ b/ftplugin/java.vim @@ -1,9 +1,9 @@ iabbrev cout System.out.println nnoremap fb ][% nnoremap fe ][ -nnoremap c mcI//`c:delm c -vnoremap c `>o*/` -nnoremap xc mx^xx`x:delm x -nnoremap xb mx?\/\*dd/\*\/dd`x:noh:delm x +nnoremap c mcI//`c:delm c +vnoremap c `>o*/` +nnoremap xc mx^xx`x:delm x +nnoremap xb mx?\/\*dd/\*\/dd`x:noh:delm x setlocal foldmethod=syntax foldlevel=99 diff --git a/ftplugin/python.vim b/ftplugin/python.vim index fd88881..88974af 100644 --- a/ftplugin/python.vim +++ b/ftplugin/python.vim @@ -1,5 +1,5 @@ -nnoremap c mcI#`c:delm x -vnoremap c `>o"""` +nnoremap c mcI#`c:delm x +vnoremap c `>o"""` -nnoremap xb mx?"""dd/"""dd`x:noh:delm x -nnoremap xc mx?#xx`x:noh:delm x +nnoremap xb mx?"""dd/"""dd`x:noh:delm x +nnoremap xc mx?#xx`x:noh:delm x diff --git a/ftplugin/tex.vim b/ftplugin/tex.vim index 11edb6d..77b75a3 100644 --- a/ftplugin/tex.vim +++ b/ftplugin/tex.vim @@ -1,4 +1,4 @@ -setlocal foldmethod=syntax +setlocal foldmethod=syntax tabstop=2 shiftwidth=2 iabbrev tit \textit iabbrev pg \paragraph @@ -7,3 +7,7 @@ iabbrev sb \subsection iabbrev ssb \subsubsection iabbrev td \todo iabbrev mb \mathbf + +nnoremap lm :Latexmk +nnoremap lv :LatexView +nnoremap T :LatexTOC diff --git a/ftplugin/vim.vim b/ftplugin/vim.vim index 476a51f..df9e9f7 100644 --- a/ftplugin/vim.vim +++ b/ftplugin/vim.vim @@ -1,6 +1,6 @@ setlocal foldmethod=marker foldlevel=0 -nnoremap c mcI"`c:delm c -vnoremap c `>o"}}}` -nnoremap xb +nnoremap c mcI"`c:delm c +vnoremap c `>o"}}}` +nnoremap xb \ mx?^"{{{dd/^"}}}dd`x:noh:delm x -nnoremap xc mx?"xx`x:noh:delm x +nnoremap xc mx?"xx`x:noh:delm x diff --git a/plugin/settings.vim b/plugin/settings.vim index 72a4711..010a39c 100644 --- a/plugin/settings.vim +++ b/plugin/settings.vim @@ -26,13 +26,14 @@ set hlsearch set incsearch set laststatus=2 +set nojoinspaces " set splitbelow " }}} " Globals " {{{ let g:tex_fold_enabled = 1 -let g:javaScript_fold=1 +let g:javaScript_fold = 1 " }}} " Gui stuff @@ -40,6 +41,7 @@ let g:javaScript_fold=1 set guicursor=n-v-i-c:block-Cursor set guicursor+=n-v-i-c:blinkon0 set guioptions= +set mouse=c set langmenu=en_US.UTF-8 " }}} @@ -52,12 +54,19 @@ let g:tagbar_autofocus = 1 " LatexBox stuff " {{{ let g:LatexBox_no_mappings = 1 +let g:LatexBox_build_dir = 'build' +let g:LatexBox_latexmk_options = '-xelatex -outdir=build' " }}} " YouCompleteMe stuff " {{{ set completeopt-=preview let g:ycm_autoclose_preview_window_after_completion = 1 +let g:ycm_filetype_blacklist = { + \ 'tex': 1, + \ 'markdown': 1, + \ 'text': 1 + \ } set shortmess+=c " }}} @@ -84,12 +93,18 @@ augroup trailingwhite \ | match TrailingWhite '\v\s+$' | endif autocmd InsertEnter * match TrailingWhite '' augroup END + +augroup prose + autocmd! + autocmd FileType tex,text,markdown + \ setlocal spell spelllang=en_us textwidth=80 +augroup END " }}} " Mappings " {{{ let mapleader = "," -let maplocalleader = "," +let maplocalleader = " " nnoremap q nnoremap Q nnoremap qn :nohl