From 20efdb863fcc1f291f1e1b33c9811b9e1957eda5 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Wed, 18 Nov 2015 15:22:00 -0500
Subject: [PATCH] Clean up

---
 core/core-evil.el         |  5 ++--
 core/core-ui.el           | 22 ++++++++----------
 modules/module-go.el      | 49 ++++++++++++++++++++++-----------------
 modules/module-writing.el |  3 +--
 4 files changed, 42 insertions(+), 37 deletions(-)

diff --git a/core/core-evil.el b/core/core-evil.el
index c69d5d6bb..b36be48f4 100644
--- a/core/core-evil.el
+++ b/core/core-evil.el
@@ -168,8 +168,9 @@
 
 ;; evil plugins
 (use-package evil-anzu
-  :config (setq anzu-cons-mode-line-p nil
-                anzu-minimum-input-length 2))
+  :config
+  (setq anzu-cons-mode-line-p nil
+        anzu-minimum-input-length 2))
 
 (use-package evil-args
   :commands (evil-inner-arg evil-outer-arg evil-forward-arg evil-backward-arg evil-jump-out-args)
diff --git a/core/core-ui.el b/core/core-ui.el
index 6a0b2349f..5288e943f 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -70,9 +70,9 @@
 (defface narf-fixme-face '((t (:inherit font-lock-warning-face))) "Face for FIXMEs")
 (defface narf-note-face  '((t (:inherit font-lock-warning-face))) "Face for NOTEs")
 (add-hook! (prog-mode emacs-lisp-mode)
-  (font-lock-add-keywords nil '(("\\<\\(TODO\\((.+)\\)?:?\\)"  1 'narf-todo-face prepend)))
-  (font-lock-add-keywords nil '(("\\<\\(FIXME\\((.+)\\)?:?\\)" 1 'narf-fixme-face prepend)))
-  (font-lock-add-keywords nil '(("\\<\\(NOTE\\((.+)\\)?:?\\)"  1 'narf-note-face prepend))))
+  (font-lock-add-keywords nil '(("\\<\\(TODO\\((.+)\\)?:?\\)"  1 'narf-todo-face prepend)
+                                ("\\<\\(FIXME\\((.+)\\)?:?\\)" 1 'narf-fixme-face prepend)
+                                ("\\<\\(NOTE\\((.+)\\)?:?\\)"  1 'narf-note-face prepend))))
 
 ;; Prettify code folding in emacs ;;;;;;
 (define-fringe-bitmap 'hs-marker [16 48 112 240 112 48 16] nil nil 'center)
@@ -97,13 +97,8 @@
             (overlay-put ov 'display display-string)))))
 
 ;; Fade out when unfocused ;;;;;;;;;;;;;
-(defun narf|focus-in-alpha ()
-  (set-frame-parameter nil 'alpha 100))
-(defun narf|focus-out-alpha ()
-  (set-frame-parameter nil 'alpha 80))
-
-(add-hook! focus-in  'narf|focus-in-alpha)
-(add-hook! focus-out 'narf|focus-out-alpha)
+(add-hook! focus-in  (set-frame-parameter nil 'alpha 100))
+(add-hook! focus-out (set-frame-parameter nil 'alpha 80))
 
 ;; Plugins ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (use-package hideshow
@@ -123,7 +118,10 @@
   :config (setq rainbow-delimiters-max-face-count 4))
 
 (use-package rainbow-mode :defer t
-  :init (add-hook! rainbow-mode (hl-line-mode (if rainbow-mode -1 1))))
+  :init
+  (add-hook! rainbow-mode
+    (when narf--hl-line-mode
+      (hl-line-mode (if rainbow-mode -1 1)))))
 
 (use-package popwin
   :config
@@ -373,7 +371,7 @@ iedit."
    ;; Right side
    '((selection-info :face highlight-face :skip-alternate t)
      narf-env-version
-     narf-buffer-encoding-
+     narf-buffer-encoding-abbrev
      (narf-major-mode
       (minor-modes :separator " " :tight t)
       process :when active)
diff --git a/modules/module-go.el b/modules/module-go.el
index 950e32da2..e0836d2b4 100644
--- a/modules/module-go.el
+++ b/modules/module-go.el
@@ -7,34 +7,41 @@
   (add-hook! go-mode '(emr-initialize flycheck-mode narf|enable-tabs narf|enable-tab-width-4))
   :config
   (define-builder! go-mode "go build")
-  (bind! :map go-mode-map
-         :n "gd" 'godef-jump
-         :n "gD" 'godef-describe
-         (:prefix ","
-           :n "tr" 'narf:go-test-run-all
-           :n "ta" 'narf:go-test-run-all
-           :n "ts" 'narf:go-test-run-package))
 
-  (mapc (lambda (x)
-          (let ((command-name (car x))
-                (title (cadr x))
-                (region-p (caddr x))
-                predicate)
-            (setq predicate (cond ((eq region-p 'both) nil)
-                                  (t (if region-p
-                                         (lambda () (use-region-p))
-                                       (lambda () (not (use-region-p)))))))
-            (emr-declare-command (intern (symbol-name command-name))
-              :title title :modes 'go-mode :predicate predicate)))
-        '((go-remove-unused-imports "Remove unushed imports" nil)
-          (gofmt                    "Format code" nil)))
+  ;; emr support
+  (after! emr
+    (mapc (lambda (x)
+            (let ((command-name (car x))
+                  (title (cadr x))
+                  (region-p (caddr x))
+                  predicate)
+              (setq predicate (cond ((eq region-p 'both) nil)
+                                    (t (if region-p
+                                           (lambda () (use-region-p))
+                                         (lambda () (not (use-region-p)))))))
+              (emr-declare-command (intern (symbol-name command-name))
+                :title title :modes 'go-mode :predicate predicate)))
+          '((go-remove-unused-imports "Remove unushed imports" nil)
+            (gofmt                    "Format code" nil))))
+
+  (after! helm
+    (use-package helm-go-package :defer t))
 
   (use-package go-eldoc
     :config (add-hook! go-mode 'go-eldoc-setup))
 
   (use-package company-go
     :config
-    (define-company-backend! go-mode (go yasnippet))))
+    (define-company-backend! go-mode (go yasnippet)))
+
+  (bind!
+   (:map go-mode-map
+     :n "gd" 'godef-jump
+     :n "gD" 'godef-describe
+     :n ",i" 'helm-go-package
+     :n ",tr" 'narf:go-test-run-all
+     :n ",ta" 'narf:go-test-run-all
+     :n ",ts" 'narf:go-test-run-package)))
 
 (provide 'module-go)
 ;;; module-go.el ends here
diff --git a/modules/module-writing.el b/modules/module-writing.el
index f6a6b7f9b..9718dc1bb 100644
--- a/modules/module-writing.el
+++ b/modules/module-writing.el
@@ -42,8 +42,7 @@
    writeroom-restore-window-config t
    writeroom-fullscreen-effect nil
    writeroom-extra-line-spacing 10
-   writeroom-width 110))
-
+   writeroom-width 125))
 
 ;;; LaTeX