X-Git-Url: https://git.danieliu.xyz/?p=dotfiles.git;a=blobdiff_plain;f=.vimrc;h=aeea621f004b447865a62f1a79312364c54ad39e;hp=49ee3db1cbca546aa414bd636febe45e6febd818;hb=739ace9e490fa6e377e36a2c8b8cc7163797a2fe;hpb=77791e874daf9286ba53393970d1beec7df3dd5b

diff --git a/.vimrc b/.vimrc
index 49ee3db..aeea621 100644
--- a/.vimrc
+++ b/.vimrc
@@ -10,15 +10,18 @@ syntax on
 set number
 set relativenumber
 set incsearch
+set smartcase
 set encoding=utf-8
 set tabstop=4
 set shiftwidth=4
-set expandtab
+" set expandtab
+set nrformats+=alpha "inc/dec alpha
+set hidden
 
-" spell check
-setlocal spell
-set spelllang=en_us
-set spellcapcheck=
+" cursors depending on mode
+let &t_EI = "\<Esc>[2 q" "normal mode
+let &t_SI = "\<Esc>[6 q" "insert mode
+let &t_SR = "\<Esc>[4 q" "replace mode
 
 " conceal
 set conceallevel=2
@@ -36,9 +39,17 @@ let g:netrw_liststyle = 3
 let g:netrw_banner = 0
 let g:netrw_winsize = 25
 
+" spell check
+setlocal spell
+set spelllang=en_us
+set spellcapcheck=
+
+" accept first spell check fix
+map <leader>z 1z=<cr>
+
 " View whitespace
 map <leader>s :set list!<cr>
-set lcs=space:·
+set listchars=tab:▸\ ,space:·,eol:¬
 
 " colors
 hi Conceal ctermbg=Black
@@ -57,7 +68,7 @@ function! StatusModeColor()
     else
         hi StatusLine cterm=None gui=None ctermfg=black ctermbg=DarkGrey
     endif
-    
+
     return ''
 endfunction
 
@@ -77,6 +88,7 @@ endfunction
 
 call StatusModeColor()
 call StatusModifiedColor()
+autocmd BufWritePost <buffer> call StatusModifiedColor()
 
 set laststatus=2
 set statusline=
@@ -85,10 +97,10 @@ set statusline+=%{StatusModifiedColor()}
 set statusline+=%1*\ | 
 set statusline+=%0*\ vim\ \[%{mode()}\]
 set statusline+=\[%{BufCount()}\]
-set statusline+=\ %1*\ %F\ %m
+set statusline+=\ %1*\ %{expand('%:~:.')}\ %m
 set statusline+=%=
-set statusline+=%0*
-set statusline+=\ %ff
+set statusline+=%y
+set statusline+=\ %0*
 set statusline+=\ %r\[%{v:register}\]
 set statusline+=\ %l/%L:%c\ |
 set statusline+=%1*\ |
@@ -98,6 +110,7 @@ augroup templates
     autocmd BufNewFile *.tex 0r ~/.vim/templates/skeleton.tex
     autocmd BufNewFile *.html 0r ~/.vim/templates/skeleton.html
     autocmd BufNewFile *.rkt 0r ~/.vim/templates/skeleton.rkt
+    autocmd BufNewFile *.xml 0r ~/.vim/templates/skeleton.xml
 augroup END
 
 " vim plug
@@ -116,17 +129,23 @@ Plug 'lervag/vimtex'
 Plug 'PietroPate/vim-tex-conceal'
 Plug 'jiangmiao/auto-pairs'
 Plug 'tpope/vim-commentary'
+Plug 'rlue/vim-barbaric'
 " Plug 'ptzz/lf.vim'
 " Plug 'voldikss/vim-floaterm'
 
 call plug#end()
 
+" leader for plugins
+let maplocalleader = "\\"
+
 " Ultisnips
 let g:UltiSnipsExpandTrigger = '<tab>'
 let g:UltiSnipsJumpForwardTrigger = '<tab>'
 let g:UltiSnipsJumpBackwardTrigger = '<s-tab>'
 let g:UltiSnipsSnippetDirectories=["UltiSnips", "mysnippets"]
 
+map <localleader>sr :call UltiSnips#RefreshSnippets()<cr>
+
 " Vimtex
 let g:tex_flavor='latex'
 let g:vimtex_view_method='zathura'
@@ -134,7 +153,7 @@ let g:vimtex_quickfix_mode=0
 let g:tex_conceal='abdmgs'
 
 let g:vimtex_compiler_latexmk = {
-    \'build_dir': '/home/pinosaur/.cache/latexaux/',
+    \'build_dir': '/home/pinosaur/.cache/latexaux/'
 \}
 
 " Ctrlp
@@ -143,5 +162,9 @@ let g:vimtex_compiler_latexmk = {
 " Lf
 " let g:lf_replace_netrw = 1 " weird behavior rn
 
+" vim-barbaric
+let g:barbaric_ime = 'ibus'
+set ttimeoutlen=0
+
 " Run after plugins
 autocmd FileType * set formatoptions-=o