nix: Make devshell a module

srid · Jul 25, 2024 · 969b96b · 969b96b
1 parent a4cb079
commit 969b96b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 21 deletions.
diff --git a/flake.nix b/flake.nix
@@ -15,26 +15,6 @@
       systems = import inputs.systems;
 
       # See ./nix/modules/*.nix for the modules that are imported here.
-      imports =
-        with builtins; map
-          (fn: ./nix/modules/${fn})
-          (attrNames (readDir ./nix/modules));
-
-      perSystem = { self', lib, config, pkgs, ... }: {
-        # Default shell.
-        devShells.default = pkgs.mkShell {
-          name = "haskell-template";
-          meta.description = "Haskell development environment";
-          # See https://community.flake.parts/haskell-flake/devshell#composing-devshells
-          inputsFrom = [
-            config.haskellProjects.default.outputs.devShell # See ./nix/modules/haskell.nix
-            config.treefmt.build.devShell # See ./nix/modules/formatter.nix
-          ];
-          packages = with pkgs; [
-            just
-            nixd
-          ];
-        };
-      };
+      imports = with builtins; map (fn: ./nix/modules/${fn}) (attrNames (readDir ./nix/modules));
     };
 }
diff --git a/nix/modules/devshell.nix b/nix/modules/devshell.nix
@@ -0,0 +1,18 @@
+{
+  perSystem = { config, pkgs, ... }: {
+    # Default shell.
+    devShells.default = pkgs.mkShell {
+      name = "haskell-template";
+      meta.description = "Haskell development environment";
+      # See https://community.flake.parts/haskell-flake/devshell#composing-devshells
+      inputsFrom = [
+        config.haskellProjects.default.outputs.devShell # See ./nix/modules/haskell.nix
+        config.treefmt.build.devShell # See ./nix/modules/formatter.nix
+      ];
+      packages = with pkgs; [
+        just
+        nixd
+      ];
+    };
+  };
+}