From 316fea3dae537e969504ebc77f5abc544b15f2a6 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Wed, 23 Dec 2015 03:51:15 -0500
Subject: [PATCH] General cleanup + updated init.el

---
 core/core-os-osx.el |  2 --
 core/core-ui.el     |  3 +--
 init.el             | 22 +++++++++++++---------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/core/core-os-osx.el b/core/core-os-osx.el
index 4d9bfe042..013c9a8b9 100644
--- a/core/core-os-osx.el
+++ b/core/core-os-osx.el
@@ -1,7 +1,5 @@
 ;;; core-os-osx.el --- Mac-specific settings
 
-(eval-when-compile (require 'core))
-
 ;; Use a shared clipboard
 (setq x-select-enable-clipboard t
       select-enable-clipboard t
diff --git a/core/core-ui.el b/core/core-ui.el
index 9de2374c3..942f4e265 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -21,8 +21,6 @@
  fringes-outside-margins        t
  hl-line-sticky-flag            nil  ; only highlight in one window
 
- jit-lock-defer-time            nil
- jit-lock-stealth-time          0.5
  idle-update-delay              1
 
  split-width-threshold          nil  ; favor horizontal splits
@@ -152,6 +150,7 @@
       (hl-line-mode (if rainbow-mode -1 1)))))
 
 (use-package volatile-highlights
+  :when (not EMACS-WRITE)
   :config
   (vhl/define-extension 'my-undo-tree-highlights
     'undo-tree-undo 'undo-tree-redo)
diff --git a/init.el b/init.el
index 48bd05dfd..66afb77f1 100644
--- a/init.el
+++ b/init.el
@@ -40,6 +40,8 @@
 ;;
 ;;; License: GPLv3
 
+(defconst EMACS-WRITE nil)
+
 (defconst narf-theme        'narf-dark)
 (defconst narf-default-font (font-spec :family "Terminus (TTF)" :size 12 :antialias nil))
 (defconst narf-writing-font (font-spec :family "Hack" :size 14))
@@ -56,9 +58,6 @@
 
   (mapc 'require
         `(core ; core/core.el
-          ,(cond (IS-MAC      'core-os-osx)
-                 (IS-LINUX    'core-os-linux)
-                 (IS-WINDOWS  'core-os-win32))
 
           ;;; The heart of NARF
           core-popup           ; taming stray windows
@@ -72,16 +71,15 @@
           core-project         ; whose project am I in?
           core-vcs             ; version control is a programmer's best friend
           core-helm            ; a search engine for life and love
-          core-quickrun        ; run code, run.
+          core-eval            ; run code, run.
           core-workgroups      ; cure Emacs alzheimers
 
-          ;;; Extras
+          ;;; Environments
           module-cc            ; c/c++/obj-c madness
           module-csharp        ; unity, .NET, and mono shenanigans
-          module-collab        ; wonewy, I'm so wonewy~
           module-data          ; dbs 'n data formats
           module-lisp          ; drowning in parentheses
-          module-go            ; a hipster dialect
+          module-go            ; the hipster dialect
           module-java          ; the poster child for carpal tunnel syndome
           module-js            ; all(hope(abandon(ye(who(enter(here))))))
           module-lb6           ; LaunchBar 6 development
@@ -99,12 +97,18 @@
           module-swift         ; yay, emoji variables!
           module-vim           ; my mistress
           module-web           ; for the 2.0'er
-          module-writing       ; yes, I write papers and fiction in emacs
-
           ;;; Experimental
           ;; module-crystal    ; ruby at the speed of c
           ;; module-eshell     ; for inferior OSes *cough*windows
 
+          ;;; Specific custom functionality
+          lib-tmux             ; closing the rift between GUI & terminal
+          ;; lib-demo          ; let me demonstrate...
+          ;; lib-writing       ; yes, I write papers and fiction in emacs
+          ;; lib-crm           ; emacs and or-mode based CRM
+          ;; lib-sonicpi       ; for my inner dj
+
+          ;;; Key bindings & ex commands
           my-bindings
           my-commands
           ))