Rearrange config for readability

.emacs.d/init.el

@@ -114,7 +114,8 @@
 
 (use-package comint
   :config
-  (setq-default comint-scroll-to-bottom-on-input t    ; always insert at the bottom
+  (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
@@ -151,9 +152,8 @@
 (use-package term
   :config
   (add-hook 'term-mode-hook
-            '(lambda () (setq-local
+            ; if this is t, it breaks shell-command
-                         ;if this is t, it breaks shell-command
+            '(lambda () (setq-local comint-prompt-read-only nil))))
-                         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))
+
+  (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\\'")
+  :mode "\\.qml\\'"
-
-(use-package company-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