X-Git-Url: https://git.danieliu.xyz/?p=dotfiles.git;a=blobdiff_plain;f=.vimrc;h=0cb4acd106d8efa2864c3e4441c70aebca0494b0;hp=87100419854a90c5695441384934ef607c1df039;hb=b979bd9a2d268444399af36e12e32264c6e7a45c;hpb=02c17ea2ed1dc3a6195c1c2f4bde8091fa804562 diff --git a/.vimrc b/.vimrc index 8710041..0cb4acd 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 nrformats+=alpha "inc/dec alpha +set hidden -" spell check -setlocal spell -set spelllang=en_us -set spellcapcheck= +" cursors depending on mode +let &t_EI = "\[2 q" "normal mode +let &t_SI = "\[6 q" "insert mode +let &t_SR = "\[4 q" "replace mode " conceal set conceallevel=2 @@ -27,19 +30,36 @@ set conceallevel=2 let mapleader = ' ' " File stuff -" map e :Ex -" map v :Vex +map f :Ex map l :bn map h :bp map d :bd +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 z 1z= + +" folding +set foldmethod=manual +set foldnestmax=10 +set nofoldenable +set foldlevel=2 + + " View whitespace -set lcs=space:· map s :set list! +set listchars=tab:▸\ ,space:·,eol:¬ -" colors -hi Conceal ctermbg=Black -hi SpellBad ctermfg=Red ctermbg=Black cterm=underline +" reload vimrc +map r :source ~/.vimrc " statusline function! StatusModeColor() @@ -54,13 +74,13 @@ function! StatusModeColor() else hi StatusLine cterm=None gui=None ctermfg=black ctermbg=DarkGrey endif - + return '' endfunction function! StatusModifiedColor() if getbufinfo(1)[0].changed - hi User1 cterm=None gui=None ctermfg=Black ctermbg=LightGrey + hi User1 cterm=None gui=None ctermfg=Black ctermbg=Magenta else hi User1 cterm=None gui=None ctermfg=White ctermbg=Black endif @@ -68,34 +88,35 @@ function! StatusModifiedColor() return '' endfunction -call StatusModeColor() +function! BufCount() + return printf("%d/%d", bufnr("%"), len(getbufinfo({'buflisted':1}))) +endfunction -" set showtabline=2 +call StatusModeColor() +call StatusModifiedColor() +autocmd BufWritePost call StatusModifiedColor() set laststatus=2 set statusline= set statusline+=%{StatusModeColor()} set statusline+=%{StatusModifiedColor()} -set statusline+=\ vim\ \[%{mode()}\] -set statusline+=\ %1*\ %F\ %m +set statusline+=%1*\ | +set statusline+=%0*\ vim\ \[%{mode()}\] +set statusline+=\[%{BufCount()}\] +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+=\ - -" Netrw -" let g:netrw_liststyle = 3 -" let g:netrw_banner = 0 -" let g:netrw_winsize = 25 -" let g:netrw_browse_split = 4 +set statusline+=\ %l/%L:%c\ | +set statusline+=%1*\ | " Templates 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 @@ -111,24 +132,27 @@ call plug#begin('~/.vim/plugged') Plug 'sirver/ultisnips' Plug 'lervag/vimtex' -Plug 'jiangmiao/auto-pairs' Plug 'PietroPate/vim-tex-conceal' -" Plug 'vim-airline/vim-airline' +Plug 'jiangmiao/auto-pairs' Plug 'tpope/vim-commentary' -Plug 'ptzz/lf.vim' -Plug 'voldikss/vim-floaterm' -" Plug 'ctrlpvim/ctrlp.vim' -" Plug 'neoclide/coc.nvim', {'branch': 'release'} -" Plug 'habamax/vim-godot' +Plug 'rlue/vim-barbaric' +Plug 'jeffkreeftmeijer/vim-dim' +" Plug 'ptzz/lf.vim' +" Plug 'voldikss/vim-floaterm' call plug#end() +" leader for plugins +let maplocalleader = "\\" + " Ultisnips let g:UltiSnipsExpandTrigger = '' let g:UltiSnipsJumpForwardTrigger = '' let g:UltiSnipsJumpBackwardTrigger = '' let g:UltiSnipsSnippetDirectories=["UltiSnips", "mysnippets"] +map sr :call UltiSnips#RefreshSnippets() + " Vimtex let g:tex_flavor='latex' let g:vimtex_view_method='zathura' @@ -138,17 +162,60 @@ let g:tex_conceal='abdmgs' let g:vimtex_compiler_latexmk = { \'build_dir': '/home/pinosaur/.cache/latexaux/', \} - -" VimAirline -" let g:airline#extensions#tabline#enabled = 1 -" let g:airline#extensions#tabline#buffer_min_count = 2 -" let g:airline_powerline_fonts=1 + " \'options': [ + " \ '-shell-escape', + " \], " Ctrlp -let g:ctrlp_cmd='CtrlPTag' +" let g:ctrlp_cmd='CtrlPTag' " 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 + +" 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 ctermfg=0 +hi SpellBad ctermbg=9 ctermbg=0 cterm=underline +hi SpellRare ctermbg=13 +hi SpellLocal ctermbg=14 +hi PmenuSbar ctermbg=8 +hi PmenuThumb ctermbg=0 +hi TabLine cterm=underline ctermfg=0 ctermbg=7 +hi TabLineSel cterm=bold +hi TabLineFill cterm=reverse +hi CursorColumn ctermbg=7 +hi CursorLine cterm=underline +hi MatchParen 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=7 +hi lineNr ctermfg=DarkGrey +hi Folded ctermfg=0 +