nix: make system configurations dynamic

FredeEB · Mar 23, 2024 · 5402eef · 5402eef
1 parent e702bf8
commit 5402eef
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 20 deletions.
diff --git a/systems/base.nix → common/base.nix b/systems/base.nix → common/base.nix
diff --git a/systems/desktop.nix → common/desktop.nix b/systems/desktop.nix → common/desktop.nix
diff --git a/flake.nix b/flake.nix
@@ -16,26 +16,19 @@
     let
       overlays = [ neovim-nightly-overlay.overlay ];
 
-      base = [ { nixpkgs.overlays = overlays; } ./systems/base.nix ];
+      base = [ { nixpkgs.overlays = overlays; } ./common/base.nix ];
+      createSystem = (system-file:
+        let name = nixpkgs.lib.strings.removeSuffix ".nix" system-file;
+        in {
+          inherit name;
+          value = nixpkgs.lib.nixosSystem {
+            specialArgs = { inherit inputs; };
+            modules = base ++ [ (./systems + "/${system-file}") ];
+          };
+        });
     in {
-      nixosConfigurations = {
-        dt = nixpkgs.lib.nixosSystem {
-          specialArgs = { inherit inputs; };
-          modules = base ++ [ ./systems/desktop.nix ./systems/dt.nix ];
-        };
-        yoga = nixpkgs.lib.nixosSystem {
-          specialArgs = { inherit inputs; };
-          modules = base ++ [ ./systems/desktop.nix ./systems/yoga.nix ];
-        };
-        ideapad = nixpkgs.lib.nixosSystem {
-          specialArgs = { inherit inputs; };
-          modules = base ++ [ ./systems/desktop.nix ./systems/ideapad.nix ];
-        };
-        server = nixpkgs.lib.nixosSystem {
-          specialArgs = { inherit inputs; };
-          modules = base ++ [ ./systems/server.nix ./modules/ssh.nix ];
-        };
-      };
+      nixosConfigurations = builtins.listToAttrs
+        (map createSystem (builtins.attrNames (builtins.readDir ./systems)));
 
       formatter."x86_64-linux" = nixpkgs.legacyPackages."x86_64-linux".nixfmt;
     };

diff --git a/systems/dt.nix b/systems/dt.nix
@@ -1,5 +1,6 @@
 { config, lib, modulesPath, ... }: {
   imports = [
+    ../common/desktop.nix
     ../modules/default-system-layout.nix
     (modulesPath + "/installer/scan/not-detected.nix")
   ];

diff --git a/systems/ideapad.nix b/systems/ideapad.nix
@@ -1,5 +1,6 @@
 { config, lib, modulesPath, ... }: {
   imports = [
+    ../common/desktop.nix
     ../modules/default-system-layout.nix
     (modulesPath + "/installer/scan/not-detected.nix")
   ];

diff --git a/systems/yoga.nix b/systems/yoga.nix
@@ -1,6 +1,6 @@
 { config, lib, modulesPath, ... }: {
-
   imports = [
+    ../common/desktop.nix
     ../modules/default-system-layout.nix
     (modulesPath + "/installer/scan/not-detected.nix")
   ];