From 4bf3988e19a8e37cb7407aaf2b331ad081cb8736 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppet.com>
Date: Fri, 27 Jan 2017 08:46:01 -0800
Subject: [PATCH] Update nvim, zshrc, khdrc

---
 .config/nvim/init.vim | 18 +++++++++---------
 .khdrc                | 10 +++++-----
 .zshrc                |  8 +++-----
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index a87234c..6903a2e 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -19,18 +19,18 @@ Plug 'rodjek/vim-puppet'
 call plug#end()
 
 " Because.
-"noremap <Space> :
+noremap <Space> :
 let mapleader = ","
 
-nnoremap <C-U> :MundoToggle<CR>
+nnoremap <C-u> :MundoToggle<CR>
 " <Leader><Leader>+(s)earch, (w)ord for jumping
 
-noremap <Space>fs :w<CR>
-noremap <Space>qq :q<CR>
-noremap <Space>qa :qa<CR>
-noremap <Space>ff :Files<CR>
-noremap <Space>pf :GFiles<CR>
-noremap <Space>bb :Buffers<CR>
+"noremap <Space>fs :w<CR>
+"noremap <Space>qq :q<CR>
+"noremap <Space>qa :qa<CR>
+"noremap <Space>ff :Files<CR>
+"noremap <Space>pf :GFiles<CR>
+"noremap <Space>bb :Buffers<CR>
 
 noremap <Leader>f :Files<CR>
 noremap <Leader>F :Files %:p:h<CR>
@@ -57,7 +57,7 @@ noremap <F1> :Helptags<CR>
 " --color: Search color options
 command! -bang -nargs=* Rg call fzf#vim#grep('rg --column --line-number --no-heading --fixed-strings --ignore-case --no-ignore --hidden --follow --glob "!.git/*" --color "always" '.shellescape(<q-args>), 1, <bang>0)
 noremap <Leader>/ :Rg<CR>
-noremap <Space>/ :Rg<CR>
+"noremap <Space>/ :Rg<CR>
 
 function s:get_buffer_git_root(...)
   let root = fugitive#repo().tree(expand('%:p:h'))
diff --git a/.khdrc b/.khdrc
index bba7b2e..88fddf2 100644
--- a/.khdrc
+++ b/.khdrc
@@ -135,7 +135,7 @@ info + ctrl - 0x2A      :   khd -e "mode activate default"
 switcher - y            :   khd -e "mode activate ytd"
 switcher - m            :   khd -e "mode activate swap"
 switcher - s            :   khd -e "mode activate space"
-switcher - d            :   khd -e "mode activate tree"
+switcher - t            :   khd -e "mode activate tree"
 switcher - i            :   khd -e "mode activate info"
 
 
@@ -234,10 +234,10 @@ swap + shift - m        :   kwmc window -m mark
 #
 #swap - z                :   kwmc window -m space left
 #swap - c                :   kwmc window -m space right
-#
-#swap + shift - 1        :   kwmc window -m display 0
-#swap + shift - 2        :   kwmc window -m display 1
-#swap + shift - 3        :   kwmc window -m display 2
+
+swap + shift - 1        :   kwmc window -m display 0
+swap + shift - 2        :   kwmc window -m display 1
+swap + shift - 3        :   kwmc window -m display 2
 
 
 
diff --git a/.zshrc b/.zshrc
index 0de8ddc..5964711 100644
--- a/.zshrc
+++ b/.zshrc
@@ -169,12 +169,10 @@ else
 fi
 
 ## Set up vim aliases
-if whence vim > /dev/null ; then
+if whence nvim > /dev/null ; then
+    VIM=nvim
+elif whence vim > /dev/null ; then
     VIM=vim
-    if whence mvim > /dev/null ; then
-        #VIM=mvim
-        VIM="mvim -c 'au VimLeave * maca hide:'"
-    fi
 else
     VIM=vi
 fi