merge master

.gitignore

@@ -37,3 +37,9 @@ autoload/
 npm-debug.log
 
 dotfiles/config/configstore/update-notifier-nodemon.json
+
+dotfiles/config/yarn
+
+dotfiles/emacs.d/network-security.data
+
+dotfiles/emacs.d/recentf

dotfiles/Xmodmap

@@ -1,3 +1,9 @@
-clear Lock 
+!
-keycode 66 = Hyper_L
+! Swap Caps_Lock and Control_R
-add mod4 = Hyper_L
+!
+remove Lock = Caps_Lock
+remove Control = Control_R
+keysym Control_R = Caps_Lock
+keysym Caps_Lock = Control_R
+add Lock = Caps_Lock
+add Control = Control_R

dotfiles/emacs.d/init.el

@@ -99,7 +99,7 @@ setq org-log-done t)
                                     (filename . "emacs.d")))
          ("Org" (or (mode . org-mode)
                     (filename . "OrgMode")))
-         ("Magit" (name . "\*magit"))
+         ("Magit" (name . "\*magit\*"))
          ("Help" (or (name . "\*Help\*")
                      (name . "\*Apropos\*")
                      (name . "\*info\*")))

dotfiles/emacs.d/package.el

@@ -2,6 +2,7 @@
 
 (defvar my-packages '(ag auto-complete
                          cc-mode
+                         markdown-mode
                          counsel
                          expand-region
                          flycheck

dotfiles/zshrc

@@ -29,7 +29,7 @@ export GOPATH=$HOME/go/
 export PATH=$PATH:"$GOPATH/bin"
 
 alias emacs='emacs -nw'
-alias vim='nvim'
+alias vim='emacs'         # LOL
 alias irssi='TERM=screen-256color irssi'
 alias scheme='rlwrap mit-scheme'
 alias startpg='pg_ctl -D /usr/local/var/postgres -l /usr/local/var/postgres/server.log start'