Cleanup

init.el

@@ -71,7 +71,6 @@
   (god-exempt-predicates (list #'god-exempt-mode-p))
   (god-mode-enable-function-key-translations nil)
   :config
-  (god-mode)
   (defun my--god-c-q ()
     (interactive)
     (let ((god-local-mode nil))
@@ -99,7 +98,8 @@
                   ;; Escape codes for hbar cursor in insert mode
 		          (send-string-to-terminal "\e[4 q")))))
   (unless (or (daemonp) (display-graphic-p))
-    (keymap-global-set "C-l" (lambda () (interactive) (god-mode-all 0)))))
+    (keymap-global-set "C-l" (lambda () (interactive) (god-mode-all 0))))
+  (god-mode))
 
 (use-package avy
   :bind
@@ -196,8 +196,8 @@
 (use-package dtrt-indent
   :demand t
   :config
-  (dtrt-indent-global-mode)
-  (setcar (cdr (assq 'dtrt-indent-mode minor-mode-alist)) " dtrt"))
+  (setcar (cdr (assq 'dtrt-indent-mode minor-mode-alist)) " dtrt")
+  (dtrt-indent-global-mode))
 
 (use-package aggressive-indent
   :custom
@@ -225,9 +225,9 @@
   :custom
   (which-key-idle-delay 0.2)
   :config
-  (which-key-mode)
   (with-eval-after-load 'god-mode
-    (which-key-enable-god-mode-support)))
+    (which-key-enable-god-mode-support))
+  (which-key-mode))
 
 (use-package flymake
   :ensure nil
@@ -331,14 +331,14 @@
   (corfu-scroll-margin 3)
   (tab-always-indent 'complete)
   :config
-  (global-corfu-mode)
   (add-hook 'minibuffer-setup-hook
             (lambda ()
               (when (where-is-internal #'completion-at-point
                                        (list (current-local-map)))
                 (setq-local corfu-echo-display nil
                             corfu-popupinfo-delay nil)
-                (corfu-mode)))))
+                (corfu-mode))))
+  (global-corfu-mode))
 
 (use-package cape)
 
@@ -519,14 +519,6 @@
   :custom
   (haskell-process-show-debug-tips nil))
 
-;; (use-package web-mode
-;;   :mode ("\\.\\([jt]sx?\\|css\\)\\'" . web-mode)
-;;   :custom
-;;   (web-mode-css-indent-offset 2)
-;;   (web-mode-code-indent-offset 2)
-;;   (web-mode-markup-indent-offset 2)
-;;   :hook (web-mode . (lambda () (setq-local tab-width 2))))
-
 (use-package lua-mode
   :custom
   (lua-indent-level 4)