From 85bde34f845e8f1312d49eba5c65660d106a30e8 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Thu, 4 May 2017 10:42:30 +0200
Subject: [PATCH] General cleanup & refactor

---
 modules/app/email/config.el           | 6 +++---
 modules/lang/org/config.el            | 9 +++++----
 modules/lang/org/packages.el          | 2 --
 modules/private/hlissner/+bindings.el | 5 ++---
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/modules/app/email/config.el b/modules/app/email/config.el
index 776d576ab..57d2877d1 100644
--- a/modules/app/email/config.el
+++ b/modules/app/email/config.el
@@ -9,7 +9,7 @@
 
 
 ;;
-;;
+;; Config
 ;;
 
 (defvar +email--accounts nil)
@@ -264,8 +264,8 @@
   (setq org-mu4e-link-query-in-headers-mode nil
         org-mu4e-convert-to-html t)
 
-  ;; Only render to html once. Without this, it would continue to do so, if the
-  ;; first send failed for whatever reason.
+  ;; Only render to html once. If the first send fails for whatever reason,
+  ;; org-mu4e would do so each time you try again.
   (add-hook! 'message-send-hook
     (setq-local org-mu4e-convert-to-html nil)))
 
diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index 78659cb89..55f5d81d4 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -99,9 +99,11 @@
 
   (setq-default
    org-export-coding-system 'utf-8
-   org-todo-keywords '((sequence "[ ](t)" "[-](p)" "[?](m)" "|" "[X](d)")
-                       (sequence "TODO(T)" "|" "DONE(D)")
-                       (sequence "IDEA(i)" "NEXT(n)" "ACTIVE(a)" "WAITING(w)" "LATER(l)" "|" "CANCELLED(c)"))
+   org-todo-keywords
+   '((sequence "[ ](t)" "[-](p)" "[?](m)" "|" "[X](d)")
+     (sequence "TODO(T)" "|" "DONE(D)")
+     (sequence "IDEA(i)" "NEXT(n)" "ACTIVE(a)" "WAITING(w)" "LATER(l)"
+               "|" "CANCELLED(c)"))
 
    ;; Appearance
    outline-blank-line t
@@ -109,7 +111,6 @@
    org-adapt-indentation nil
    org-cycle-separator-lines 1
    org-cycle-include-plain-lists t
-   ;; org-ellipsis " ... "
    org-ellipsis "  "
    org-entities-user '(("flat"  "\\flat" nil "" "" "266D" "♭")
                        ("sharp" "\\sharp" nil "" "" "266F" "♯"))
diff --git a/modules/lang/org/packages.el b/modules/lang/org/packages.el
index 937074619..0eee7ec25 100644
--- a/modules/lang/org/packages.el
+++ b/modules/lang/org/packages.el
@@ -11,5 +11,3 @@
 (package! ob-sql-mode)
 (package! ob-translate)
 ;; (package! ox-pandox)
-;; (package! org-bullets)
-
diff --git a/modules/private/hlissner/+bindings.el b/modules/private/hlissner/+bindings.el
index 487973de6..d9e1e3676 100644
--- a/modules/private/hlissner/+bindings.el
+++ b/modules/private/hlissner/+bindings.el
@@ -9,9 +9,8 @@
   `(lambda () (interactive)
      (let ((default-directory ,path))
        (call-interactively
-        ',(if project-p
-              (command-remapping 'projectile-find-file)
-            (command-remapping 'find-file))))))
+        ',(command-remapping
+           (if project-p 'projectile-find-file) 'find-file)))))
 
 (map!
  [remap evil-jump-to-tag] 'projectile-find-tag