From 516d7d86c50c0c338b98e79588deeff30789690e Mon Sep 17 00:00:00 2001
From: James Dixon <notjamesdixon@gmail.com>
Date: Thu, 26 Nov 2020 00:49:25 -0500
Subject: [PATCH] change location of some stuff

---
 files/vim/.vim/keybinds.vim | 49 ++++++++++++++++++++++++++++
 files/vim/.vim/plugins.vim  | 65 ++++---------------------------------
 2 files changed, 56 insertions(+), 58 deletions(-)

diff --git a/files/vim/.vim/keybinds.vim b/files/vim/.vim/keybinds.vim
index 9ee04ff..a387493 100644
--- a/files/vim/.vim/keybinds.vim
+++ b/files/vim/.vim/keybinds.vim
@@ -40,3 +40,52 @@ nnoremap =j :%!python -m json.tool<CR>
 "abbrevations
 inoreabbrev <expr> #!! "#!/usr/bin/env"
 "}}}
+
+"plugin keybinds
+"{{{
+"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>
+
+"}}}
diff --git a/files/vim/.vim/plugins.vim b/files/vim/.vim/plugins.vim
index 175b940..1423f3c 100644
--- a/files/vim/.vim/plugins.vim
+++ b/files/vim/.vim/plugins.vim
@@ -11,29 +11,30 @@ if empty(glob(plugDir))
     autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
 endif
 
+"pre plugin settings
+
 call plug#begin(pluginDir)
     Plug 'junegunn/vim-plug'
 
+    " == quality of life ==
     "normal mode keybinds
     Plug 'tpope/vim-commentary'
     Plug 'tpope/vim-surround'
     Plug 'tpope/vim-unimpaired'
-
     "command mode keybinds
     Plug 'tpope/vim-rsi'
     Plug 'tpope/vim-eunuch'
     Plug 'tpope/vim-repeat'
-
     "git
     Plug 'tpope/vim-fugitive'
     Plug 'tpope/vim-rhubarb'
     Plug 'tpope/vim-dispatch'
     Plug 'airblade/vim-gitgutter'
-
     "fzf
     Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
     Plug 'junegunn/fzf.vim'
 
+    " == language support ==
     "go
     Plug 'fatih/vim-go'
     "html
@@ -41,19 +42,16 @@ call plug#begin(pluginDir)
     "markdown
     Plug 'plasticboy/vim-markdown'
     Plug 'godlygeek/tabular'
-
-    "colorpack
-    Plug 'flazz/vim-colorschemes'
-
     "linting and lsp
     Plug 'w0rp/ale'
 
-    "qol
+    " == extra ==
+    Plug 'flazz/vim-colorschemes'
     Plug 'editorconfig/editorconfig-vim'
     Plug 'tyru/open-browser.vim'
 call plug#end()
 
-"plugin settings
+"post plugin settings
 "---------------{{{
 "netrw
 let g:netrw_banner = 0
@@ -99,52 +97,3 @@ let g:vim_markdown_frontmatter = 1
 let g:user_emmet_install_global = 0
 
 "}}}
-
-"plugin keybinds
-"{{{
-"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>
-
-"}}}