diff options
| -rw-r--r-- | README.md | 23 | ||||
| -rw-r--r-- | coc-settings.json | 10 | ||||
| -rw-r--r-- | init.vim | 4 | ||||
| -rw-r--r-- | keys/which-key.vim | 2 | ||||
| -rw-r--r-- | plug-config/bracey.vim | 2 | ||||
| -rw-r--r-- | plug-config/coc.vim | 2 | ||||
| -rw-r--r-- | plug-config/illuminate.vim | 2 | ||||
| -rw-r--r-- | plug-config/polyglot.vim | 4 | ||||
| -rw-r--r-- | plug-config/tagalong.vim | 2 | ||||
| -rw-r--r-- | vim-plug/plugins.vim | 10 |
10 files changed, 43 insertions, 18 deletions
@@ -128,15 +128,22 @@ Example: - async task/run - vimspector -- git messenger -- live server (bracey) - markdown preview - neomake +- ale +- multiple cursors +- git messenger - markdown table +- spaceline (add colorscheme for mach 2) - add better whitespace plugin and a toggle - People asked about vimwiki I kinda hate it but maybe I'll add it -- tagalong -- ctrlspace +- neovide +- move coc to coc.old in install script +- later manually link pylance +- lazynpm for floaterm + +## coc additions to check out + - coc-fzf - coc-async-tasks - coc-stylelintplus @@ -144,14 +151,6 @@ Example: - coc-floaterm - coc-actions - coc-bookmark -- maybe better jsx highlighting -- neovide -- move coc to coc.old in install script -- multiple cursors -- pywright -- later manually link pylance -- ale -- spaceline ## 0.5 diff --git a/coc-settings.json b/coc-settings.json index 151921bb..c0f877ed 100644 --- a/coc-settings.json +++ b/coc-settings.json @@ -39,14 +39,14 @@ "coc.preferences.hoverTarget": "float", // python config - "python.linting.enabled": true, - "python.linting.pylintEnabled": true, + "python.linting.enabled": false, + "python.linting.pylintEnabled": false, "python.formatting.provider": "black", // "python.formatting.blackPath": "~/.local/bin/black", // "python.linting.pylintPath": "~/.miniconda/envs/neovim/bin/pylint", - "python.condaPath": "~/.miniconda/bin/conda", - "python.sortImports.path": "~/.miniconda/envs/neovim/bin/isort", - "python.jediPath": "~/.miniconda/envs/neovim/lib/python3.8/site-packages", + // "python.condaPath": "~/.miniconda/bin/conda", + // "python.sortImports.path": "~/.miniconda/envs/neovim/bin/isort", + // "python.jediPath": "~/.miniconda/envs/neovim/lib/python3.8/site-packages", // snippets "snippets.ultisnips.directories": ["UltiSnips", "~/.config/nvim/snips"], @@ -41,6 +41,9 @@ else source $HOME/.config/nvim/plug-config/xtabline.vim source $HOME/.config/nvim/plug-config/polyglot.vim source $HOME/.config/nvim/plug-config/far.vim + source $HOME/.config/nvim/plug-config/tagalong.vim + source $HOME/.config/nvim/plug-config/illuminate.vim + source $HOME/.config/nvim/plug-config/bracey.vim luafile $HOME/.config/nvim/lua/plug-colorizer.lua endif @@ -57,3 +60,4 @@ endif " let g:vimspector_base_dir=expand( '$HOME/.config/nvim/vimspector-config' ) " let g:vimspector_enable_mappings='HUMAN' +" let g:spaceline_colorscheme = 'one' diff --git a/keys/which-key.vim b/keys/which-key.vim index 5e72324b..0351a36d 100644 --- a/keys/which-key.vim +++ b/keys/which-key.vim @@ -50,6 +50,8 @@ let g:which_key_map.a = { \ 'name' : '+actions' , \ 'c' : [':ColorizerToggle' , 'colorizer'], \ 'e' : [':CocCommand explorer' , 'explorer'], + \ 'l' : [':Bracey' , 'start live server'], + \ 'L' : [':BraceyStop' , 'stop live server'], \ 'n' : [':set nonumber!' , 'line-numbers'], \ 'r' : [':set norelativenumber!' , 'relative line nums'], \ 's' : [':let @/ = ""' , 'remove search highlight'], diff --git a/plug-config/bracey.vim b/plug-config/bracey.vim new file mode 100644 index 00000000..d7eda59b --- /dev/null +++ b/plug-config/bracey.vim @@ -0,0 +1,2 @@ +"cd ~/.config/autoload/plugged/bracey.vim for plug +"run npm install --prefix server diff --git a/plug-config/coc.vim b/plug-config/coc.vim index c554a0c1..17a3e71d 100644 --- a/plug-config/coc.vim +++ b/plug-config/coc.vim @@ -11,7 +11,7 @@ \ 'coc-emoji', \ 'coc-cssmodules', \ 'coc-yaml', - \ 'coc-python', + \ 'coc-pyright', \ 'coc-explorer', \ 'coc-svg', \ 'coc-prettier', diff --git a/plug-config/illuminate.vim b/plug-config/illuminate.vim new file mode 100644 index 00000000..75e4a322 --- /dev/null +++ b/plug-config/illuminate.vim @@ -0,0 +1,2 @@ +" have to disable for html for now until I can just blacklist the highlight group +let g:Illuminate_ftblacklist = ['javascript', 'jsx', 'html'] diff --git a/plug-config/polyglot.vim b/plug-config/polyglot.vim index 80287070..8c82247c 100644 --- a/plug-config/polyglot.vim +++ b/plug-config/polyglot.vim @@ -1,3 +1,7 @@ let g:polyglot_disabled = ['csv'] let g:python_highlight_all=1 + +let g:vim_jsx_pretty_colorful_config = 1 + +set re=0 diff --git a/plug-config/tagalong.vim b/plug-config/tagalong.vim new file mode 100644 index 00000000..3ddd27b4 --- /dev/null +++ b/plug-config/tagalong.vim @@ -0,0 +1,2 @@ +let g:tagalong_filetypes = ['html', 'xml', 'jsx', 'eruby', 'ejs', 'eco', 'php', 'htmldjango', 'javascriptreact', 'typescriptreact', 'javascript'] +let g:tagalong_verbose = 1 diff --git a/vim-plug/plugins.vim b/vim-plug/plugins.vim index 608ecb8e..340e5d52 100644 --- a/vim-plug/plugins.vim +++ b/vim-plug/plugins.vim @@ -61,6 +61,7 @@ call plug#begin('~/.config/nvim/autoload/plugged') Plug 'neoclide/coc.nvim', {'branch': 'release'} " Status Line Plug 'vim-airline/vim-airline' + " Plug 'hardcoreplayers/spaceline.vim' " Plug 'vim-airline/vim-airline-themes' " Ranger " Plug 'francoiscabrol/ranger.vim' @@ -102,9 +103,18 @@ call plug#begin('~/.config/nvim/autoload/plugged') Plug 'puremourning/vimspector' " Better tabline Plug 'mg979/vim-xtabline' + " undo time travel Plug 'mbbill/undotree' + " highlight all matches under cursor Plug 'RRethy/vim-illuminate' + " Find and replace Plug 'brooth/far.vim' + " Auto change html tags + Plug 'AndrewRadev/tagalong.vim' + " live server + Plug 'turbio/bracey.vim' + " Typescript syntax + Plug 'HerringtonDarkholme/yats.vim' endif |