X-Git-Url: https://git.danieliu.xyz/?p=dotfiles.git;a=blobdiff_plain;f=.vimrc;h=33cea78f2069154e075efdb1fa939adad684b770;hp=56cc40c338743d2d24826550e199b0391ab09668;hb=0853ad49fc13e10925e855a735bc3122612c3dcb;hpb=b156356b96d0bd00229a145be24c6825ec309a2c

diff --git a/.vimrc b/.vimrc
index 56cc40c..33cea78 100644
--- a/.vimrc
+++ b/.vimrc
@@ -16,7 +16,6 @@ set shiftwidth=4
 set expandtab
 set ignorecase
 set smartcase
-set nrformats+=alpha "inc/dec alpha
 set hidden
 
 " cursors depending on mode
@@ -30,7 +29,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>
@@ -61,11 +60,22 @@ set listchars=tab:▸\ ,space:·,eol:¬
 " reload vimrc
 map <leader>r :source ~/.vimrc<cr>:echo "vimrc reloaded"<cr>
 
+" write with sudo
+cmap w!! w !sudo tee > /dev/null %
+
+" reload current file
+map <leader>e :e<cr>:echo "current file reloaded"<cr>
+map <leader>E :e!<cr>:echo "current file force reloaded"<cr>
+
+" highlighting (will get rid of this sometime prob)
+au BufRead,BufNewFile *.svelte set filetype=svelte
+au! Syntax svelte source ~/.vim/syntax/svelte.vim
+
 " 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
@@ -126,22 +136,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 'lervag/vimtex'
-Plug 'PietroPate/vim-tex-conceal'
-" Plug 'jiangmiao/auto-pairs'
 Plug 'tpope/vim-commentary'
-Plug 'rlue/vim-barbaric'
 Plug 'ap/vim-buftabline'
+Plug 'lervag/vimtex', { 'for': 'tex' }
+Plug 'PietroPate/vim-tex-conceal', { 'for': 'tex' }
+" Plug 'jiangmiao/auto-pairs'
+" Plug 'rlue/vim-barbaric'
+" Plug 'junegunn/fzf'
 
 call plug#end()
 
@@ -156,6 +171,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'
@@ -170,12 +194,16 @@ let g:vimtex_compiler_latexmk = {
     " \],
 
 " vim-barbaric
-let g:barbaric_ime = 'ibus'
-set ttimeoutlen=0
+" let g:barbaric_ime = 'ibus'
+" set ttimeoutlen=0
 
 " buftabline
 let g:buftabline_show = 1
 
+" fzf
+" let g:fzf_layout = { 'down': '40%' }
+" let g:fzf_layout = { 'window': '-tabnew' }
+
 " Run after plugins
 autocmd FileType * set formatoptions-=o
 
@@ -215,4 +243,5 @@ hi Todo           ctermfg=0 ctermbg=11
 hi Comment        ctermfg=DarkGrey
 hi lineNr         ctermfg=DarkGrey
 hi Folded         ctermfg=0
-
+hi Pmenu          ctermfg=0 ctermbg=7
+hi PmenuSel       ctermfg=0 ctermbg=6