From 7fdf3c25c4e8f9c44c4dcc5dbaa7fd1c71b7e1e8 Mon Sep 17 00:00:00 2001
From: Adam Goldsmith <adam@adamgoldsmith.name>
Date: Fri, 9 Nov 2018 11:39:58 -0500
Subject: [PATCH] Rearrange config for readability

---
 .emacs.d/init.el | 69 ++++++++++++++++++++++++------------------------
 1 file changed, 34 insertions(+), 35 deletions(-)

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index b3795a2..1c42065 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -114,16 +114,17 @@
 
 (use-package comint
   :config
-  (setq-default comint-scroll-to-bottom-on-input t    ; always insert at the bottom
-                comint-scroll-to-bottom-on-output nil ; always add output at the bottom
-                comint-scroll-show-maximum-output t   ; scroll to show max possible output
-                ;; comint-completion-autolist t       ; show completion list when ambiguous
-                comint-input-ignoredups t             ; no duplicates in command history
-                comint-completion-addsuffix t         ; insert space/slash after file completion
-                comint-buffer-maximum-size 20000      ; max length of the buffer in lines
-                comint-get-old-input (lambda () "")   ; what to run when i press enter on a
-                                                      ; line above the current prompt
-                comint-input-ring-size 500)           ; max shell history size
+  (setq-default
+   comint-scroll-to-bottom-on-input t    ; always insert at the bottom
+   comint-scroll-to-bottom-on-output nil ; always add output at the bottom
+   comint-scroll-show-maximum-output t   ; scroll to show max possible output
+   ;; comint-completion-autolist t       ; show completion list when ambiguous
+   comint-input-ignoredups t             ; no duplicates in command history
+   comint-completion-addsuffix t         ; insert space/slash after file completion
+   comint-buffer-maximum-size 20000      ; max length of the buffer in lines
+   comint-get-old-input (lambda () "")   ; what to run when i press enter on a
+                                         ; line above the current prompt
+   comint-input-ring-size 500)           ; max shell history size
   (add-hook 'comint-mode-hook
             '(lambda () (setq-local show-trailing-whitespace nil))))
 
@@ -151,9 +152,8 @@
 (use-package term
   :config
   (add-hook 'term-mode-hook
-            '(lambda () (setq-local
-                         ;if this is t, it breaks shell-command
-                         comint-prompt-read-only nil))))
+            ; if this is t, it breaks shell-command
+            '(lambda () (setq-local comint-prompt-read-only nil))))
 
 (use-package gud
   :config
@@ -277,13 +277,26 @@
          ("M-n" . forward-paragraph)))
 
 ;;;; external packages (required)
-(use-package company :ensure
+(use-package company :ensure :demand
+  :bind ("<C-tab>" . company-manual-begin)
   :config
   (global-company-mode)
   (setq company-idle-delay 0.1
-    company-dabbrev-downcase nil
-    company-dabbrev-ignore-case nil)
-  (bind-key "<C-tab>" 'company-manual-begin))
+        company-dabbrev-downcase nil
+        company-dabbrev-ignore-case nil)
+
+  (use-package company-quickhelp :ensure
+    :disabled
+    :config
+    (company-quickhelp-mode 1)
+    (setq company-quickhelp-delay 0.5))
+
+  (use-package company-c-headers
+    :config
+    (add-to-list 'company-backends 'company-c-headers))
+  (use-package company-statistics
+    :config
+    (company-statistics-mode)))
 
 (use-package smart-mode-line :ensure
   :config
@@ -392,12 +405,6 @@
 (use-package expand-region :ensure
   :bind ("C-=" . er/expand-region))
 
-(use-package company-quickhelp :ensure
-  :disabled
-  :config
-  (company-quickhelp-mode 1)
-  (setq company-quickhelp-delay 0.5))
-
 (use-package magit :ensure
   :bind ("C-x g" . magit-status))
 
@@ -524,14 +531,6 @@
           :use-tls t))
         circe-default-part-message ""))
 
-(use-package company-c-headers
-  :config
-  (add-to-list 'company-backends 'company-c-headers))
-
-(use-package company-statistics
-  :config
-  (company-statistics-mode))
-
 (use-package dtrt-indent
   :config
   (dtrt-indent-global-mode 1))
@@ -681,11 +680,11 @@
         pkgbuild-makepkg-command "PKGEXT='.pkg.tar' makepkg -mf"))
 
 (use-package qml-mode
-  :mode "\\.qml\\'")
-
-(use-package company-qml
+  :mode "\\.qml\\'"
   :config
-  (add-to-list 'company-backends 'company-qml))
+  (use-package company-qml
+    :config
+    (add-to-list 'company-backends 'company-qml)))
 
 (use-package jdee
   :defer