Yet another massive update

init.el

@@ -5,15 +5,8 @@
 ;;
 ;;; Description:
 ;;
-;; My emacs.d, which sets out to rustle emacs users' jimmies by making
-;; emacs as vim-like as possible.
-;;
-;; Naming conventions:
-;;    * my--<defun-name>  ; interal defuns, meant for use via elisp
-;;    * my-<defun-name>   ; interactive command, can be used via M-x
-;;    * my.<defun-name>   ; commands with buffer side-effects (for keybinds)
-;;    * my:<defun-name>   ; defuns meant to be used from Ex mode
-;;    * *<defun/var-name> ; for altering the visual state
+;; My emacs.d sets out to rustle emacs users' jimmies by making emacs as
+;; vim-like as possible.
 ;;
 ;;; Code:
 (defconst DEBUG-MODE nil)
@@ -23,17 +16,13 @@
 (defconst my-contrib-dir   (concat my-dir "contrib/"))
 (defconst my-themes-dir    (concat my-dir "themes/"))
 (defconst my-snippets-dir  (concat my-dir "snippets/"))
-(defconst my-tmp-dir       (concat my-dir ".cache/"))
+(defconst my-tmp-dir       (concat my-dir ".cache-" (system-name) "/"))
 
-(defconst *dark-theme  'v0)
-(defconst *light-theme 'github) ; wtb better light theme...
-(defconst *fonts `(,(font-spec :family "Terminus (TTF)" :size 12 :antialias nil)
-                   ,(font-spec :family "Inconsolata"    :size 14 :antialias t)
-                   ,(font-spec :family "Ubuntu Mono"    :size 20 :antialias t)
-                   ))
+(defconst *default-theme 'v0)
+(defconst *default-font (font-spec :family "Terminus (TTF)" :size 12 :antialias nil))
 
-(push my-modules-dir load-path)
-(push my-contrib-dir load-path)
+(add-to-list 'load-path my-modules-dir)
+(add-to-list 'load-path my-contrib-dir)
 ;; Add cask dirs to load-path
 (let ((default-directory (expand-file-name (concat ".cask/" emacs-version "/elpa/") my-dir)))
   (normal-top-level-add-subdirs-to-load-path))
@@ -47,23 +36,24 @@
         core-evil              ; evil-mode and its plugins
         core-editor            ; completing the editor
 
-        init-auto-insert       ; for the lazy typis
+        init-auto-insert       ; for the lazy typist
         init-company           ; see above
         init-fly               ; fly(check|spell)
-        init-git               ; git-gutter + modes
+        init-vc                ; version control gutter + git modes
         init-ido               ; a search engine for your car keys
         init-helm              ; a search engine for your life
-        init-project           ; project tools: dired, neotree
+        init-project           ; dired, neotree
+        init-present           ; for when I need to show off
 
         init-cc                ; C/C++/Obj-C madness
         ;; init-cscope
         init-csharp
         ;; init-eshell
-        init-go
+        ;; init-go
         init-java              ; the poster child for carpal tunnel syndome
         init-js                ; alert("not java, javascript!")
         init-lua               ; one-based indices? One-based indices.
-        ;; init-org               ; for fearless [organized] leader
+        init-org               ; for fearless [organized] leader
         init-php               ; making php less painful to work with
         init-python            ; beautiful is better than ugly
         init-regex             ; /^[^\s](meaning)[^\n]*/
@@ -75,8 +65,8 @@
         init-tmux
         ;; init-rust
         ;; init-R
-        init-web
-        init-workgroups
+        init-web               ; For the 2.0'er
+        init-workgroups        ; session management I can understand
         init-yasnippet         ; type for me
 
         my-defuns