flake.nix

@@ -37,12 +37,33 @@
 
   outputs =
     { self, nixpkgs, ... }@inputs:
-    let
-      builders = import ./lib/builders.nix inputs;
-    in
     {
       nixosConfigurations =
-        builders.compileSystems
+        let
+          lib = import ./lib nixpkgs.lib;
+
+          toPartialNixosConfig =
+            { hostname, system }:
+            {
+              name = hostname;
+              value = nixpkgs.lib.nixosSystem {
+                inherit system;
+                specialArgs = { inherit inputs; };
+                modules = [
+                  ./hosts/${hostname}/hardware-configuration.nix
+                  ./hosts/${hostname}/configuration.nix
+                  inputs.home-manager.nixosModules.default
+                ];
+              };
+            };
+          compileSystems =
+            systems:
+            lib.right
+              builtins.listToAttrs
+              (map toPartialNixosConfig)
+              systems;
+        in
+        compileSystems
           [
             {
               hostname = "snowhawk";
@@ -57,24 +78,29 @@
               system = "x86_64-linux";
             }
           ];
-      homeConfigurations =
-        builders.compileHomes
-          [
-            {
-              user = "zynh";
-              hostname = "msiserver";
-              system = "x86_64-linux";
-            }
-            {
-              user = "val";
-              hostname = "caveserver";
-              system = "x86_64-linux";
-            }
-            {
-              user = "zynh";
-              hostname = "little-lightning";
-              system = "aarch64-darwin";
-            }
-          ];
+      homeConfigurations."zynh@msiserver" = inputs.home-manager.lib.homeManagerConfiguration {
+        pkgs = nixpkgs.legacyPackages."x86_64-linux";
+        extraSpecialArgs = { inherit inputs; };
+
+        modules = [
+          ./hosts/msiserver/home.nix
+        ];
+      };
+      homeConfigurations."val@caveserver" = inputs.home-manager.lib.homeManagerConfiguration {
+        pkgs = nixpkgs.legacyPackages."x86_64-linux";
+        extraSpecialArgs = { inherit inputs; };
+
+        modules = [
+          ./hosts/caveserver/home.nix
+        ];
+      };
+      homeConfigurations."zynh@little-lightning" = inputs.home-manager.lib.homeManagerConfiguration {
+        pkgs = nixpkgs.legacyPackages."aarch64-darwin";
+        extraSpecialArgs = { inherit inputs; };
+
+        modules = [
+          ./hosts/little-lightning/home.nix
+        ];
+      };
     };
 }

lib/builders.nix

@@ -1,51 +0,0 @@
-{ nixpkgs, ... }@inputs:
-
-let
-  lib = nixpkgs.lib.extend (import ../lib);
-in
-rec {
-  toPartialNixosConfig =
-    { hostname, system }:
-    {
-      name = hostname;
-      value = nixpkgs.lib.nixosSystem {
-        inherit system;
-        specialArgs = { inherit inputs; };
-        modules = [
-          ../hosts/${hostname}/hardware-configuration.nix
-          ../hosts/${hostname}/configuration.nix
-          inputs.home-manager.nixosModules.default
-        ];
-      };
-    };
-  compileSystems =
-    systems:
-    lib.right
-      builtins.listToAttrs
-      (map toPartialNixosConfig)
-      systems;
-
-  toPartialHomeManagerConfig =
-    { user, system, hostname ? "", configHostname ? "" }:
-    let
-      configHost = if builtins.stringLength configHostname > 0 then configHostname else hostname;
-      hostStr = lib.strings.optionalString (builtins.stringLength hostname > 0) "@${hostname}";
-    in
-    {
-      name = "${user}${hostStr}";
-      value = inputs.home-manager.lib.homeManagerConfiguration {
-        pkgs = nixpkgs.legacyPackages."${system}";
-        extraSpecialArgs = { inherit inputs; };
-
-        modules = [
-          ../hosts/${configHost}/home.nix
-        ];
-      };
-    };
-  compileHomes =
-    systems:
-    lib.right
-      builtins.listToAttrs
-      (map toPartialHomeManagerConfig)
-      systems;
-}

lib/default.nix

@@ -1,5 +1,5 @@
-final: prev:
-with prev;
+lib:
+with lib;
 rec {
   # Ternary operator
   # Exaample: