From 281f2a5a86f5fd11d7b858c734dc8fc089c68fc0 Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Sun, 9 May 2021 21:58:06 -0400
Subject: [PATCH] vim cleanup

---
 homebrew/learning.Brewfile           |  1 -
 nvim.configlink/settings/custom.vim  | 15 +--------------
 nvim.configlink/settings/general.vim |  6 +++---
 nvim.configlink/settings/plugins.vim |  7 +++----
 4 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/homebrew/learning.Brewfile b/homebrew/learning.Brewfile
index 8f68511..53bc25d 100644
--- a/homebrew/learning.Brewfile
+++ b/homebrew/learning.Brewfile
@@ -14,5 +14,4 @@ brew "noti"                          # Create system notifications
 brew "b2-tools"                      # BackBlaze B2 storage
 brew "cjbassi/ytop/ytop"             # Fancy system performance
 brew "nmasur/repo/update-ssh-config" # Update .ssh/config
-brew "kakoune"                       # Modal editor
 brew "awslogs"                       # View AWS log streams
diff --git a/nvim.configlink/settings/custom.vim b/nvim.configlink/settings/custom.vim
index 04fb83e..c94b6dd 100644
--- a/nvim.configlink/settings/custom.vim
+++ b/nvim.configlink/settings/custom.vim
@@ -11,13 +11,9 @@ command! Today exe 'edit ~/notes/journal/'.strftime("%Y-%m-%d_%a").'.md'
 " Map the leader key
 map <Space> <Leader>
 
-"This unsets the `last search pattern` register by hitting return
+" Unsets the search pattern register by hitting return
 nnoremap <silent> <CR> :noh<CR><CR>
 
-" Find and replace
-nnoremap <Leader>S :%s/
-vnoremap <leader>S :s/
-
 " Shuffle lines around
 nnoremap <A-j> :m .+1<CR>==
 nnoremap <A-k> :m .-2<CR>==
@@ -63,15 +59,9 @@ nnoremap <Leader><Tab> :b#<cr>
 " Jump to text in this file
 nnoremap <Leader>s :BLines<cr>
 
-" Start Magit buffer
-nnoremap <Leader>gs :Magit<cr>
-
 " Toggle Git gutter (by line numbers)
 nnoremap <Leader>` :GitGutterToggle<cr>
 
-" Git push
-nnoremap <Leader>gp :Git push<cr>
-
 " Git repo
 nnoremap <silent> <Leader>gr :!gh repo view -w<cr><cr>
 
@@ -105,9 +95,6 @@ tnoremap <A-CR> <C-\><C-n>
 nnoremap <Leader>rr :Refresh<cr>
 nnoremap <Leader>rp :Refresh<cr> :PlugInstall<cr>
 
-" Open file tree
-nnoremap <silent> <Leader>ft :Fern . -drawer -width=35 -toggle<CR><C-w>=
-
 " Tabularize
 noremap <Leader>ta :Tabularize /
 noremap <Leader>t# :Tabularize /#<CR>
diff --git a/nvim.configlink/settings/general.vim b/nvim.configlink/settings/general.vim
index a87cd4b..f1f53dd 100644
--- a/nvim.configlink/settings/general.vim
+++ b/nvim.configlink/settings/general.vim
@@ -20,10 +20,10 @@ set smartcase              " Check case when using capitals in search
 set infercase              " Don't match cases when completing suggestions
 set incsearch              " Search while typing
 set visualbell             " No sounds
-set scrolljump=1           " Scroll more than one line (or 1 line)
-set scrolloff=3            " Margin of lines when to start scrolling
+set scrolljump=1           " Number of lines to scroll
+set scrolloff=3            " Margin of lines to see while scrolling
 set splitright             " Vertical splits on the right side
-set splitbelow             " Horizontal splits on the lower side
+set splitbelow             " Horizontal splits on the bottom side
 set pastetoggle=<F3>       " Use F3 to enter raw paste mode
 set clipboard+=unnamedplus " Uses system clipboard for yanking
 set updatetime=300         " Faster diagnostics
diff --git a/nvim.configlink/settings/plugins.vim b/nvim.configlink/settings/plugins.vim
index 592130e..2ca8b17 100644
--- a/nvim.configlink/settings/plugins.vim
+++ b/nvim.configlink/settings/plugins.vim
@@ -13,25 +13,24 @@ call plug#begin('$HOME/.config/nvim/plugged')
 
 " Core plugins
 Plug 'morhetz/gruvbox'                              " Colorscheme
-Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } " Required for fuzzyfinder
+Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } " Install fzf (required)
 Plug 'junegunn/fzf.vim'                             " Actual fuzzyfinder
 Plug 'tpope/vim-surround'                           " Enables paren editing
 Plug 'sheerun/vim-polyglot'                         " Syntax for every language
 Plug 'airblade/vim-gitgutter'                       " Git next to line numbers
 Plug 'tpope/vim-commentary'                         " Use gc or gcc to comment
-Plug 'godlygeek/tabular'                            " Spacing and alignment
+Plug 'phaazon/hop.nvim'                             " Quick jump around the buffer
 
 " Ancillary plugins
+Plug 'godlygeek/tabular'              " Spacing and alignment
 Plug 'unblevable/quick-scope'         " Hints for f and t
 Plug 'vimwiki/vimwiki'                " Wiki Markdown System
-Plug 'jreybert/vimagit'               " Git 'gui' buffer
 Plug 'airblade/vim-rooter'            " Change directory to git route
 Plug 'tpope/vim-fugitive'             " Other git commands
 Plug 'machakann/vim-highlightedyank'  " Highlight text when copied
 Plug 'itchyny/lightline.vim'          " Status bar
 Plug 'tpope/vim-eunuch'               " File manipulation in Vim
 Plug 'tpope/vim-vinegar'              " Fixes netrw file explorer
-Plug 'lambdalisue/fern.vim'           " File explorer / project drawer
 Plug 'christoomey/vim-tmux-navigator' " Hotkeys for tmux panes
 
 " CoC (Language Server Protocol, requires NodeJS)