From b00cb2029e5a522d53cb59858102e04b649f4082 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppet.com>
Date: Mon, 24 Jul 2017 15:28:34 -0700
Subject: [PATCH] iterm, kwm/khd, coreos, hub, coffee, gpg, git

---
 .config/nvim/init.vim |  1 +
 .gitconfig            |  2 ++
 .gnupg/gpg-agent.conf |  1 +
 .khdrc                | 35 ++++++++++++++++++++---------------
 .kwm/kwmrc            |  7 +++++++
 .zshrc                |  3 ++-
 6 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index e485036..a5ce4a5 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -17,6 +17,7 @@ Plug 'ciaranm/inkpot'
 Plug 'twerth/ir_black'
 Plug 'rodjek/vim-puppet'
 Plug 'vim-ruby/vim-ruby'
+Plug 'kchmck/vim-coffee-script'
 call plug#end()
 
 " Because.
diff --git a/.gitconfig b/.gitconfig
index 2466d30..a9d2d90 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -28,3 +28,5 @@
 	program = gpg2
 [commit]
 	gpgsign = true
+[http]
+	cookiefile = ~/.gitcookies
diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf
index 7b5a10e..f32733c 100644
--- a/.gnupg/gpg-agent.conf
+++ b/.gnupg/gpg-agent.conf
@@ -3,3 +3,4 @@ max-cache-ttl 3600
 enable-ssh-support
 #disable-scdaemon
 pinentry-program /usr/local/bin/pinentry-mac
+extra-socket /Users/hunner/.gnupg/S.gpg-agent.extra
diff --git a/.khdrc b/.khdrc
index f5d2f9c..85a9c79 100644
--- a/.khdrc
+++ b/.khdrc
@@ -106,20 +106,14 @@
 
 
 
-# enable kwm compatibility mode
-khd kwm on
-
-
-
 # set border color for different modes
-khd mode default color 0xddbdd322
-khd mode switcher color 0xddd5c4a1
-khd mode ytd color 0xddd75f5f
-khd mode swap color 0xdd458588
-khd mode tree color 0xddfabd2f
-khd mode space color 0xddb16286
-khd mode info color 0xddcd950c
-
+khd mode default on_enter kwmc config border focused color 0xddbdd322
+khd mode switcher on_enter kwmc config border focused color 0xddd5c4a1
+khd mode ytd on_enter kwmc config border focused color 0xddd75f5f
+khd mode swap on_enter kwmc config border focused color 0xdd458588
+khd mode tree on_enter kwmc config border focused color 0xddfabd2f
+khd mode space on_enter kwmc config border focused color 0xddb16286
+khd mode info on_enter kwmc config border focused color 0xddcd950c
 
 
 # 0x2A is \
@@ -143,10 +137,11 @@ switcher - i            :   khd -e "mode activate info"
 # switcher mode
 switcher - r            :   khd -e "reload" # reload config
 
-switcher - return       :   open -na /Applications/HyperTerm.app;\
+switcher - return       :   open -na /Applications/Hyper.app;\
                             khd -e "mode activate default"
 
-cmd - return            :   osascript /Users/hunner/local/bin/terminal.scpt
+#cmd - return            :   osascript /Users/hunner/local/bin/terminal.scpt
+cmd - return            :   osascript /Users/hunner/local/bin/iterm_window.scpt
 cmd + ctrl + alt - 9    :   osascript /Users/hunner/local/bin/grayscale.scpt
 
 cmd + alt - h           :   kwmc window -f west
@@ -187,6 +182,16 @@ ctrl + shift - 7        :   kwmc window -m space 7
 ctrl + shift - 8        :   kwmc window -m space 8
 ctrl + shift - 9        :   kwmc window -m space 9
 ctrl + shift - 0        :   kwmc window -m space 10
+ctrl + shift + alt - 1  :   kwmc window -m space 11
+ctrl + shift + alt - 2  :   kwmc window -m space 12
+ctrl + shift + alt - 3  :   kwmc window -m space 13
+ctrl + shift + alt - 4  :   kwmc window -m space 14
+ctrl + shift + alt - 5  :   kwmc window -m space 15
+ctrl + shift + alt - 6  :   kwmc window -m space 16
+ctrl + shift + alt - 7  :   kwmc window -m space 17
+ctrl + shift + alt - 8  :   kwmc window -m space 18
+ctrl + shift + alt - 9  :   kwmc window -m space 19
+ctrl + shift + alt - 0  :   kwmc window -m space 20
 
 #switcher - z            :   kwmc space -fExperimental left
 #switcher - c            :   kwmc space -fExperimental right
diff --git a/.kwm/kwmrc b/.kwm/kwmrc
index 9241b47..4e72d65 100644
--- a/.kwm/kwmrc
+++ b/.kwm/kwmrc
@@ -124,6 +124,13 @@ blacklists an application from Kwms tiling
     kwmc rule owner="Photoshop" properties={float="true"}
 */
 kwmc rule owner="Lightroom" properties={float="true"}
+kwmc rule owner="Stickies" properties={float="true"}
+kwmc rule owner="Steam" properties={float="true"}
+kwmc rule owner="App Store" properties={float="true"}
+kwmc rule owner="Finder" properties={role="AXDialog"}
+kwmc rule owner="Finder" role="AXDialog" properties={float="true"}
+kwmc rule owner="System Preferences" properties={float="true"}
+kwmc rule owner="Hyper" properties={role="AXDialog"}
 
 /*
 The following command creates a rule that
diff --git a/.zshrc b/.zshrc
index 5964711..bf2111d 100644
--- a/.zshrc
+++ b/.zshrc
@@ -52,7 +52,7 @@ paths=(/usr/texbin /cat/bin /cat/games/bin /opt/csw/sbin /opt/csw/bin
 /opt/local/bin /usr/local/share/bin /usr/openwin/bin /usr/bin/X11
 ~/Library/Haskell/bin /usr/local/bin/X11 /usr/openwin/bin/xview /opt/java/bin
 /opt/java5/bin /opt/java/jre/bin /opt/openoffice/program)
-prepaths=(/usr/local/bin /usr/local/sbin ~/.rbenv/bin ~/.cabal/bin
+prepaths=(/usr/local/bin /usr/local/sbin ~/coreos-osx/bin ~/.rbenv/bin ~/.cabal/bin
 ~/Library/Haskell/bin ~/local/bin ~/local/sbin ~/local/share/bin)
 for dir in $paths ; do
     if [ -d $dir ] ; then
@@ -111,6 +111,7 @@ export OVFTOOL='/Applications/VMware OVF Tool/ovftool'
 if whence rg > /dev/null ; then
   export FZF_DEFAULT_COMMAND='rg --files --no-ignore --hidden --glob "!.git/*"'
 fi
+eval "$(hub alias -s)"
 
 # Prompt
 #prompt_precmd() {