From 495e537e081d10419524cf4e36089ddb34ffd3f7 Mon Sep 17 00:00:00 2001
From: Sanchayan Maity <maitysanchayan@gmail.com>
Date: Sat, 11 Jan 2020 21:05:54 +0530
Subject: [PATCH] nvim: Cleanup & remove things we do not need

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
---
 nvim/.config/nvim/init.vim | 56 +++++++++++++-------------------------
 1 file changed, 19 insertions(+), 37 deletions(-)

diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index f1a6484..cc84a22 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -40,7 +40,6 @@ Plug 'rbong/vim-flog'
 " For tmux yank
 Plug 'vim-utils/vim-husk'
 " Tags
-Plug 'sk1418/QFGrep'
 Plug 'steffanc/cscopemaps.vim', { 'for': 'c' }
 " GDB
 Plug 'sakhnik/nvim-gdb', { 'do': ':UpdateRemotePlugins' }
@@ -70,9 +69,6 @@ Plug 'sebastianmarkow/deoplete-rust', { 'for': 'rust' }
 Plug 'cespare/vim-toml', { 'for': 'rust' }
 Plug 'rust-lang/rust.vim', { 'for': 'rust' }
 Plug 'mhinz/vim-crates'
-" Snippets
-Plug 'SirVer/ultisnips'
-Plug 'honza/vim-snippets'
 " Erlang Support
 Plug 'vim-erlang/vim-erlang-tags', { 'for': 'erlang' }
 Plug 'vim-erlang/vim-erlang-runtime', { 'for': 'erlang' }
@@ -84,30 +80,27 @@ Plug 'frigoeu/psc-ide-vim', { 'for': 'purescript' }
 " Neo/Async stuff
 Plug 'sbdchd/neoformat'
 Plug 'neomake/neomake'
-" Miscellaneous
+" Quickfix
+Plug 'sk1418/QFGrep'
+Plug 'stefandtw/quickfix-reflector.vim'
+" Absolute essentials miscellaneous
 Plug 'tpope/vim-surround'
 Plug 'tpope/vim-repeat'
 Plug 'tpope/vim-eunuch'
 Plug 'tpope/vim-sleuth'
 Plug 'tpope/vim-vinegar'
+Plug 'wellle/targets.vim'
+Plug 'Yggdroot/indentLine'
+" Miscellaneous
 Plug 'editorconfig/editorconfig-vim'
 Plug 'igankevich/mesonic'
-Plug 'stefandtw/quickfix-reflector.vim'
 Plug 'psliwka/vim-smoothie'
-Plug 'lifecrisis/vim-difforig'
 Plug 'dag/vim-fish'
 Plug 'lifepillar/pgsql.vim'
-Plug 'mbbill/undotree'
+Plug 'simnalamburt/vim-mundo'
 Plug 'milkypostman/vim-togglelist'
-Plug 'jpalardy/vim-slime'
 Plug 'liuchengxu/vim-which-key'
-Plug 'jceb/vim-orgmode'
-Plug 'wellle/targets.vim'
 Plug 'godlygeek/tabular'
-Plug 'Yggdroot/indentLine'
-Plug 'HiPhish/awk-ward.nvim'
-Plug 'vim-pandoc/vim-pandoc'
-Plug 'vim-pandoc/vim-pandoc-syntax'
 
 " Initialize plugin system
 call plug#end()
@@ -183,7 +176,7 @@ set inccommand=split
 
 set clipboard^=unnamed,unnamedplus
 set backspace=indent,eol,start
-set completeopt+=menu,noselect,preview,noinsert
+set completeopt=menu,noselect,preview,noinsert
 " Required for vim-workspace
 " See https://github.com/thaerkh/vim-workspace/issues/11
 set sessionoptions-=blank
@@ -228,10 +221,12 @@ nnoremap fo  :Locate<SPACE>
 nnoremap fk  :Maps<CR>
 nnoremap f/  :Rg<CR>
 nnoremap *   :exe ':Rg ' . expand('<cword>')<CR>
-" Quick buffer switching
-nnoremap <Leader>b :ls<CR>:b<Space>
+imap <C-x><C-w> <plug>(fzf-complete-word)
+imap <C-x><C-p> <plug>(fzf-complete-path)
+imap <C-x><C-f> <plug>(fzf-complete-file)
+imap <C-x><C-l> <plug>(fzf-complete-line)
 " Undo tree
-nnoremap <Leader>u :UndotreeToggle<CR>
+nnoremap <Leader>u :MundoToggle<CR>
 " Save
 nnoremap <Leader>w <Esc>:w<CR>
 " Search and Replace
@@ -250,9 +245,6 @@ nnoremap [B :bfirst<CR>
 nnoremap ]B :blast<CR>
 " Terminal
 nnoremap <Leader>te :vsp<CR> :terminal<CR>
-nnoremap <Leader>tc :SlimeConfig<CR>
-xmap <Leader>ts <Plug>SlimeRegionSend
-nmap <Leader>ts <Plug>SlimeParagraphSend
 " For git
 nnoremap <Leader>gm :GitMessenger<CR>
 nnoremap <Leader>gl :0Glog<CR>
@@ -351,8 +343,9 @@ noremap <silent><expr> ?  incsearch#go(<SID>incsearch_config({'command': '?'}))
 noremap <silent><expr> g/ incsearch#go(<SID>incsearch_config({'is_stay': 1}))
 
 " Tag helpers
-map <C-\> :vsp <CR>:exec("tag ".expand("<cword>"))<CR>
-map <A-]> :sp <CR>:exec("tag ".expand("<cword>"))<CR>
+nnoremap gd :exec("tag ".expand("<cword>"))<CR>
+nnoremap <C-\> :vsp <CR>:exec("tag ".expand("<cword>"))<CR>
+nnoremap <A-]> :sp <CR>:exec("tag ".expand("<cword>"))<CR>
 
 " Tabular helpers
 vmap a= :Tabularize /=<CR>
@@ -468,7 +461,6 @@ augroup END
 
 augroup terminal_job
 	au!
-	au TermOpen * setlocal statusline=%{b:terminal_job_id}
 	au TermOpen * startinsert
 	au TermOpen * setlocal listchars= nonumber norelativenumber
 augroup END
@@ -540,7 +532,8 @@ call deoplete#custom#source('_',
             \ 'disabled_syntaxes', ['Comment', 'String'])
 call deoplete#custom#option('sources', {
 			\ '_' : ['buffer', 'tag', 'around', 'file', 'member'],
-			\ 'rust': ['racer'],
+			\ 'haskell': ['buffer', 'tag'],
+			\ 'rust': ['racer', 'buffer', 'tag'],
 			\ 'purescript': ['buffer', 'omni'],
 			\})
 call deoplete#custom#source('omni', 'functions', {
@@ -618,12 +611,6 @@ let g:workspace_autosave_ignore = ['gitcommit', 'qf', 'tagbar']
 let g:workspace_session_disable_on_args = 1
 " Toggle quickfix/location list
 let g:toggle_list_no_mappings = 1
-" Slime
-let g:slime_target = "neovim"
-let g:slime_no_mappings = 1
-let g:slime_python_ipython = 1
-let g:slime_dont_ask_default = 1
-let g:slime_preserve_curpos = 0
 
 let g:nvimgdb_config_override = {
   \ 'key_next': 'n',
@@ -645,11 +632,6 @@ let g:cpp_class_decl_highlight = 1
 let g:cpp_posix_standard = 1
 let g:cpp_concepts_highlight = 1
 
-let g:UltiSnipsExpandTrigger="<Tab>"
-let g:UltiSnipsJumpForwardTrigger="<C-b>"
-let g:UltiSnipsJumpBackwardTrigger="<C-z>"
-let g:UltiSnipsEditSplit="vertical"
-
 let g:jedi#goto_command = "gt"
 let g:jedi#goto_assignments_command = "ga"
 let g:jedi#goto_definitions_command = "gd"