General refactors & reformatting

modules/lang/emacs-lisp/config.el

@@ -167,8 +167,8 @@ This marks a foldable marker for `outline-minor-mode' in elisp buffers.")
   (set-yas-minor-mode! 'buttercup-minor-mode)
   (when (featurep 'evil)
     (add-hook 'buttercup-minor-mode-hook #'evil-normalize-keymaps))
-  (map! :map buttercup-minor-mode-map
-        :localleader
+  (map! :localleader
+        :map buttercup-minor-mode-map
         :prefix "t"
         "t" #'+emacs-lisp/buttercup-run-file
         "a" #'+emacs-lisp/buttercup-run-project

modules/lang/haskell/packages.el

@@ -3,10 +3,11 @@
 
 (package! haskell-mode)
 
-(cond ((featurep! +dante)
-       (package! dante)
-       (package! attrap))
-      ((featurep! +lsp)
-       (package! lsp-haskell))
-      ((featurep! +intero)  ; DEPRECATED
-       (package! intero)))
+(when (featurep! +dante)
+  (package! dante)
+  (package! attrap))
+(when (featurep! +lsp)
+  (package! lsp-haskell))
+;; DEPRECATED
+(when (featurep! +intero)
+  (package! intero))