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

diff --git a/.vimrc b/.vimrc
index 29ceed1..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 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>
@@ -64,7 +65,7 @@ map <leader>r :source ~/.vimrc<cr>:echo "vimrc reloaded"<cr>
 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
@@ -110,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
@@ -120,22 +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 'ap/vim-css-color'
+" Plug 'jiangmiao/auto-pairs'
+" Plug 'rlue/vim-barbaric'
+" Plug 'junegunn/fzf'
 
 call plug#end()
 
@@ -150,6 +161,15 @@ let g:UltiSnipsSnippetDirectories=["UltiSnips", "mysnippets"]
 
 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'
 let g:vimtex_view_method='zathura'
@@ -163,15 +183,16 @@ let g:vimtex_compiler_latexmk = {
     " \   '-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
@@ -196,9 +217,6 @@ 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 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     cterm=NONE ctermfg=0 ctermbg=14
@@ -212,7 +230,7 @@ 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 Comment        ctermfg=DarkGrey
 hi lineNr         ctermfg=DarkGrey
 hi Folded         ctermfg=0