From 8207b0e249513feffd163d4228de685530fc665b Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Fri, 13 Oct 2023 20:39:39 +0300
Subject: 2023-10-13

---
 modules/common/emacs/default.nix | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

(limited to 'modules/common/emacs/default.nix')

diff --git a/modules/common/emacs/default.nix b/modules/common/emacs/default.nix
index a21b5ab..dfc657c 100644
--- a/modules/common/emacs/default.nix
+++ b/modules/common/emacs/default.nix
@@ -88,6 +88,11 @@ in {
                     gore # :lang go
                     gotools # :lang go
                     graphviz # :lang (org +roam2) :lang plantuml
+                    haskellPackages.cabal-fmt # :lang haskell :editor format
+                    haskellPackages.cabal-install # :lang haskell
+                    haskellPackages.haskell-language-server # :lang (haskell +lsp)
+                    haskellPackages.hoogle # :lang haskell
+                    haskellPackages.ormolu # :lang haskell :editor format
                     html-tidy # :lang web
                     jre # :lang plantuml
                     libtool # :term vterm
@@ -124,19 +129,7 @@ in {
                     if (this.system != "aarch64-darwin")
                     then [gdb] # :tools debugger
                     else [lldb] # :tools debugger
-                  )
-                  ++ optionals (!pkgs.stdenv.isDarwin)
-                  [
-                    # NOTE Haskell is pretty much broken every couple of days on
-                    # MacOS and I usually don't write anything in Haskell while
-                    # I'm on my work laptop, so... ShellCheck seems to be working,
-                    # though.
-                    haskellPackages.ormolu # :lang haskell :editor format
-                    haskellPackages.haskell-language-server # :lang (haskell +lsp)
-                    haskellPackages.cabal-fmt # :lang haskell :editor format
-                    haskellPackages.cabal-install # :lang haskell
-                    haskellPackages.hoogle # :lang haskell
-                  ];
+                  );
               in ''
                 ;; This will integrate packages which are required by various
                 ;; modules without polluting the user's profile.
-- 
cgit 1.4.1