Lebesque Configuration.

nixos/lib/default.nix

@@ -1,5 +1,5 @@
-{
+nixpkgs: withSystem: {
   utils = import ./utils.nix;
   getSSHKeys = (import ./keys.nix).getSSHKeys;
-  mkSystem = (import ./nixos.nix).mkSystem;
+  mkSystem = (import ./nixos.nix nixpkgs withSystem).mkSystem;
 }

nixos/lib/keys.nix

@@ -1,4 +1,6 @@
-rec {
+let
+  utils = import ./utils.nix;
+in rec {
   getSSHKeys = name: (getKeySets ../keys)."${name}";
 
   getKeySets = dir: let
@@ -10,19 +12,11 @@ rec {
       if type == "regular"
       then [
         {
-          name = getName name;
+          name = utils.getName name;
           value = builtins.attrValues (import path);
         }
       ]
       else [];
   in
     builtins.listToAttrs (builtins.concatLists (builtins.attrValues (builtins.mapAttrs procEntry entries)));
-
-  getName = filename: let
-    parts = builtins.split "\\." filename;
-    base = builtins.head (builtins.split "\\." filename);
-  in
-    if builtins.length parts == 1
-    then filename
-    else base;
 }

nixos/lib/nixos.nix

@@ -1,25 +1,25 @@
-let
-  foelib = import ./default.nix;
+nixpkgs: withSystem: let
+  foelib = import ./default.nix nixpkgs withSystem;
 in {
-  mkSystem = nixpkgs: pkgs: hostname: modules:
-    nixpkgs.lib.nixosSystem {
-      modules =
-        [
-          {
-            nix.registry = {
-              nixpkgs.flake = nixpkgs;
-              p.flake = nixpkgs;
-            };
-            nixpkgs.pkgs = pkgs;
+  mkSystem = hostname: host-platform: modules:
+    withSystem host-platform
+    ({pkgs, ...}:
+      nixpkgs.lib.nixosSystem {
+        modules =
+          [
+            {
+              nix.registry = {
+                nixpkgs.flake = nixpkgs;
+                p.flake = nixpkgs;
+              };
+              nixpkgs.pkgs = pkgs;
 
-            networking.hostname = hostname;
-          }
-        ]
-        ++ modules
-        ++ foelib.utils.findNixFiles ../nixos;
-
-      specialArgs = {
-        inherit hostname foelib;
-      };
-    };
+              networking.hostName = hostname;
+            }
+          ]
+          ++ modules;
+        specialArgs = {
+          inherit hostname foelib;
+        };
+      });
 }

nixos/lib/utils.nix

@@ -1,6 +1,6 @@
 rec {
   findNixFiles = dir: let
-    inherit (builtins) attrNames readDir pathExists concatMap hasSuffix;
+    inherit (builtins) attrNames readDir pathExists concatMap;
 
     # Helper function to build full paths
     fullPath = name: dir + "/${name}";
@@ -16,11 +16,32 @@ rec {
       path = fullPath name;
       type = contents.${name};
     in
-      if type == "regular" && hasSuffix ".nix" name
+      if type == "regular" && hasSuffix "nix" name
       then [path]
       else if type == "directory" && pathExists path
       then findNixFiles path
       else [];
   in
     concatMap processItem names;
+
+  getName = filename: let
+    parts = builtins.split "\\." filename;
+    base = builtins.head (builtins.split "\\." filename);
+  in
+    if builtins.length parts == 1
+    then filename
+    else base;
+
+  getSuffix = filename: let
+    parts = builtins.split "\\." filename;
+    end = builtins.tail (builtins.split "\\." filename);
+  in
+    if builtins.length parts == 1
+    then filename
+    else builtins.elemAt end (builtins.length end - 1);
+
+  hasSuffix = suffix: filename:
+    if (getSuffix filename) == suffix
+    then true
+    else false;
 }