From d28c64b4faa25a8e4ed8dc463ca40160e25469f7 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sat, 2 Sep 2017 16:39:51 +0200
Subject: [PATCH] General refactor & cleanup

---
 modules/completion/ivy/config.el     | 5 ++---
 modules/feature/workspaces/config.el | 2 +-
 modules/lang/cc/config.el            | 2 +-
 modules/lang/javascript/config.el    | 5 +++--
 modules/lang/markdown/config.el      | 4 ++--
 modules/private/hlissner/config.el   | 7 ++-----
 6 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el
index f9bcda203..ed08c5e84 100644
--- a/modules/completion/ivy/config.el
+++ b/modules/completion/ivy/config.el
@@ -25,7 +25,8 @@ session)."
 ;;
 
 (def-package! ivy
-  :demand t
+  :commands ivy-mode
+  :init (add-hook 'doom-init-hook #'ivy-mode)
   :config
   (setq ivy-height 12
         ivy-do-completion-in-region nil
@@ -43,8 +44,6 @@ session)."
   (after! magit     (setq magit-completing-read-function #'ivy-completing-read))
   (after! yasnippet (push #'+ivy-yas-prompt yas-prompt-functions))
 
-  (add-hook 'doom-init-hook #'ivy-mode)
-
   (map! :map ivy-mode-map
         [remap apropos]                   #'counsel-apropos
         [remap describe-face]             #'counsel-describe-face
diff --git a/modules/feature/workspaces/config.el b/modules/feature/workspaces/config.el
index bbf78bd3a..aacc47ca7 100644
--- a/modules/feature/workspaces/config.el
+++ b/modules/feature/workspaces/config.el
@@ -10,7 +10,7 @@
 ;; load the last autosaved session. You can give sessions a custom name so they
 ;; can be loaded later.
 ;;
-;; FYI persp-mode requires `workgroups' for file persistence in Emacs 24.4.
+;; NOTE persp-mode requires `workgroups' for file persistence in Emacs 24.4.
 
 (defvar +workspaces-main "main"
   "The name of the primary and initial workspace, which cannot be deleted or
diff --git a/modules/lang/cc/config.el b/modules/lang/cc/config.el
index 01a466a68..2b2e3fec4 100644
--- a/modules/lang/cc/config.el
+++ b/modules/lang/cc/config.el
@@ -76,7 +76,7 @@
   (c-set-offset 'inclass #'+cc--c-lineup-inclass)
 
 
-  ;; Certain mappings interfere with smartparens and custom bindings,
+  ;; Certain electric mappings interfere with smartparens and custom bindings,
   ;; so unbind them
   (map! :map c-mode-map
         "DEL" nil
diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el
index b2bd9ee15..47972d434 100644
--- a/modules/lang/javascript/config.el
+++ b/modules/lang/javascript/config.el
@@ -119,8 +119,9 @@
   (set! :electric 'rjsx-mode :chars '(?\} ?\) ?. ?>))
 
   ;; disable electric keys (I use snippets and `emmet-mode' instead)
-  (define-key rjsx-mode-map "<" nil)
-  (define-key rjsx-mode-map (kbd "C-d") nil)
+  (map! :map rjsx-mode-map
+        "<" nil
+        "C-d" nil)
   (add-hook! rjsx-mode
     ;; jshint doesn't really know how to deal with jsx
     (push 'javascript-jshint flycheck-disabled-checkers)))
diff --git a/modules/lang/markdown/config.el b/modules/lang/markdown/config.el
index 7b2345662..80255e3c2 100644
--- a/modules/lang/markdown/config.el
+++ b/modules/lang/markdown/config.el
@@ -1,9 +1,9 @@
 ;;; lang/markdown/config.el -*- lexical-binding: t; -*-
 
 (def-package! markdown-mode
-  :mode ("/README\\.md$" . gfm-mode)
-  :mode "\\.m\\(d\\|arkdown\\)$"
   :mode "/README$"
+  :mode "\\.m\\(d\\|arkdown\\)$"
+  :mode ("/README\\.md$" . gfm-mode)
   :init
   (setq markdown-enable-wiki-links t
         markdown-enable-math t
diff --git a/modules/private/hlissner/config.el b/modules/private/hlissner/config.el
index 94afe04b4..31ffa9019 100644
--- a/modules/private/hlissner/config.el
+++ b/modules/private/hlissner/config.el
@@ -4,11 +4,8 @@
   (load! +bindings)  ; my key bindings
   (load! +commands)) ; my custom ex commands
 
-(defvar +hlissner-dir
-  (file-name-directory load-file-name))
-
-(defvar +hlissner-snippets-dir
-  (expand-file-name "snippets/" +hlissner-dir))
+(defvar +hlissner-dir (file-name-directory load-file-name))
+(defvar +hlissner-snippets-dir (expand-file-name "snippets/" +hlissner-dir))
 
 (setq epa-file-encrypt-to user-mail-address
       auth-sources (list (expand-file-name ".authinfo.gpg" +hlissner-dir)))