From 22ae1591014343813e1ab60182589ef7167a3c71 Mon Sep 17 00:00:00 2001 From: Shawn Anderson Date: Thu, 1 Oct 2020 12:52:03 -0700 Subject: [PATCH] Incremental dev on plugin organization. Going through coc now. --- .../.config/nvim/plugconfig/junegunn/fzf.vim | 1 + .../junegunn/vim-github-dashboard.vim | 1 + .../nvim/plugconfig/neoclide/coc.vim.vim | 15 +++++------- .../nvim/plugconfig/preservim/nerdtree.vim | 13 +++++++++++ dotfiles/.config/nvim/plugins.vim | 23 +++++-------------- 5 files changed, 27 insertions(+), 26 deletions(-) create mode 100644 dotfiles/.config/nvim/plugconfig/junegunn/vim-github-dashboard.vim create mode 100644 dotfiles/.config/nvim/plugconfig/preservim/nerdtree.vim diff --git a/dotfiles/.config/nvim/plugconfig/junegunn/fzf.vim b/dotfiles/.config/nvim/plugconfig/junegunn/fzf.vim index 379c9f6..6fe4b94 100644 --- a/dotfiles/.config/nvim/plugconfig/junegunn/fzf.vim +++ b/dotfiles/.config/nvim/plugconfig/junegunn/fzf.vim @@ -52,3 +52,4 @@ nnoremap :Helptags nnoremap :Maps nnoremap :Buffers nnoremap :Filetypes +nnoremap :Lines diff --git a/dotfiles/.config/nvim/plugconfig/junegunn/vim-github-dashboard.vim b/dotfiles/.config/nvim/plugconfig/junegunn/vim-github-dashboard.vim new file mode 100644 index 0000000..a990bf4 --- /dev/null +++ b/dotfiles/.config/nvim/plugconfig/junegunn/vim-github-dashboard.vim @@ -0,0 +1 @@ +Plug 'junegunn/vim-github-dashboard' diff --git a/dotfiles/.config/nvim/plugconfig/neoclide/coc.vim.vim b/dotfiles/.config/nvim/plugconfig/neoclide/coc.vim.vim index 9421602..5d633e5 100644 --- a/dotfiles/.config/nvim/plugconfig/neoclide/coc.vim.vim +++ b/dotfiles/.config/nvim/plugconfig/neoclide/coc.vim.vim @@ -27,17 +27,16 @@ set signcolumn=yes " Use tab for trigger completion with characters ahead and navigate. " Use command ':verbose imap ' to make sure tab is not mapped by other plugin. +function! s:check_back_space() abort + let col = col('.') - 1 + return !col || getline('.')[col - 1] =~# '\s' +endfunction inoremap \ pumvisible() ? "\" : \ check_back_space() ? "\" : \ coc#refresh() inoremap pumvisible() ? "\" : "\" -function! s:check_back_space() abort - let col = col('.') - 1 - return !col || getline('.')[col - 1] =~# '\s' -endfunction - " Use to trigger completion. inoremap coc#refresh() @@ -102,8 +101,8 @@ omap if (coc-funcobj-i) omap af (coc-funcobj-a) " Use for select selections ranges, needs server support, like: coc-tsserver, coc-python -nmap (coc-range-select) -xmap (coc-range-select) +"nmap (coc-range-select) +"xmap (coc-range-select) " Use `:Format` to format current buffer command! -nargs=0 Format :call CocAction('format') @@ -149,8 +148,6 @@ let g:markdown_fenced_languages = [ " Fancy markdown syntax let g:markdown_fenced_languages = ['css', 'js=javascript'] - - " Using CocList " Show all diagnostics nnoremap a :CocList diagnostics diff --git a/dotfiles/.config/nvim/plugconfig/preservim/nerdtree.vim b/dotfiles/.config/nvim/plugconfig/preservim/nerdtree.vim new file mode 100644 index 0000000..7cdff8a --- /dev/null +++ b/dotfiles/.config/nvim/plugconfig/preservim/nerdtree.vim @@ -0,0 +1,13 @@ +" NERDTree ----------------------------- +" Better file browser +Plug 'preservim/nerdtree' + +" toggle nerdtree display +map :NERDTreeToggle + +" open nerdtree with the current file selected +nmap :NERDTreeFind + +" don't show these file types +let NERDTreeIgnore = ['\.pyc$', '\.pyo$'] + diff --git a/dotfiles/.config/nvim/plugins.vim b/dotfiles/.config/nvim/plugins.vim index 4384b9b..898dafe 100644 --- a/dotfiles/.config/nvim/plugins.vim +++ b/dotfiles/.config/nvim/plugins.vim @@ -23,35 +23,24 @@ nnoremap e viW"ay :e a " Use ,g to jump to plugin readme on github. nnoremap g 0wwlvt."ay :!open https://github.com/a " Use ,x to format Plug 'junegunn/vim-emoji' -> runtime plugconfig/junegunn/vim-emoji -nnoremap x 0ciwruntime plugconfig/t'xxf'xa.vim +nnoremap x 0"xyyciwruntime plugconfig/t'xxf'xa.vime"xp runtime plugconfig/junegunn/vim-emoji.vim runtime plugconfig/pechorin/any-jump.vim runtime plugconfig/townk/vim-autoclose.vim runtime plugconfig/tpope/vim-repeat.vim runtime plugconfig/liuchengxu/vim-which-key.vim -runtime plugconfig/airblade/vim-rooter.vim +"runtime plugconfig/airblade/vim-rooter.vim runtime plugconfig/luochen1990/rainbow.vim runtime plugconfig/preservim/nerdcommenter.vim +runtime plugconfig/preservim/nerdtree.vim runtime plugconfig/neoclide/coc.vim.vim +runtime plugconfig/junegunn/fzf.vim runtime plugconfig/arielrossanigo/dir-configs-override.vim.vim runtime plugconfig/voldikss/vim-floaterm.vim -runtime plugconfig/honza/vim-snippets.vim runtime plugconfig/justinmk/vim-sneak.vim +runtime plugconfig/honza/vim-snippets.vim runtime plugconfig/unblevable/quick-scope.vim -runtime plugconfig/junegunn/fzf.vim -runtime plugconfig/unblevable/quick-scope.vim -" TODO GITHUB DASHBOARD -Plug 'junegunn/vim-github-dashboard' -" Better file browser -Plug 'preservim/nerdtree' -" NERDTree ----------------------------- -" toggle nerdtree display -map :NERDTreeToggle -nmap :NERDTreeFind -" open nerdtree with the current file selected -" don't show these file types -let NERDTreeIgnore = ['\.pyc$', '\.pyo$'] - +runtime plugconfig/junegunn/vim-github-dashboard.vim " Tagbar ----------------------------- Plug 'majutsushi/tagbar'