diff options
| -rw-r--r-- | general/functions.vim | 4 | ||||
| -rw-r--r-- | lua/plug-colorizer.lua | 2 | ||||
| -rw-r--r-- | plug-config/coc.vim | 4 | ||||
| -rw-r--r-- | plug-config/gitgutter.vim | 6 | ||||
| -rw-r--r-- | themes/onedark.vim | 8 | ||||
| -rw-r--r-- | vim-plug/plugins.vim | 10 |
6 files changed, 20 insertions, 14 deletions
diff --git a/general/functions.vim b/general/functions.vim index d207d85f..25397cf1 100644 --- a/general/functions.vim +++ b/general/functions.vim @@ -4,3 +4,7 @@ augroup auto_spellcheck autocmd BufNewFile,BufRead *.md setlocal spell augroup END + +nnoremap <f10> :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' +\ . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" +\ . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<cr> diff --git a/lua/plug-colorizer.lua b/lua/plug-colorizer.lua index f1c565fc..e990d505 100644 --- a/lua/plug-colorizer.lua +++ b/lua/plug-colorizer.lua @@ -3,7 +3,7 @@ require'colorizer'.setup( { RGB = true; -- #RGB hex codes RRGGBB = true; -- #RRGGBB hex codes - names = true; -- "Name" codes like Blue + -- names = true; -- "Name" codes like Blue RRGGBBAA = true; -- #RRGGBBAA hex codes rgb_fn = true; -- CSS rgb() and rgba() functions hsl_fn = true; -- CSS hsl() and hsla() functions diff --git a/plug-config/coc.vim b/plug-config/coc.vim index 5f262cd2..82f9723b 100644 --- a/plug-config/coc.vim +++ b/plug-config/coc.vim @@ -25,9 +25,9 @@ \ 'coc-yank', \ 'coc-json', \ 'coc-marketplace', - \ 'coc-tabnine', - \ 'coc-highlight', \ ] + " \ 'coc-tabnine', + " \ 'coc-highlight', " Use tab for trigger completion with characters ahead and navigate. inoremap <silent><expr> <TAB> diff --git a/plug-config/gitgutter.vim b/plug-config/gitgutter.vim index e3adc9b0..8455543b 100644 --- a/plug-config/gitgutter.vim +++ b/plug-config/gitgutter.vim @@ -9,6 +9,6 @@ let g:gitgutter_preview_win_floating = 1 let g:gitgutter_enabled = 1 -highlight GitGutterAdd guifg=#98c379 ctermfg=2 -highlight GitGutterChange guifg=#61afef ctermfg=3 -highlight GitGutterDelete guifg=#e06c75 ctermfg=1 +highlight GitGutterAdd guifg=#587C0C ctermfg=2 +highlight GitGutterChange guifg=#0C7D9D ctermfg=3 +highlight GitGutterDelete guifg=#94151B ctermfg=1 diff --git a/themes/onedark.vim b/themes/onedark.vim index 3a08f4a9..3dfabb16 100644 --- a/themes/onedark.vim +++ b/themes/onedark.vim @@ -10,12 +10,12 @@ "autocmd ColorScheme * call onedark#set_highlight("Normal", { "fg": s:white }) " `bg` will not be styled since there is no `bg` setting hi Comment cterm=italic -let g:onedark_hide_endofbuffer=1 -let g:onedark_terminal_italics=1 -let g:onedark_termcolors=256 +let g:nvcode_hide_endofbuffer=1 +let g:nvcode_terminal_italics=1 +let g:nvcode_termcolors=256 syntax on -colorscheme onedark +colorscheme nvcode " checks if your terminal has 24-bit color support diff --git a/vim-plug/plugins.vim b/vim-plug/plugins.vim index fe6ce307..a1baa02c 100644 --- a/vim-plug/plugins.vim +++ b/vim-plug/plugins.vim @@ -47,9 +47,7 @@ call plug#begin('~/.config/nvim/autoload/plugged') " Closetags Plug 'alvan/vim-closetag' " Themes - Plug 'christianchiarulli/onedark.vim' - Plug 'kaicataldo/material.vim', { 'branch': 'main' } - Plug 'arcticicestudio/nord-vim' + Plug 'christianchiarulli/nvcode.vim' " Intellisense Plug 'neoclide/coc.nvim', {'branch': 'release'} " Status Line @@ -117,10 +115,12 @@ call plug#begin('~/.config/nvim/autoload/plugged') " TODO add this back in change from C-n " Plug 'mg979/vim-visual-multi', {'branch': 'master'} Plug 'moll/vim-bbye' + Plug 'yuezk/vim-js' + Plug 'maxmellon/vim-jsx-pretty' + Plug 'jelera/vim-javascript-syntax' " Plugin Graveyard " jsx syntax support - " Plug 'maxmellon/vim-jsx-pretty' " Typescript syntax " Plug 'HerringtonDarkholme/yats.vim' " Multiple Cursors @@ -136,6 +136,8 @@ call plug#begin('~/.config/nvim/autoload/plugged') " Plug 'Shougo/echodoc.vim' " Plug 'hardcoreplayers/spaceline.vim' " Plug 'vim-airline/vim-airline-themes' + " Plug 'kaicataldo/material.vim', { 'branch': 'main' } + " Plug 'arcticicestudio/nord-vim' " Ranger " Plug 'francoiscabrol/ranger.vim' " Plug 'rbgrouleff/bclose.vim' |