X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=.vimrc;h=87100419854a90c5695441384934ef607c1df039;hb=02c17ea2ed1dc3a6195c1c2f4bde8091fa804562;hp=db42bdc822677e9e55c75b31920e73c04ba405e4;hpb=366f6e01929c651e868d008521bf56cc8d1414c2;p=dotfiles.git

diff --git a/.vimrc b/.vimrc
index db42bdc..8710041 100644
--- a/.vimrc
+++ b/.vimrc
@@ -9,13 +9,11 @@
 syntax on
 set number
 set relativenumber
-" set hlsearch
 set incsearch
 set encoding=utf-8
 set tabstop=4
 set shiftwidth=4
 set expandtab
-" set formatoptions-=cro "disables auto comments (not working rn)
 
 " spell check
 setlocal spell
@@ -28,16 +26,65 @@ set conceallevel=2
 " Bindings
 let mapleader = ' '
 
+" File stuff
 " map <leader>e :Ex<cr>
 " map <leader>v :Vex<cr>
 map <leader>l :bn<cr>
 map <leader>h :bp<cr>
 map <leader>d :bd<cr>
 
+" View whitespace
+set lcs=space:·
+map <leader>s :set list!<cr>
+
 " colors
 hi Conceal ctermbg=Black
 hi SpellBad ctermfg=Red ctermbg=Black cterm=underline
 
+" statusline
+function! StatusModeColor()
+    if (mode() =~# '\v(n|no)')
+        hi StatusLine cterm=None gui=None ctermfg=black ctermbg=Yellow
+    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
+    elseif (mode() ==# 'c') 
+        hi StatusLine cterm=None gui=None ctermfg=black ctermbg=Green
+    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
+    else
+        hi User1 cterm=None gui=None ctermfg=White ctermbg=Black
+    endif
+
+    return ''
+endfunction
+
+call StatusModeColor()
+
+" set showtabline=2
+
+set laststatus=2
+set statusline=
+set statusline+=%{StatusModeColor()}
+set statusline+=%{StatusModifiedColor()}
+set statusline+=\ vim\ \[%{mode()}\]
+set statusline+=\ %1*\ %F\ %m
+set statusline+=%=
+set statusline+=%0*
+set statusline+=\ %ff
+set statusline+=\ %r\[%{v:register}\]
+set statusline+=\ %l/%L:%c
+set statusline+=\ 
+
 " Netrw
 " let g:netrw_liststyle = 3
 " let g:netrw_banner = 0
@@ -47,6 +94,8 @@ hi SpellBad ctermfg=Red ctermbg=Black cterm=underline
 " 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
 augroup END
 
 " vim plug
@@ -64,9 +113,10 @@ Plug 'sirver/ultisnips'
 Plug 'lervag/vimtex'
 Plug 'jiangmiao/auto-pairs'
 Plug 'PietroPate/vim-tex-conceal'
-Plug 'vim-airline/vim-airline'
+" Plug 'vim-airline/vim-airline'
 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'
@@ -90,9 +140,9 @@ let g:vimtex_compiler_latexmk = {
 \}
 
 " VimAirline
-let g:airline#extensions#tabline#enabled = 1
-let g:airline#extensions#tabline#buffer_min_count = 2
-let g:airline_powerline_fonts=1
+" let g:airline#extensions#tabline#enabled = 1
+" let g:airline#extensions#tabline#buffer_min_count = 2
+" let g:airline_powerline_fonts=1
 
 " Ctrlp
 let g:ctrlp_cmd='CtrlPTag'