flake.nix

@@ -17,49 +17,29 @@
     };
   };
 
-  outputs =
+  outputs = { self, nixpkgs, ... }@inputs:
-    { self, nixpkgs, ... }@inputs:
     {
       nixosConfigurations =
         let
-          lib = import ./lib { inherit (nixpkgs) lib; };
+          cleanHostname = config: builtins.removeAttrs config [ "hostname" ];
-
+          toNixosConfigPart = config: { name = config.hostname; value = nixpkgs.lib.nixosSystem (cleanHostname config); };
-          cleanHostname =
-            config:
-            builtins.removeAttrs config [ "hostname" ];
-          toPartialNixosConfigSet =
-            config:
-            {
-              name = config.hostname;
-              value = nixpkgs.lib.nixosSystem (cleanHostname config);
-            };
-          toNixosSystemConfig =
-            { hostname, system }:
-            {
-              inherit system hostname;
-              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 toPartialNixosConfigSet) (map toNixosSystemConfig) systems;
         in
-        compileSystems
+        builtins.listToAttrs
-          [
+          (map toNixosConfigPart
-            {
+            (map
-              hostname = "snowhawk";
+              ({ hostname, system }: {
-              system = "x86_64-linux";
+                inherit system hostname;
-            }
+                specialArgs = { inherit inputs; };
-            {
+                modules = [
-              hostname = "sprite";
+                  ./hosts/${hostname}/hardware-configuration.nix
-              system = "aarch64-linux";
+                  ./hosts/${hostname}/configuration.nix
-            }
+                  inputs.home-manager.nixosModules.default
-            {
+                ];
-              hostname = "nixos";
+              })
-              system = "x86_64-linux";
+              [
-            }
+                { hostname = "snowhawk"; system = "x86_64-linux"; }
-          ];
+                { hostname = "sprite"; system = "aarch64-linux"; }
+                { hostname = "nixos"; system = "x86_64-linux"; }
+              ]));
     };
 }

lib/default.nix

@@ -1,16 +0,0 @@
-{ lib, ... }:
-with lib;
-rec {
-  # Ternary operator
-  # Exaample:
-  # tern false 1 2 => 2
-  # tern true 1 2 => 1
-  tern = pred: x: y: if pred then x else y;
-
-  # Right-associate and chain following single-operand functions
-  # Example:
-  # right f g h 1 => f(g(h(1)))
-  right = f: g: tern (isFunction g)
-    (right (x: f (g (x))))
-    (f (g));
-}