From ccf3304f8010e23f4fe844cafcc040ff877dcf41 Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustinswan@gmail.com>
Date: Fri, 4 Sep 2015 09:26:37 -0600
Subject: [PATCH] Getting vdirsyncer & khal working, updating offlineimap to
 work with fastmail, misc spacemacs config updates

---
 bin/decrypt_password.sh |  2 ++
 khal.conf               | 11 ++++++++---
 offlineimaprc           | 21 +++++++++++----------
 spacemacs               | 16 ++++++++++------
 vdirsyncer/config       | 17 +++++++++--------
 5 files changed, 40 insertions(+), 27 deletions(-)
 create mode 100755 bin/decrypt_password.sh

diff --git a/bin/decrypt_password.sh b/bin/decrypt_password.sh
new file mode 100755
index 0000000..68a8861
--- /dev/null
+++ b/bin/decrypt_password.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+gpg --batch --no-tty -d ~/.$1-password.gpg
diff --git a/khal.conf b/khal.conf
index a3605bf..a7626be 100644
--- a/khal.conf
+++ b/khal.conf
@@ -161,6 +161,11 @@
 
 
 [calendars]
-    [[Google]]
-    path = ~/calendars/google
-    color = blue
+    [[Dustin Swan]]
+    path = ~/Calendars/0f50fcf2-2ca8-4ce7-9be4-8ec0b3f21626
+
+    [[IOCOM]]
+    path = ~/Calendars/fcd1ea6e-b8a1-4bec-a2ab-e0ffa2bdeae6
+
+    [[Our Stuff]]
+    path = ~/Calendars/395d2785-f8ff-4d5d-94c5-d65536ce150b
diff --git a/offlineimaprc b/offlineimaprc
index 579bd59..3df3d88 100644
--- a/offlineimaprc
+++ b/offlineimaprc
@@ -1,5 +1,5 @@
 [general]
-accounts = IOCOM, Gmail
+accounts = IOCOM, FastMail
 pythonfile = ~/dotfiles/offlineimap.py
 
 
@@ -19,18 +19,19 @@ remotepasseval = decrypt_password(".iocom-password.gpg")
 realdelete = no
 
 
-[Account Gmail]
-localrepository = GmailLocal
-remoterepository = GmailRemote
+[Account FastMail]
+localrepository = FastMailLocal
+remoterepository = FastMailRemote
 
-[Repository GmailLocal]
+[Repository FastMailLocal]
 type = Maildir
-localfolders = ~/Mail/Gmail
+localfolders = ~/Mail/FastMail
 
-[Repository GmailRemote]
-type = Gmail
-remoteuser = dustinswan@gmail.com
-remotepasseval = decrypt_password(".gmail-password.gpg")
+[Repository FastMailRemote]
+type = IMAP
+remotehost = mail.messagingengine.com
+remoteuser = dustinswan@fastmail.com
+remotepasseval = decrypt_password(".dustinswan@fastmail.com-password.gpg")
 realdelete = no
 sslcacertfile=/usr/local/etc/openssl/osx_cert.pem
 ssl = yes
diff --git a/spacemacs b/spacemacs
index b51bd0c..70a319d 100644
--- a/spacemacs
+++ b/spacemacs
@@ -15,7 +15,6 @@
  dotspacemacs-configuration-layers '(version-control
                                      git
                                      github
-                                     perforce
                                      c-c++
                                      haskell
                                      html
@@ -43,7 +42,7 @@
                                      syntax-checking)
 
  ;; A list of packages and/or extensions that will not be install and loaded.
- dotspacemacs-excluded-packages '()
+ dotspacemacs-excluded-packages '(org-bullets)
  ;; If non-nil spacemacs will delete any orphan packages, i.e. packages that
  ;; are declared in a layer which is not a member of
  ;; the list `dotspacemacs-configuration-layers'
@@ -74,10 +73,10 @@
  ;; Default font. `powerline-scale' allows to quickly tweak the mode-line
  ;; size to make separators look not too crappy.
  dotspacemacs-default-font '("Source Code Pro"
-                             :size 11
-                             :weight normal
-                             :width normal
-                             :powerline-scale 1.0)
+                              :size 11
+                              :weight normal
+                              :width normal
+                              :powerline-scale 1.0)
 
  ;; The leader key
  dotspacemacs-leader-key "SPC"
@@ -137,6 +136,10 @@
   "User initialization for Spacemacs. This function is called at the very
  startup."
 
+ (setq package-archives '(("gnu" . "http://elpa.gnu.org/packages/")
+                          ("marmalade" . "https://marmalade-repo.org/packages/")
+                          ("melpa" . "http://melpa.org/packages/")))
+
   (setq-default git-magit-status-fullscreen t)
   (setq-default git-enable-github-support t)
   )
@@ -168,6 +171,7 @@ This function is called at the very end of Spacemacs initialization."
  '(ahs-idle-timer 0 t)
  '(ahs-inhibit-face-list nil)
  '(erc-modules (quote (scrolltobottom)))
+ '(js2-basic-offset 2)
  '(paradox-github-token t)
  '(ring-bell-function (quote ignore) t))
 (custom-set-faces
diff --git a/vdirsyncer/config b/vdirsyncer/config
index e7dd691..ff43d01 100644
--- a/vdirsyncer/config
+++ b/vdirsyncer/config
@@ -4,6 +4,7 @@
 [general]
 # A folder where vdirsyncer can store some metadata about each pair.
 status_path = ~/.vdirsyncer/status/
+password_command = ~/dotfiles/bin/decrypt_password.sh
 
 # CONTACTS
 #[pair google_contacts]
@@ -56,21 +57,21 @@ status_path = ~/.vdirsyncer/status/
 #verify = True
 
 # CALDAV
-[pair google_calendar]
-a = google_calendar_local
-b = google_calendar_remote
-#collections = private,work
+[pair fastmail_calendar]
+a = fastmail_calendar_local
+b = fastmail_calendar_remote
+collections = ["from b"]
 
-[storage google_calendar_local]
+[storage fastmail_calendar_local]
 type = filesystem
 path = ~/Calendars/
 fileext = .ics
 
-[storage google_calendar_remote]
+[storage fastmail_calendar_remote]
 type = caldav
-url = https://www.google.com/calendar/dav/dustinswan@gmail.com/user
+url = https://caldav.messagingengine.com/
 auth = basic
-username = dustinswan
+username = dustinswan@fastmail.com
 #verify = True
 
 # Optional: Specify a time range which should be synchronized. Either both