diff options
| -rw-r--r-- | nvim/colors/gruvbox-timmy.vim | 17 | ||||
| -rwxr-xr-x | nvim/init.vim | 29 |
2 files changed, 31 insertions, 15 deletions
diff --git a/nvim/colors/gruvbox-timmy.vim b/nvim/colors/gruvbox-timmy.vim index a3af01c..e66e7d5 100644 --- a/nvim/colors/gruvbox-timmy.vim +++ b/nvim/colors/gruvbox-timmy.vim @@ -99,10 +99,19 @@ let s:gb.dark5 = ['#282828', 235] " 40-40-40 let s:gb.gray_245 = ['#928374', 245] " 146-131-116 let s:gb.gray_244 = ['#928374', 244] " 146-131-116 -let s:gb.light0_hard = ['#f9f5d7', 230] " 249-245-215 -let s:gb.light0 = ['#fbf1c7', 229] " 253-244-193 -let s:gb.light0_soft = ['#f2e5bc', 228] " 242-229-188 -let s:gb.light1 = ['#ebdbb2', 231] " 235-219-178 +"let s:gb.light0_hard = ['#f9f5d7', 230] " 249-245-215 +"let s:gb.light0 = ['#fbf1c7', 229] " 253-244-193 +"let s:gb.light0_soft = ['#f2e5bc', 228] " 242-229-188 +"let s:gb.light1 = ['#ebdbb2', 231] " 235-219-178 +"let s:gb.light2 = ['#d5c4a1', 250] " 213-196-161 +"let s:gb.light3 = ['#bdae93', 248] " 189-174-147 +"let s:gb.light4 = ['#a89984', 246] " 168-153-132 +"let s:gb.light4_256 = ['#a89984', 246] " 168-153-132 + +let s:gb.light0_hard = ['#ffffff', 230] " 249-245-215 +let s:gb.light0 = ['#ffffff', 229] " 253-244-193 +let s:gb.light0_soft = ['#ffffff', 228] " 242-229-188 +let s:gb.light1 = ['#ffffff', 231] " 235-219-178 let s:gb.light2 = ['#d5c4a1', 250] " 213-196-161 let s:gb.light3 = ['#bdae93', 248] " 189-174-147 let s:gb.light4 = ['#a89984', 246] " 168-153-132 diff --git a/nvim/init.vim b/nvim/init.vim index 73fea05..de93236 100755 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -28,8 +28,13 @@ set termguicolors " Enable GUI colors for the terminal to get truecolor set wildmode=longest,list,full " Enable file auto-complete syntax on " Enable syntax highlighting +" Filetype options +autocmd BufRead,BufNewFile *.tex set filetype=tex +au Filetype tex let b:autopairs_enabled = 0 +au Filetype tex setlocal indentexpr= + " VimWiki options -let g:vimwiki_list = [{'path': '~/docs/school/docs/wiki/', 'path_html': '~/docs/school/docs/wiki/site/'}] +let g:vimwiki_list = [{'path': '~/docs/school/arc/docs/wiki/', 'path_html': '~/docs/school/arc/docs/wiki/site/'}] " Keybindings " Set leader-key to comma @@ -48,14 +53,14 @@ nmap <C-h> 0 nmap <C-j> <C-d> nmap <C-k> <C-u> nmap <C-l> $ - " Faster split navigation (alt-hjlk, as opposed to ctrl-w + hjlk) -"map <A-h> <C-w>h -"map <A-j> <C-w>j -"map <A-k> <C-w>k -"map <A-l> <C-w>l + " Faster split navigation (leader-wasd, as opposed to ctrl-w + hjlk) +map <leader>a <C-w>h +map <leader>s <C-w>j +map <leader>w <C-w>k +map <leader>d <C-w>l " Streamlined tab navigation with chromium inspired keybindings -nmap <TAB> gt -nmap <S-TAB> gT +nmap <leader><TAB> gt +nmap <leader>t :tabnew<CR> nmap <C-T> :tabnew<CR> " Copy, paste, and cut with standard bindings map <C-c> "+y @@ -104,11 +109,13 @@ endfunction autocmd BufWritePre * call DelWS() " Disables automatic commenting on newline: - autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o +autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o + " Perform dot commands over visual blocks: - vnoremap . :normal .<CR> +vnoremap . :normal .<CR> + " Save file as sudo on files that require root permission - cnoremap w!! execute 'silent! write !doas tee % >/dev/null' <bar> edit! +cnoremap w!! execute 'silent! write !doas tee % >/dev/null' <bar> edit! " Plugin options " closetag |