From d3af5296037c25ff0de2612a024c327f41bd2924 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 9 Nov 2015 20:49:33 -0500
Subject: [PATCH] I'm an Emacs addict

---
 core/core-editor.el | 25 ++++++++++++-------------
 core/core-evil.el   | 10 ++--------
 core/core-ui.el     | 10 ++++++++++
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/core/core-editor.el b/core/core-editor.el
index 2385221d7..d37d3096c 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -71,10 +71,13 @@ enable multiple minor modes for the same regexp.")
 (add-hook! prog-mode      'narf|enable-comment-hard-wrap)
 (add-hook! auto-fill-mode (diminish 'auto-fill-function))
 
-(defadvice delete-trailing-whitespace (around delete-trailing-whitespace-ignore-line activate)
+(defadvice delete-trailing-whitespace
+    (around delete-trailing-whitespace-ignore-line activate)
   "Don't delete trailing whitespace on current line, if in insert mode."
   (let ((spaces (1- (current-column)))
-        (linestr (buffer-substring-no-properties (line-beginning-position) (line-end-position))))
+        (linestr (buffer-substring-no-properties
+                  (line-beginning-position)
+                  (line-end-position))))
     ad-do-it
     (when (string-match-p "^[\s\t]*$" linestr)
       (insert linestr))))
@@ -90,9 +93,9 @@ enable multiple minor modes for the same regexp.")
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;; (global-whitespace-mode 1)  ; Show whitespace
-(global-font-lock-mode t)      ; Enable syntax highlighting for older emacs
 ;; (global-auto-revert-mode -1); revert buffers for changed files
-(electric-indent-mode -1)
+(global-font-lock-mode t)      ; Enable syntax highlighting for older emacs
+(electric-indent-mode -1)      ; on by default
 
 ;; window config undo/redo
 (setq winner-dont-bind-my-keys t)
@@ -109,9 +112,11 @@ enable multiple minor modes for the same regexp.")
   (defalias 'redo #'undo-tree-redo)
   (defalias 'undo #'undo-tree-undo)
   ;; Shut up undo-tree's constant complaining: http://youtu.be/Z6woIRLnbmE
-  (defadvice undo-tree-load-history-hook (around undo-tree-load-history-shut-up activate)
+  (defadvice undo-tree-load-history-hook
+      (around undo-tree-load-history-shut-up activate)
     (shut-up! ad-do-it))
-  (defadvice undo-tree-save-history-hook (around undo-tree-save-history-shut-up activate)
+  (defadvice undo-tree-save-history-hook
+      (around undo-tree-save-history-shut-up activate)
     (shut-up! ad-do-it)))
 
 (use-package avy
@@ -138,7 +143,7 @@ enable multiple minor modes for the same regexp.")
 (use-package goto-last-change
   :commands goto-last-change)
 
-(use-package rotate-text   :commands (rotate-word-at-point rotate-region))
+(use-package rotate-text :commands (rotate-word-at-point rotate-region))
 
 (use-package smart-forward :commands (smart-up smart-down smart-left smart-right))
 
@@ -204,12 +209,6 @@ enable multiple minor modes for the same regexp.")
   :commands (describe-buffer describe-command describe-file
              describe-keymap describe-option describe-option-of-type))
 
-(use-package writeroom-mode
-  :defer t
-  :config
-  (setq writeroom-restore-window-config t
-        writeroom-width 120))
-
 (use-package saveplace
   :defer t
   :config (setq save-place-file (concat narf-temp-dir "saveplace"))
diff --git a/core/core-evil.el b/core/core-evil.el
index 266697f33..21c625210 100644
--- a/core/core-evil.el
+++ b/core/core-evil.el
@@ -59,12 +59,6 @@
         ;; Exit minibuffer if alive
         (if (minibuffer-window-active-p (minibuffer-window))
             (narf/minibuffer-quit))))
-    ;; Jump to new splits
-    (defadvice evil-window-split (after evil-window-split-jump activate)
-      (evil-window-down 1))
-    (defadvice evil-window-vsplit (after evil-window-vsplit-jump activate)
-      (evil-window-right 1))
-
     ;; Fix disruptive errors w/ hidden buffers caused by popwin
     (defadvice evil-ex-hl-do-update-highlight (around evil-ex-hidden-buffer-ignore-errors activate)
       (ignore-errors ad-do-it))
@@ -211,8 +205,8 @@
 (use-package evil-textobj-anyblock
   :commands (evil-textobj-anyblock-inner-block evil-textobj-anyblock-a-block)
   :init
-  (define-key evil-inner-text-objects-map "b" 'evil-textobj-anyblock-inner-block)
-  (define-key evil-outer-text-objects-map "b" 'evil-textobj-anyblock-a-block))
+  (define-key evil-inner-text-objects-map "B" 'evil-textobj-anyblock-inner-block)
+  (define-key evil-outer-text-objects-map "B" 'evil-textobj-anyblock-a-block))
 
 (use-package evil-search-highlight-persist
   :config
diff --git a/core/core-ui.el b/core/core-ui.el
index b1d15e5ab..e85b66d5a 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -6,6 +6,8 @@
       (fringe-mode '(3 . 6))
       (setq frame-title-format '(buffer-file-name "%f" ("%b")))
       (setq initial-frame-alist '((width . 120) (height . 80)))
+
+      (set-frame-font narf-default-font)
       (set-face-attribute 'default t :font narf-default-font)
 
       (setq-default indicate-empty-lines t)
@@ -63,6 +65,14 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(use-package writeroom-mode
+  :defer t
+  :config
+  (setq-default
+   writeroom-restore-window-config t
+   writeroom-fullscreen-effect nil
+   writeroom-width 110))
+
 (use-package hideshow
   :commands (hs-minor-mode hs-toggle-hiding hs-already-hidden-p)
   :diminish hs-minor-mode