Merge branch 'master' of github.com:dustinswan/dotfiles

.gitignore

@@ -5,3 +5,4 @@
 # Vim
 vim/.netrwhist
 vim/plugged/*
+node_modules

config.fish

@@ -40,7 +40,7 @@ set -x PATH $HOME/.npm-packages/bin $PATH
 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"
-    eval (keychain --eval --inherit any --agents gpg,ssh --quiet id_rsa 2B3A6377)
+    keychain --eval --inherit any --agents gpg,ssh --quiet id_rsa 2B3A6377 | source
 end
 
 # iTerm2

karabiner.json

@@ -6,28 +6,7 @@
     },
     "profiles": [
         {
-            "devices": [
-                {
-                    "disable_built_in_keyboard_if_exists": false,
-                    "identifiers": {
-                        "is_keyboard": true,
-                        "is_pointing_device": false,
-                        "product_id": 1553,
-                        "vendor_id": 3897
-                    },
-                    "ignore": true
-                },
-                {
-                    "disable_built_in_keyboard_if_exists": false,
-                    "identifiers": {
-                        "is_keyboard": true,
-                        "is_pointing_device": false,
-                        "product_id": 601,
-                        "vendor_id": 1452
-                    },
-                    "ignore": true
-                }
-            ],
+            "devices": [],
             "fn_function_keys": {
                 "f1": "vk_consumer_brightness_down",
                 "f10": "mute",
@@ -42,14 +21,19 @@
                 "f8": "vk_consumer_play",
                 "f9": "vk_consumer_next"
             },
-            "name": "Default profile",
+            "name": "Default Profile",
+            "one_to_many_mappings": {},
             "selected": true,
             "simple_modifications": {
                 "caps_lock": "left_control"
             },
+            "standalone_keys": {
+                "caps_lock": "escape"
+            },
             "virtual_hid_keyboard": {
                 "caps_lock_delay_milliseconds": 0,
-                "keyboard_type": "ansi"
+                "keyboard_type": "ansi",
+                "standalone_keys_delay_milliseconds": 200
             }
         }
     ]

spacemacs

@@ -64,7 +64,7 @@ values."
      (org :variables org-enable-github-support t)
      deft
      ;; (shell :variables shell-default-term-shell "/Users/dustinswan/.nix-profile/bin/zsh")
-     (shell :variables shell-default-term-shell "/usr/local/bin/zsh" shell-default-shell 'multi-term)
+     (shell :variables shell-default-term-shell "/usr/local/bin/fish" shell-default-shell 'multi-term)
      xkcd
      spotify
      finance

symlinks.sh

@@ -42,5 +42,3 @@ curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs https://raw.g
 mv ~/.emacs.d ~/.emacs.bak
 git clone --recursive http://github.com/syl20bnr/spacemacs ~/.emacs.d
 rm ~/.spacemacs; ln -s ~/dotfiles/spacemacs ~/.spacemacs
-ln -s ~/dotfiles/spacemacs_private/twittering-mode ~/.emacs.d/private/twittering-mode
-ln -s ~/dotfiles/spacemacs_private/mu4e ~/.emacs.d/private/mu4e

zshrc

@@ -57,10 +57,6 @@ if [ -x "$(command -v keychain)" ]; then
     eval `keychain --eval --inherit any --agents gpg,ssh --quiet id_rsa 2B3A6377`
 fi
 
-# Homebrew Github Token
-[ -x "$(command -v brew)" ] && alias brew='[[ $HOMEBREW_GITHUB_API_TOKEN ]] || export HOMEBREW_GITHUB_API_TOKEN=`gpg -d ~/.homebrew@github-password.gpg`; brew'
-[ -x "$(command -v carthage)" ] && alias carthage='[[ $HOMEBREW_GITHUB_API_TOKEN ]] || export HOMEBREW_GITHUB_API_TOKEN=`gpg -d ~/.homebrew@github-password.gpg`; carthage'
-
 # FZF
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh