modules: devenv: improve method to auto-import module in all shells

2 files changed, 15 insertions, 15 deletions

diff --git a/lib/default.nix b/lib/default.nix
index d65830b..254d336 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,17 +1,3 @@
 {
-  mkDevenv = {
-    devenv,
-    flake-parts,
-    my-nixpkgs,
-    ...
-  } @ inputs: config:
-    flake-parts.lib.mkFlake {inherit inputs;} {
-      imports = [devenv.flakeModule];
-      systems = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];
-      perSystem = _: {
-        devenv.shells.default = {
-          imports = [my-nixpkgs.devenvModules.personal config];
-        };
-      };
-    };
+  mkDevenv = import ./mkDevenv.nix;
 }
diff --git a/lib/mkDevenv.nix b/lib/mkDevenv.nix
new file mode 100644
index 0000000..3a86b14
--- /dev/null
+++ b/lib/mkDevenv.nix
@@ -0,0 +1,14 @@
+{
+  devenv,
+  flake-parts,
+  my-nixpkgs,
+  ...
+} @ inputs: config:
+flake-parts.lib.mkFlake {inherit inputs;} {
+  imports = builtins.attrValues {inherit (my-nixpkgs.flakeModules) personal devenv;};
+  perSystem = _: {
+    devenv.shells.default = {
+      imports = [config];
+    };
+  };
+}