From 2e0e93e6b53b0faa61e0e040d734e44a8e0dc152 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Thu, 20 Nov 2014 18:41:37 -0800
Subject: [PATCH] install gpg.

---
 dotfiles/cider/bootstrap.json | 253 +++++++++++++++++-----------------
 dotfiles/emacs.d              |   2 +-
 2 files changed, 128 insertions(+), 127 deletions(-)

diff --git a/dotfiles/cider/bootstrap.json b/dotfiles/cider/bootstrap.json
index c93bc01f..8ede011c 100644
--- a/dotfiles/cider/bootstrap.json
+++ b/dotfiles/cider/bootstrap.json
@@ -1,128 +1,129 @@
 {
-    "after-scripts": ["brew linkapps"],
-    "casks": [
-	"alfred",
-	"atom",
-	"caffeine",
-	"dropbox",
-	"firefox",
-	"flash",
-	"flux",
-	"google-chrome",
-	"google-hangouts",
-	"heroku-toolbelt",
-	"iterm2",
-	"java",
-	"karabiner",
-	"macpass",
-	"osxfuse",
-	"seil",
-	"slate",
-	"spotify",
-	"sublime-text",
-	"synergy",
-	"transmission",
-	"virtualbox",
-	"vlc",
-	"xquartz"
-    ],
-    "formulas": [
-	"ack",
-	"ag",
-	"ant",
-	"autoconf",
-	"automake",
-	"bash",
-	"binutils",
-	"brew-cask",
-	"cabal-install",
-	"cmake",
-	"coreutils",
-	"ctags",
-	"daemonize",
-	"diffutils",
-	"docker",
-	"ed",
-	"emacs --cocoa --srgb",
-	"file-formula",
-	"findutils",
-	"fontconfig",
-	"fontforge",
-	"freetype",
-	"gawk",
-	"gdbm",
-	"gettext",
-	"ghc",
-	"gist",
-	"git",
-	"giter8",
-	"glib",
-	"globals",
-	"gnutls",
-	"go",
-	"gobject-introspection",
-	"grep",
-	"gtk+3",
-	"gupnp",
-	"gzip",
-	"heroku-toolbelt",
-	"htop-osx",
-	"hub",
-	"icu4c",
-	"intltool",
-	"jpeg",
-	"less",
-	"libevent",
-	"libffi",
-	"libidn",
-	"libpng",
-	"libsoup",
-	"libtasn1",
-	"libtiff",
-	"libtool",
-	"lzip",
-	"make",
-	"mercurial",
-	"netcat",
-	"nettle",
-	"ngrep",
-	"nmap",
-	"node",
-	"openssl",
-	"ossp-uuid",
-	"pandoc",
-	"pango",
-	"pcre",
-	"pixman",
-	"pkg-config",
-	"pstree",
-	"pv",
-	"pypy",
-	"python",
-	"python3",
-	"rbenv",
-	"readline",
-	"reattach-to-user-namespace",
-	"rsync",
-	"sbt",
-	"scala",
-	"sdl",
-	"sdl_image",
-	"sdl_mixer",
-	"sdl_ttf",
-	"sleuthkit",
-	"sqlite",
-	"subversion",
-	"tig",
-	"tmux",
-	"unzip",
-	"vim",
-	"watch",
-	"wdiff",
-	"webp",
-	"weechat",
-	"wget",
-	"xz",
-	"zsh"
-    ]
+  "after-scripts": ["brew linkapps"],
+  "casks": [
+    "alfred",
+    "atom",
+    "caffeine",
+    "dropbox",
+    "firefox",
+    "flash",
+    "flux",
+    "google-chrome",
+    "google-hangouts",
+    "heroku-toolbelt",
+    "iterm2",
+    "java",
+    "karabiner",
+    "macpass",
+    "osxfuse",
+    "seil",
+    "slate",
+    "spotify",
+    "sublime-text",
+    "synergy",
+    "transmission",
+    "virtualbox",
+    "vlc",
+    "xquartz"
+  ],
+  "formulas": [
+    "ack",
+    "ag",
+    "ant",
+    "autoconf",
+    "automake",
+    "bash",
+    "binutils",
+    "brew-cask",
+    "cabal-install",
+    "cmake",
+    "coreutils",
+    "ctags",
+    "daemonize",
+    "diffutils",
+    "docker",
+    "ed",
+    "emacs --cocoa --srgb",
+    "file-formula",
+    "findutils",
+    "fontconfig",
+    "fontforge",
+    "freetype",
+    "gawk",
+    "gdbm",
+    "gettext",
+    "ghc",
+    "gist",
+    "git",
+    "giter8",
+    "glib",
+    "globals",
+    "gnutls",
+    "go",
+    "gobject-introspection",
+    "gpg",
+    "grep",
+    "gtk+3",
+    "gupnp",
+    "gzip",
+    "heroku-toolbelt",
+    "htop-osx",
+    "hub",
+    "icu4c",
+    "intltool",
+    "jpeg",
+    "less",
+    "libevent",
+    "libffi",
+    "libidn",
+    "libpng",
+    "libsoup",
+    "libtasn1",
+    "libtiff",
+    "libtool",
+    "lzip",
+    "make",
+    "mercurial",
+    "netcat",
+    "nettle",
+    "ngrep",
+    "nmap",
+    "node",
+    "openssl",
+    "ossp-uuid",
+    "pandoc",
+    "pango",
+    "pcre",
+    "pixman",
+    "pkg-config",
+    "pstree",
+    "pv",
+    "pypy",
+    "python",
+    "python3",
+    "rbenv",
+    "readline",
+    "reattach-to-user-namespace",
+    "rsync",
+    "sbt",
+    "scala",
+    "sdl",
+    "sdl_image",
+    "sdl_mixer",
+    "sdl_ttf",
+    "sleuthkit",
+    "sqlite",
+    "subversion",
+    "tig",
+    "tmux",
+    "unzip",
+    "vim",
+    "watch",
+    "wdiff",
+    "webp",
+    "weechat",
+    "wget",
+    "xz",
+    "zsh"
+  ]
 }
diff --git a/dotfiles/emacs.d b/dotfiles/emacs.d
index e513b14b..9b6da988 160000
--- a/dotfiles/emacs.d
+++ b/dotfiles/emacs.d
@@ -1 +1 @@
-Subproject commit e513b14bc7244825078845f03d5e517ec9475862
+Subproject commit 9b6da988ae9ca68d5fd2345445346d978dac1b92