summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Schadt <kingdread@gmx.de>2021-09-22 18:18:07 +0200
committerDaniel Schadt <kingdread@gmx.de>2021-09-22 18:18:07 +0200
commit3334c6a2ff90be7bb996ca62a0c9b4caaa576015 (patch)
tree26fd9a0ac3d42840344247d64b08bd4a24883b9f
parent63a875e38259830f13648850d1e5e4ca9f33e9af (diff)
downloaddotfiles-3334c6a2ff90be7bb996ca62a0c9b4caaa576015.tar.gz
dotfiles-3334c6a2ff90be7bb996ca62a0c9b4caaa576015.tar.bz2
dotfiles-3334c6a2ff90be7bb996ca62a0c9b4caaa576015.zip
[neovim] remove obsolete plugs
This removes YankRing, which only caused error messages in nvim sometimes?! Also, the fisa colorscheme is being replaced by monokai, which works better in nvim-qt and has been updated (fisa-colorscheme seems to be stale since 2014). It also removes some options related to deoplete and jedi, which were not used anyway and whose function is more or less taken over by coc anyway.
-rw-r--r--neovim/.config/nvim/init.vim45
1 files changed, 2 insertions, 43 deletions
diff --git a/neovim/.config/nvim/init.vim b/neovim/.config/nvim/init.vim
index 9146646..93066ff 100644
--- a/neovim/.config/nvim/init.vim
+++ b/neovim/.config/nvim/init.vim
@@ -56,7 +56,7 @@ Plug 'majutsushi/tagbar'
Plug 'vim-scripts/IndexedSearch'
" Terminal Vim with 256 colors colorscheme
-Plug 'fisadev/fisa-vim-colorscheme'
+Plug 'patstockwell/vim-monokai-tasty'
" Airline
Plug 'vim-airline/vim-airline'
@@ -202,9 +202,6 @@ Plug 'tpope/vim-fugitive'
" Git/mercurial/others diff icons on the side of the file lines
Plug 'mhinz/vim-signify'
-" Yank history navigation
-Plug 'vim-scripts/YankRing.vim'
-
" Linters
"Plug 'neomake/neomake'
" TODO is it running on save? or when?
@@ -247,12 +244,7 @@ set shiftwidth=4
set nu
" use 256 colors when possible
-if (&term =~? 'mlterm\|xterm\|xterm-256\|screen-256') || has('nvim')
- let &t_Co = 256
- colorscheme fisa
-else
- colorscheme delek
-endif
+colorscheme vim-monokai-tasty
" needed so deoplete can auto select the first suggestion
set completeopt+=noinsert
@@ -346,32 +338,6 @@ nmap ,c :Commands<CR>
"nmap ,wc :call CtrlPWithSearchText(expand('<cword>'), 'CmdPalette')<CR>
-" Deoplete -----------------------------
-
-" Use deoplete.
-
-let g:deoplete#enable_at_startup = 1
-let g:deoplete#enable_ignore_case = 1
-let g:deoplete#enable_smart_case = 1
-" complete with words from any opened file
-let g:context_filetype#same_filetypes = {}
-let g:context_filetype#same_filetypes._ = '_'
-
-" Jedi-vim ------------------------------
-
-" Disable autocompletion (using deoplete instead)
-let g:jedi#completions_enabled = 0
-
-" All these mappings work only for python code:
-" Go to definition
-let g:jedi#goto_command = ',d'
-" Find ocurrences
-let g:jedi#usages_command = ',o'
-" Find assignments
-let g:jedi#goto_assignments_command = ',a'
-" Go to definition in new tab
-nmap ,D :tab split<CR>:call jedi#goto()<CR>
-
" Ack.vim ------------------------------
" mappings
@@ -408,13 +374,6 @@ highlight SignifySignChange cterm=bold ctermbg=237 ctermfg=227
" mode)
let g:AutoClosePumvisible = {"ENTER": "\<C-Y>", "ESC": "\<ESC>"}
-" Yankring -------------------------------
-
-" Fix for yankring and neovim problem when system has non-text things copied
-" in clipboard
-let g:yankring_clipboard_monitor = 0
-let g:yankring_history_dir = '~/.config/nvim/'
-
" Airline ------------------------------
let g:airline_powerline_fonts = 0