From 950cf246e71f75d1c7aa5150fc36167a5dfd930f Mon Sep 17 00:00:00 2001
From: Matthew Lemon <y@yulqen.org>
Date: Sat, 6 May 2023 15:21:13 +0100
Subject: Adopts minimal vim config to match Debian setup

---
 vim/vimrc | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

(limited to 'vim/vimrc')

diff --git a/vim/vimrc b/vim/vimrc
index d7e3050..fb87273 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -55,17 +55,18 @@ Plug 'preservim/vim-markdown'
 Plug 'mhinz/vim-signify'
 Plug 'vim-test/vim-test'
 Plug 'ledger/vim-ledger'
-Plug 'jlanzarotta/bufexplorer'
+" Plug 'jlanzarotta/bufexplorer'
 Plug 'tpope/vim-fugitive'
+Plug 'fatih/vim-go', {'do': ':GoUpdateBinaries' }
 Plug 'tpope/vim-dispatch'
 Plug 'tpope/vim-commentary'
 "Plug 'ycm-core/YouCompleteMe'
 "Plug 'jayli/vim-easycomplete'
-Plug 'rose-pine/vim'
+" Plug 'rose-pine/vim'
 Plug 'SirVer/UltiSnips'
 Plug 'honza/vim-snippets'
-Plug 'dense-analysis/ale'
-Plug 'davidhalter/jedi-vim'
+" Plug 'dense-analysis/ale'
+" Plug 'davidhalter/jedi-vim'
 call plug#end()
 
 " easycomplete
@@ -139,8 +140,8 @@ let test#vimterminal#term_position = "belowright"
 set shell=/bin/sh
 set hi=500
 set scrolloff=0
-set novisualbell
-set relativenumber	"show line numbers
+" set novisualbell
+"set relativenumber	"show line numbers
 set wildignore=**/__pycache*/**
 set wildmenu	"enable a menu that shows tab completion options in the status bar
 set wildchar=<TAB>
@@ -176,8 +177,8 @@ set equalalways
 set showmode
 set nobackup
 set listchars=tab:»→,trail:␣
-if executable('rg')
-	set grepprg=rg\ --color=never\ --vimgrep
+if executable('ag')
+    set grepprg=ag\ --vimgrep\ --nogroup\ --nocolor
 endif
 
 " From Practical Vim p101 - Easy expansion of Active File Directory
@@ -396,9 +397,9 @@ nnoremap <leader>Y :let @+=printf("[%s](%s)", expand('%:t'), "file://" . expand(
   nnoremap <silent> <leader>; :BLines<CR>
   nnoremap <silent> <leader>l :Lines<CR>
   nnoremap <silent> <leader>o :BTags<CR>
-  nnoremap <silent> <leader>bu :Buffers<CR>
+  nnoremap <silent> <leader>b :Buffers<CR>
   nnoremap <silent> <leader>? :History:<CR>
-  " nnoremap <silent> <leader>/ :execute 'Ag ' . input('Ag/')<CR>
+  nnoremap <silent> <leader>/ :execute 'Ag ' . input('Ag/')<CR>
   nnoremap <silent> <leader>ft :Filetypes<CR>
   nnoremap <silent> <leader>CC :Commands<CR>
   imap <C-x><C-f> <plug>(fzf-complete-file-ag)
@@ -431,7 +432,7 @@ nnoremap <C-p>a :Rg
 "" Quick Editing vimrc
 nnoremap <leader>ev <C-w>s<C-w>j<C-w>L:e $MYVIMRC<cr>
 
-syntax enable
+" syntax enable
 let g:solarized_termcolors=256
 let g:gruvbox_termcolors=256
 let g:gruvbox_contrast_dark='hard'
@@ -443,7 +444,7 @@ let g:gruvbox_invert_signs='0'
 let g:gruvbox_improved_strings='0'
 set background=dark
 "colorscheme hipster
-colorscheme rosepine
+" colorscheme rosepine
 
 " manual highlights
 " highlight Visual ctermfg=black ctermbg=LightMagenta
@@ -471,3 +472,13 @@ augroup languages
     autocmd FileType html,javascript,css,json,yaml,sh
                 \ setlocal ts=2 sts=2 sw=2 expandtab
 augroup END
+
+" Switching off colours
+syntax off
+set nohlsearch
+set background=dark
+set cursorline
+"set cursorcolumn
+"set visualbell
+highlight clear
+highlight Visual term=reverse cterm=reverse gui=reverse
-- 
cgit v1.2.3