Skip to content

Commit eaeec87

Browse files
committed
Simplify, install basic tools globally
1 parent e5e68e3 commit eaeec87

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

modules/common/home-manager/languages/haskell/default.nix

+9-10
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,8 @@ in
1515
'';
1616
};
1717

18-
cabal-install.enable = lib.mkEnableOption "Enable cabal-install globally.";
19-
20-
hls.enable = lib.mkEnableOption "Enable haskell-language-server globally.";
21-
2218
hoogle.enable = lib.mkEnableOption
2319
"Install a local hoogle with docs for packages in globalPackages.";
24-
25-
ormolu.enable = lib.mkEnableOption "Enable ormolu formatter globally.";
2620
};
2721

2822
config = lib.mkIf cfg.enable {
@@ -31,10 +25,15 @@ in
3125
ghcWithPackages' = with pkgs.haskellPackages; if cfg.hoogle.enable then ghcWithHoogle else ghcWithPackages;
3226
ghcEnv = ghcWithPackages' cfg.globalPackages;
3327
in
34-
[ ghcEnv ]
35-
++ lib.optional cfg.cabal-install.enable pkgs.cabal-install
36-
++ lib.optional cfg.hls.enable pkgs.haskell-language-server
37-
++ lib.optional cfg.ormolu.enable pkgs.ormolu;
28+
[
29+
ghcEnv
30+
pkgs.haskellPackages.cabal-fmt
31+
pkgs.cabal-install
32+
pkgs.haskell-language-server
33+
pkgs.hlint
34+
pkgs.ormolu
35+
pkgs.haskellPackages.weeder
36+
];
3837

3938
programs.emacs.init.usePackage = {
4039

modules/common/home-manager/profiles/personal/default.nix

-3
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ in
1313

1414
haskell = {
1515
enable = true;
16-
cabal-install.enable = true;
17-
hls.enable = true;
1816
hoogle.enable = true;
19-
ormolu.enable = true;
2017
globalPackages = ps: with ps; [
2118
aeson
2219
array

0 commit comments

Comments
 (0)