X-Git-Url: https://git.danieliu.xyz/?p=dotfiles.git;a=blobdiff_plain;f=.vimrc;h=56cc40c338743d2d24826550e199b0391ab09668;hp=df16a5def44316d96c18a47be40d71679ea49cc0;hb=7f59e8b721746dbf0741f0083a1a5e74ce973278;hpb=faac9512ba959286621bcb1222ebcdc153ebe37c

diff --git a/.vimrc b/.vimrc
index df16a5d..56cc40c 100644
--- a/.vimrc
+++ b/.vimrc
@@ -10,17 +10,19 @@ syntax on
 set number
 set relativenumber
 set incsearch
-set smartcase
 set encoding=utf-8
 set tabstop=4
 set shiftwidth=4
 set expandtab
+set ignorecase
+set smartcase
+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
@@ -38,13 +40,26 @@ 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>
+
+" folding
+set foldmethod=manual
+set foldnestmax=10
+set nofoldenable
+set foldlevel=2
+
 " View whitespace
 map <leader>s :set list!<cr>
-set lcs=space:·
+set listchars=tab:▸\ ,space:·,eol:¬
 
-" colors
-hi Conceal ctermbg=Black
-hi SpellBad ctermfg=Red ctermbg=Black cterm=underline
+" reload vimrc
+map <leader>r :source ~/.vimrc<cr>:echo "vimrc reloaded"<cr>
 
 " statusline
 function! StatusModeColor()
@@ -59,7 +74,7 @@ function! StatusModeColor()
     else
         hi StatusLine cterm=None gui=None ctermfg=black ctermbg=DarkGrey
     endif
-    
+
     return ''
 endfunction
 
@@ -96,6 +111,11 @@ set statusline+=\ %r\[%{v:register}\]
 set statusline+=\ %l/%L:%c\ |
 set statusline+=%1*\ |
 
+" Tab line
+hi TabLineSel   cterm=Bold ctermfg=Yellow
+hi TabLine      cterm=None ctermfg=Grey ctermbg=Black
+hi TabLineFill  cterm=None ctermbg=Black
+
 " Templates
 augroup templates
     autocmd BufNewFile *.tex 0r ~/.vim/templates/skeleton.tex
@@ -118,10 +138,10 @@ call plug#begin('~/.vim/plugged')
 Plug 'sirver/ultisnips'
 Plug 'lervag/vimtex'
 Plug 'PietroPate/vim-tex-conceal'
-Plug 'jiangmiao/auto-pairs'
+" Plug 'jiangmiao/auto-pairs'
 Plug 'tpope/vim-commentary'
-" Plug 'ptzz/lf.vim'
-" Plug 'voldikss/vim-floaterm'
+Plug 'rlue/vim-barbaric'
+Plug 'ap/vim-buftabline'
 
 call plug#end()
 
@@ -134,7 +154,7 @@ let g:UltiSnipsJumpForwardTrigger = '<tab>'
 let g:UltiSnipsJumpBackwardTrigger = '<s-tab>'
 let g:UltiSnipsSnippetDirectories=["UltiSnips", "mysnippets"]
 
-map <localleader>sr :call UltiSnips#RefreshSnippets()<cr>
+map <localleader>sr :call UltiSnips#RefreshSnippets()<cr>:echo "Refreshed Snippets"<cr>
 
 " Vimtex
 let g:tex_flavor='latex'
@@ -145,12 +165,54 @@ let g:tex_conceal='abdmgs'
 let g:vimtex_compiler_latexmk = {
     \'build_dir': '/home/pinosaur/.cache/latexaux/',
 \}
+    " \'options': [
+    " \   '-shell-escape',
+    " \],
 
-" Ctrlp
-" let g:ctrlp_cmd='CtrlPTag'
+" vim-barbaric
+let g:barbaric_ime = 'ibus'
+set ttimeoutlen=0
 
-" Lf
-" let g:lf_replace_netrw = 1 " weird behavior rn
+" buftabline
+let g:buftabline_show = 1
 
 " Run after plugins
 autocmd FileType * set formatoptions-=o
+
+" colors
+" based off https://github.com/jeffkreeftmeijer/vim-dim/blob/main/colors/default-light.vim
+hi SpecialKey     ctermfg=4
+hi TermCursor     cterm=reverse
+hi NonText        ctermfg=12
+hi Directory      ctermfg=4
+hi ErrorMsg       ctermfg=15 ctermbg=1
+hi IncSearch      cterm=reverse
+hi MoreMsg        ctermfg=2
+hi ModeMsg        cterm=bold
+hi Question       ctermfg=2
+hi Title          ctermfg=5
+hi WarningMsg     ctermfg=1
+hi WildMenu       ctermfg=0 ctermbg=11
+hi Conceal        ctermbg=0
+hi SpellBad       ctermfg=9 ctermbg=0 cterm=underline
+hi SpellRare      ctermbg=13 ctermbg=0 cterm=underline
+hi SpellLocal     ctermfg=14 ctermbg=0 cterm=underline
+hi PmenuSbar      ctermbg=8
+hi PmenuThumb     ctermbg=0
+hi CursorColumn   ctermbg=7
+hi CursorLine     cterm=underline
+hi MatchParen     cterm=NONE ctermfg=0 ctermbg=14
+hi Constant       ctermfg=1
+hi Special        ctermfg=5
+hi Identifier     cterm=NONE ctermfg=6
+hi Statement      ctermfg=3
+hi PreProc        ctermfg=5
+hi Type           ctermfg=2
+hi Underlined     cterm=underline ctermfg=5
+hi Ignore         ctermfg=15
+hi Error          ctermfg=15 ctermbg=9
+hi Todo           ctermfg=0 ctermbg=11
+hi Comment        ctermfg=DarkGrey
+hi lineNr         ctermfg=DarkGrey
+hi Folded         ctermfg=0
+