From 4002bf78e153bc194a6826f20acaf0e4cdd14f7e Mon Sep 17 00:00:00 2001
From: Matthew Lemon <y@yulqen.org>
Date: Mon, 29 May 2023 17:50:12 +0100
Subject: Some more cleanup

---
 nvim-using-vimrc/init.vim | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'nvim-using-vimrc')

diff --git a/nvim-using-vimrc/init.vim b/nvim-using-vimrc/init.vim
index 27ae0ec..356fd5e 100644
--- a/nvim-using-vimrc/init.vim
+++ b/nvim-using-vimrc/init.vim
@@ -138,6 +138,7 @@ noremap <silent> <leader>rs :!clear; sh %<CR>
 
 " essential plugins
 call plug#begin()
+"Plug 'vim-scripts/AutoComplPop'
 Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
 Plug 'junegunn/goyo.vim'
 Plug 'junegunn/fzf.vim'
@@ -152,7 +153,7 @@ Plug 'tpope/vim-fugitive'
 Plug 'fatih/vim-go', {'do': ':GoUpdateBinaries' }
 Plug 'tpope/vim-dispatch'
 Plug 'tpope/vim-commentary'
-"Plug 'ycm-core/YouCompleteMe'
+Plug 'ycm-core/YouCompleteMe'
 "Plug 'jayli/vim-easycomplete'
 Plug 'rose-pine/vim'
 Plug 'SirVer/UltiSnips'
@@ -161,9 +162,6 @@ Plug 'dense-analysis/ale'
 Plug 'davidhalter/jedi-vim'
 call plug#end()
 
-" easycomplete
-"let g:easycomplete_tab_trigger="<c-space>"
-
 " jedi-vim
 let g:jedi#goto_command = "<leader>d"
 let g:jedi#goto_assignments_command = "<leader>g"
@@ -198,7 +196,6 @@ nnoremap <leader>jd :YcmCompleter GoTo<CR>
 imap <silent> <C-l> <Plug>(YCMToggleSignatureHelp)'.
 
 
-
 " snippets
 " Trigger configuration. You need to change this to something other than <tab> if you use one of the following:
 " - https://github.com/Valloric/YouCompleteMe
@@ -209,6 +206,10 @@ let g:UltiSnipsJumpBackwardTrigger="<c-z>"
 
 " If you want :UltiSnipsEdit to split your window.
 let g:UltiSnipsEditSplit="vertical"
+let g:UltiSnipsExpandTrigger="<tab>"
+let g:UltiSnipsJumpForwardTrigger="<c-j>"
+let g:UltiSnipsJumpBackwardTrigger="<c-k>"
+set completefunc=UltiSnips#Complete
 
 " vim-test
 nmap <silent> tn :TestNearest<CR>
@@ -262,6 +263,9 @@ set hidden
 set t_Co=256
 "set t_Co=0 - switches off all colours
 set path+=**
+set relativenumber
+"set spell
+set number
 set more
 set signcolumn=yes
 set colorcolumn=0
@@ -269,11 +273,14 @@ set equalalways
 set showmode
 set nobackup
 set listchars=tab:»→,trail:␣
+set shortmess+=c
+set complete+=kspell
+set completeopt=menuone,longest,preview
+set omnifunc=syntaxcomplete#Complete
 if executable('ag')
     set grepprg=ag\ --vimgrep\ --nogroup\ --nocolor
 endif
 
-
 " From Practical Vim p101 - Easy expansion of Active File Directory
 cnoremap <expr> %% getcmdtype() == ':' ? expand('%:h').'/' : '%%'
 
@@ -293,12 +300,6 @@ function! s:copy_filename_as_mdlink()
 endfunction
 autocmd BufLeave * call s:copy_filename_as_mdlink()
 
-" Ultisnips
-let g:UltiSnipsExpandTrigger="<tab>"
-let g:UltiSnipsJumpForwardTrigger="<c-j>"
-let g:UltiSnipsJumpBackwardTrigger="<c-k>"
-"set completefunc=UltiSnips#Complete
-set omnifunc=syntaxcomplete#Complete
 
 
 " vim-test
-- 
cgit v1.2.3