From 763a6a5f232eef75712f035f4d5d216de3929575 Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustin@dustinswan.com>
Date: Thu, 23 Aug 2018 21:08:39 -0400
Subject: [PATCH] Various dotfile changes

---
 config.fish    | 10 +++++-----
 khal.conf      |  5 +----
 offlineimap.py |  8 +++-----
 spacemacs      |  9 ++++++---
 symlinks.sh    |  2 +-
 tmux.conf      |  5 +++--
 6 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/config.fish b/config.fish
index 6a10c95..2d909e6 100644
--- a/config.fish
+++ b/config.fish
@@ -26,7 +26,7 @@ if command --search p4 >/dev/null
     set -x P4PORT "humu.iocom.com:1666"
     set -x P4CONFIG p4.cfg
     set -x P4EDITOR nvim
-    set -x P4IGNORE .p4ignore
+    set -x P4IGNORE .ignore
 end
 
 # PATH
@@ -38,11 +38,11 @@ test -e /usr/local/opt/python/libexec/bin ; and set -x PATH /usr/local/opt/pytho
 test -e $HOME/.cargo/bin ; and set -x PATH $HOME/.cargo/bin $PATH
 
 # Keychain
-# if status --is-interactive
+if status --is-interactive
     # TODO Take this out when keychain fixes this bug
-    # set -x GPG_AGENT_INFO "~/.gnupg/S.gpg-agent:"(pgrep gpg-agent)":1"
-    # keychain --eval --inherit any --agents gpg,ssh --quiet id_rsa 2B3A6377 | source
-    # end
+    set -x GPG_AGENT_INFO "~/.gnupg/S.gpg-agent:"(pgrep gpg-agent)":1"
+    keychain --eval --inherit any --agents gpg,ssh --quiet id_rsa 2B3A6377 | source
+end
 
 # iTerm2
 test -e {$HOME}/.iterm2_shell_integration.fish ; and source {$HOME}/.iterm2_shell_integration.fish
diff --git a/khal.conf b/khal.conf
index bd7c497..46dd8ce 100644
--- a/khal.conf
+++ b/khal.conf
@@ -1,8 +1,5 @@
 [calendars]
-[[fastmail_contacts_local]]
-path = ~/Contacts/
-type = discover
-[[fastmail_calendar_local]]
+[[Fastmail]]
 path = ~/Calendars/
 type = discover
 
diff --git a/offlineimap.py b/offlineimap.py
index dc0cbf3..0e7c6ae 100644
--- a/offlineimap.py
+++ b/offlineimap.py
@@ -1,11 +1,9 @@
 import os
-import gnupg
+from subprocess import check_output
 
 home = os.environ['HOME']
-gpg = gnupg.GPG(gnupghome=home+"/.gnupg", use_agent=True)
 
 def decrypt_password(file):
     path = home + "/" + file
-    f = open(path, 'rb')
-    decrypted = gpg.decrypt_file(f)
-    return decrypted.data.strip()
+    res = check_output(["gpg", "-dq", path])
+    return res.strip()
diff --git a/spacemacs b/spacemacs
index 196810f..622e93d 100644
--- a/spacemacs
+++ b/spacemacs
@@ -108,7 +108,6 @@ values."
    ;; configuration in `dotspacemacs/user-config'.
    dotspacemacs-additional-packages
    '(
-     weechat
      all-the-icons
      spaceline-all-the-icons
      hackernews
@@ -383,7 +382,10 @@ This is the place where most of your configurations should be done. Unless it is
 explicitly specified that a variable should be set before a package is loaded,
 you should place your code here."
 
-  (require 'weechat)
+  (define-key evil-normal-state-map (kbd "C-h") 'evil-window-left)
+  (define-key evil-normal-state-map (kbd "C-l") 'evil-window-right)
+  (define-key evil-normal-state-map (kbd "C-j") 'evil-window-down)
+  (define-key evil-normal-state-map (kbd "C-k") 'evil-window-up)
 
   (use-package spaceline-all-the-icons
       :after spaceline
@@ -651,7 +653,8 @@ you should place your code here."
     (require 'org-crypt)
     (org-crypt-use-before-save-magic)
     (setq org-tags-exclude-from-inheritance (quote ("crypt")))
-    ;; (setq org-crypt-key nil) ;; symmetric encryption
+    (setq org-crypt-key nil) ;; symmetric encryption
+    (setq epg-gpg-program "/usr/local/bin/gpg")
 
     ;; Deft
     (setq deft-directory "~/Sync/Notes")
diff --git a/symlinks.sh b/symlinks.sh
index fb2abf5..8a00dbf 100644
--- a/symlinks.sh
+++ b/symlinks.sh
@@ -8,7 +8,7 @@ mkdir ~/.ghc; ln -sf ~/dotfiles/ghci.conf ~/.ghc/ghci.conf
 ln -sf ~/dotfiles/gitconfig ~/.gitconfig
 ln -sf ~/dotfiles/tmux.conf ~/.tmux.conf
 mkdir -p ~/.config/khal; ln -sf ~/dotfiles/khal.conf ~/.config/khal/config
-mkdir ~/.vdirsyncer; ln -sf ~/dotfiles/vdirsyncer/config ~/.vdirsyncer/config
+mkdir ~/.config/vdirsyncer; ln -sf ~/dotfiles/vdirsyncer/config ~/.config/vdirsyncer/config
 mkdir ~/.gnupg; ln -sf ~/dotfiles/gpg-agent.conf ~/.gnupg/gpg-agent.conf
 mkdir ~/.ssh; ln -sf ~/dotfiles/ssh/config ~/.ssh/config
 mkdir -p ~/.config/khard; ln -sf ~/dotfiles/khard.conf ~/.config/khard/khard.conf
diff --git a/tmux.conf b/tmux.conf
index 009fee1..90044c9 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -80,8 +80,9 @@ set-option -g display-panes-colour white
 # clock
 set-window-option -g clock-mode-colour white
 
+# mouse
+set-option -g mouse on
+
 # Initialize TMUX plugin manager
 run '~/.tmux/plugins/tpm/tpm'
 
-# mouse
-set-option -g mouse on