From b2c84bf38f8f93cc6b7cc46d967416d8af66f694 Mon Sep 17 00:00:00 2001
From: ViViDboarder <ViViDboarder@gmail.com>
Date: Mon, 21 Oct 2019 10:49:27 -0700
Subject: [PATCH] Consolidate init rc files

---
 vim/init.vim                           |  3 +--
 vim/rc/edit.rc.vim                     | 16 -------------
 vim/rc/init.rc.vim                     |  6 -----
 vim/rc/{keymap.rc.vim => input.rc.vim} | 31 ++++++++++++++++++++++++++
 4 files changed, 32 insertions(+), 24 deletions(-)
 delete mode 100644 vim/rc/edit.rc.vim
 rename vim/rc/{keymap.rc.vim => input.rc.vim} (75%)

diff --git a/vim/init.vim b/vim/init.vim
index 456cd55..ee60f0c 100644
--- a/vim/init.vim
+++ b/vim/init.vim
@@ -54,9 +54,8 @@ if empty(glob('~/.vim/autoload/plug.vim'))
 endif
 
 call s:smart_source_rc('init')
-call s:smart_source_rc('keymap')
+call s:smart_source_rc('input')
 call plug#begin()
 call s:smart_source_rc('plugins')
 call plug#end()
-call s:smart_source_rc('edit')
 call s:smart_source_rc('ui')
diff --git a/vim/rc/edit.rc.vim b/vim/rc/edit.rc.vim
deleted file mode 100644
index 96cd8ed..0000000
--- a/vim/rc/edit.rc.vim
+++ /dev/null
@@ -1,16 +0,0 @@
-" TODO: Maybe consolodate into the init.rc.vim
-" Tab functionality
-set expandtab
-set tabstop=4
-set shiftwidth=4
-set softtabstop=4
-set autoindent
-" Ensure backspace actually works
-set backspace=2
-"
-" allow for cursor beyond last character
-set virtualedit=onemore
-" lines to scroll when cursor leaves screen
-set scrolljump=5
-" minimum lines to keep above and below cursor
-set scrolloff=3
diff --git a/vim/rc/init.rc.vim b/vim/rc/init.rc.vim
index d369ebb..c16b1d7 100644
--- a/vim/rc/init.rc.vim
+++ b/vim/rc/init.rc.vim
@@ -1,13 +1,7 @@
-" TODO: Should this go in the original init?
 "Allows filetype detection
 filetype on
 filetype plugin indent on
 
-" TODO: Myabe rename keymap and move this
-" Enable mouse input
-set mousehide
-set mouse=a
-
 " Set backup dirs
 set backup
 if has('nvim')
diff --git a/vim/rc/keymap.rc.vim b/vim/rc/input.rc.vim
similarity index 75%
rename from vim/rc/keymap.rc.vim
rename to vim/rc/input.rc.vim
index 1fc83ff..6e63e35 100644
--- a/vim/rc/keymap.rc.vim
+++ b/vim/rc/input.rc.vim
@@ -1,3 +1,23 @@
+" Tab functionality
+set expandtab
+set tabstop=4
+set shiftwidth=4
+set softtabstop=4
+set autoindent
+" Ensure backspace actually works
+set backspace=2
+"
+" allow for cursor beyond last character
+set virtualedit=onemore
+" lines to scroll when cursor leaves screen
+set scrolljump=5
+" minimum lines to keep above and below cursor
+set scrolloff=3
+
+" Enable mouse input
+set mousehide
+set mouse=a
+
 " Use more convenient leader
 let mapleader="\<Space>"
 
@@ -94,3 +114,14 @@ command Todo grep TODO
 
 " Easy update tags
 command TagsUpdate !ctags -R .
+
+" Set grepprg
+if executable("rg")
+    set grepprg=rg\ --vimgrep\ --no-heading
+    set grepformat=%f:%l:%c:%m,%f:%l:%m
+elseif executable('ag')
+    set grepprg=ag\ --vimgrep\ --nogroup\ --nocolor
+elseif executable('ack')
+    set grepprg=ack
+endif
+" TODO: Add rg