From af967647582a7b888318a0471fd3872f8ff286b7 Mon Sep 17 00:00:00 2001
From: James Dixon <notjamesdixon@gmail.com>
Date: Tue, 2 Feb 2021 18:13:53 -0500
Subject: [PATCH] update keybinds

---
 _vimrc | 82 +++++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 64 insertions(+), 18 deletions(-)

diff --git a/_vimrc b/_vimrc
index 102ca77..7df32ec 100644
--- a/_vimrc
+++ b/_vimrc
@@ -234,14 +234,16 @@ let g:user_emmet_install_global = 0
 " colorscheme monokai-phoenix
 colorscheme solarized8_dark
 
+" keybinds
+"----------
 "leader key
 let mapleader=' '
 
-"normal/visual mode keybinds
-"---------------------------
+"normal mode keybinds
+"---------------
 "paste and search
-nnoremap <silent><leader><space> :let @/ = ""<CR>
-nnoremap <leader>p :set invpaste<CR>
+nnoremap <silent><leader><space> :noh <BAR> :let @/ = ""<CR>
+nnoremap <leader>i :set invpaste<CR>
 
 "toggles
 nnoremap <silent><leader>lb :call ToggleLineBreak()<CR>
@@ -254,29 +256,73 @@ nnoremap <leader>dt :r !date<CR>
 
 "rc files
 nnoremap <leader>rc :vsplit $MYVIMRC<CR>
+nnoremap <leader>rcs :vsplit ~/.vim/settings.vim<CR>
+nnoremap <leader>rcf :vsplit ~/.vim/functions.vim<CR>
+nnoremap <leader>rcc :vsplit ~/.vim/commands.vim<CR>
+nnoremap <leader>rck :vsplit ~/.vim/keybinds.vim<CR>
+nnoremap <leader>rcp :vsplit ~/.vim/plugins.vim<CR>
+nnoremap <leader>rca :vsplit ~/.vim/autocmds.vim<CR>
+nnoremap <leader>rcft :vsplit $HOME/.vim/after/ftplugin/<CR>
+nnoremap <leader>rcl :vsplit ~/.config/vimrc<CR>
 nnoremap <leader>so :source $MYVIMRC<CR>
 
+"windows
+nnoremap <leader>cl :close<CR>
+
 "formatting tools
 nnoremap =j :%!python -m json.tool<CR>
 
-"plugin keybinds
-nnoremap <silent><leader>e :call ToggleNetrw()<CR>
-nnoremap <leader>at :ALEToggle<CR>
-
-
-"insert mode keybinds/abbreviations
+"insert mode keybinds
 "--------------------
+"abbrevations
 inoreabbrev <expr> #!! "#!/usr/bin/env"
 
-"custom commands
+"plugin keybinds
 "---------------
-"common typos and abbreviations
-cnoremap w!! w !sudo tee % > /dev/null
-command! W w !sudo tee % > /dev/null
-command! Trim %s/\s\+$//
-command! Q q
-command! WQ wq
-command! Q1 q!
+"netrw
+nnoremap <silent><leader>e :call ToggleNetrw()<CR>
+
+"vim-plug
+nnoremap <leader>pi :source $MYVIMRC <BAR> :PlugInstall<CR>
+nnoremap <leader>pu :source $MYVIMRC <BAR> :PlugUpdate<CR>
+nnoremap <leader>pc :source $MYVIMRC <BAR> :PlugClean<CR>
+
+"openbrowser
+nnoremap <leader>ob :OpenBrowser
+nnoremap <leader>obs :OpenBrowserSearch
+nmap gx <Plug>(openbrowser-smart-search)
+vmap gx <Plug>(openbrowser-smart-search)
+
+"ale
+nnoremap <leader>at :ALEToggle<CR>
+nmap <leader>af <Plug>(ale_fix)
+nmap <leader>aK <Plug>(ale_hover)
+nmap <leader>agd <Plug>(ale_go_to_definition)
+nmap <leader>agd <Plug>(ale_go_to_definition)
+
+"vim-emmet
+let g:user_emmet_leader_key = ','
+
+"git-gutter
+nnoremap <leader>ggt :GitGutterToggle<CR>
+
+"vim-fugitive
+nnoremap <leader>gw :Gwrite<CR>
+nnoremap <leader>gl :Glog<CR>
+nnoremap <leader>gs :Gstatus<CR>
+nnoremap <leader>gd :Gdiffsplit<CR>
+nnoremap <leader>gp :Gpush<CR>
+nnoremap <leader>ga :Git add %<CR>
+nnoremap <leader>ga. :Git add .<CR>
+nnoremap <leader>gcm :Gcommit<CR>
+
+"fzf
+nnoremap <leader>gf :GitFiles<CR>
+nnoremap <leader>f :Files<CR>
+nnoremap <leader>b :Buffers<CR>
+nnoremap <leader>h :Helptags<CR>
+nnoremap <leader>m :Maps<CR>
+nnoremap <leader>rg :Rg<CR>
 
 "general functions
 "-----------------