code rules

modules/dev/haskell/home.nix

@@ -28,11 +28,13 @@ in
       my.dev.haskell.enable = lib.mkDefault hm.enabledByDefault;
     }
     (lib.mkIf cfg.enable {
-      home.packages = feature.packages;
-      home.sessionVariables = {
-        CABAL_DIR = "${config.xdg.cacheHome}/cabal";
-        STACK_ROOT = "${config.xdg.dataHome}/stack";
-        GHCUP_USE_XDG_DIRS = "true";
+      home = {
+        inherit (feature) packages;
+        sessionVariables = {
+          CABAL_DIR = "${config.xdg.cacheHome}/cabal";
+          STACK_ROOT = "${config.xdg.dataHome}/stack";
+          GHCUP_USE_XDG_DIRS = "true";
+        };
       };
     })
   ];

modules/dev/haskell/nixos.nix

@@ -10,6 +10,11 @@ let
 in
 {
   options = {
+    devShells.haskell = lib.mkOption {
+      type = lib.types.package;
+      default = feature.devShell;
+      description = "Haskell development shell";
+    };
     my.dev.haskell = {
       enable = lib.mkEnableOption "Install Haskell tooling globally";
       users = lib.mkOption {
@@ -18,10 +23,5 @@ in
         description = "Users to install Haskell packages for";
       };
     };
-    devShells.haskell = lib.mkOption {
-      type = lib.types.package;
-      default = feature.devShell;
-      description = "Haskell development shell";
-    };
   };
 }