diff --git a/modules/lang/haskell/+hindent.el b/modules/lang/haskell/+hindent.el deleted file mode 100644 index c5b751e01..000000000 --- a/modules/lang/haskell/+hindent.el +++ /dev/null @@ -1,6 +0,0 @@ -;;; +hindent.el --- description -*- lexical-binding: t; -*- -;;;###if (featurep! +hindent) - -(def-package! hindent - :hook (haskell-mode . hindent-mode)) - diff --git a/modules/lang/haskell/config.el b/modules/lang/haskell/config.el index 9d7e4b025..9b44c7531 100644 --- a/modules/lang/haskell/config.el +++ b/modules/lang/haskell/config.el @@ -3,13 +3,13 @@ (cond ((featurep! +intero) (load! "+intero")) ((featurep! +dante) (load! "+dante"))) -(when (featurep! +hindent) (load! "+hindent")) - - ;; ;; Common plugins ;; +(def-package! hindent + :hook (haskell-mode . hindent-mode)) + (after! haskell-mode (set-repl-handler! 'haskell-mode #'switch-to-haskell) (add-to-list 'completion-ignored-extensions ".hi")) diff --git a/modules/lang/haskell/doctor.el b/modules/lang/haskell/doctor.el index 6840470fa..91ac803ee 100644 --- a/modules/lang/haskell/doctor.el +++ b/modules/lang/haskell/doctor.el @@ -11,7 +11,6 @@ (unless (executable-find "stack") (warn! "Couldn't find stack. Intero will not work."))) -(when (featurep! +hindent) - (unless (executable-find "hindent") - (warn! "Couldn't find hindent. hindent-mode won't work."))) +(unless (executable-find "hindent") + (warn! "Couldn't find hindent. hindent-mode won't work.")) diff --git a/modules/lang/haskell/packages.el b/modules/lang/haskell/packages.el index dd3cb634d..f70614cb8 100644 --- a/modules/lang/haskell/packages.el +++ b/modules/lang/haskell/packages.el @@ -8,6 +8,5 @@ (package! dante)) (t (package! intero))) -(when (featurep! +hindent) - (package! hindent)) +(package! hindent)