X-Git-Url: https://git.danieliu.xyz/?p=dotfiles.git;a=blobdiff_plain;f=.vimrc;h=90857ccd22342c60791933ec8e08bd0148f9d62d;hp=aeea621f004b447865a62f1a79312364c54ad39e;hb=c3864f21c97f96577b2bfc3b4b1f492840fd850b;hpb=739ace9e490fa6e377e36a2c8b8cc7163797a2fe

diff --git a/.vimrc b/.vimrc
index aeea621..90857cc 100644
--- a/.vimrc
+++ b/.vimrc
@@ -10,11 +10,12 @@ 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
 
@@ -29,7 +30,7 @@ set conceallevel=2
 " Bindings
 let mapleader = ' '
 
-" File stuff
+" netrw stuff
 map <leader>f :Ex<cr>
 map <leader>l :bn<cr>
 map <leader>h :bp<cr>
@@ -47,19 +48,24 @@ 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 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()
     if (mode() =~# '\v(n|no)')
         hi StatusLine cterm=None gui=None ctermfg=black ctermbg=Yellow
-    elseif (mode() =~# '\v(v|V)')
+    elseif (mode() =~# '\v(v|V|)')
         hi StatusLine cterm=None gui=None ctermfg=black ctermbg=Red
     elseif (mode() ==# 'i')
         hi StatusLine cterm=None gui=None ctermfg=black ctermbg=LightBlue
@@ -105,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
@@ -115,23 +126,27 @@ augroup END
 
 " vim plug
 " this blob auto installs vim plug if it isnt already
-if empty(glob('~/.vim/autoload/plug.vim'))
-   silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs
-       \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
-         autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
-         endif
+fun! s:VimPlugSetup()
+    if empty(glob('~/.vim/autoload/plug.vim'))
+        silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+        autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
+    else
+        echo 'VimPlug is already installed'
+    endif
+endfun
+command PlugSetup :call s:VimPlugSetup()
 
 " template stuff
 call plug#begin('~/.vim/plugged')
 
 Plug 'sirver/ultisnips'
+Plug 'tpope/vim-commentary'
+Plug 'ap/vim-buftabline'
 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'
+" Plug 'jiangmiao/auto-pairs'
+" Plug 'rlue/vim-barbaric'
+" Plug 'junegunn/fzf'
 
 call plug#end()
 
@@ -144,7 +159,16 @@ 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>
+
+" latex stuff
+" fun! LatexCompile()
+"     echo 'compiling latex'
+" endfun
+" augroup latex
+"     autocmd!
+"     autocmd BufWritePost *.tex :call LatexCompile()
+" augroup END
 
 " Vimtex
 let g:tex_flavor='latex'
@@ -153,18 +177,60 @@ 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/',
 \}
+    " \'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
 
-" vim-barbaric
-let g:barbaric_ime = 'ibus'
-set ttimeoutlen=0
+" fzf
+" let g:fzf_layout = { 'down': '40%' }
+" let g:fzf_layout = { 'window': '-tabnew' }
 
 " 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
+