From e51ac807843d1130c9d50b8f121d5d52fc4c87c2 Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kj@orbekk.com>
Date: Sat, 20 Feb 2021 21:11:28 -0500
Subject: Refactor flake

---
 flake.nix | 59 ++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/flake.nix b/flake.nix
index e92c25b..21edd3a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,35 +2,36 @@
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-20.09";
   inputs.nixpkgs_unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
 
-  outputs = { self, nixpkgs, nixpkgs_unstable }: {
+  outputs = { self, nixpkgs, nixpkgs_unstable }:
+    {
+      nixosConfigurations = let
+        mkConfig = { hostName
+                   , module ? (./. + "/machines/${hostName}.nix")
+                   , system ? "x86_64-linux" }: {
+          name = hostName;
+          value = nixpkgs.lib.nixosSystem {
+            system = "x86_64-linux";
+            modules =
+              [
+                module
+                ({config, pkgs, ...}: {
+                  # Let 'nixos-version --json' know about the Git revision
+                  # of this flake.
+                  system.configurationRevision =
+                    if self ? rev then self.rev else "DIRTY";
 
-    nixosConfigurations = let
-      mkConfig = { hostName, module ? (./. + "/machines/${hostName}.nix") }: {
-        name = hostName;
-        value = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          modules =
-            [
-              module
-              ({config, pkgs, ...}: {
-                # Let 'nixos-version --json' know about the Git revision
-                # of this flake.
-                system.configurationRevision =
-                  if self ? rev then self.rev else "DIRTY";
-
-                # Add unstable packages.
-                nixpkgs.overlays = [
-                  (final: prev: { unstable = nixpkgs_unstable.legacyPackages."x86_64-linux"; })
-                ];
-              })
-            ];
+                  # Add unstable packages.
+                  nixpkgs.overlays = [
+                    (final: prev: { unstable = nixpkgs_unstable.legacyPackages."x86_64-linux"; })
+                  ];
+                })
+              ];
+          };
         };
-      };
-      myMachines = [
-        { hostName = "pincer"; module = ./machines/x1-pincer.nix; }
-        { hostName = "dragon"; }
-      ];
-    in builtins.listToAttrs (map mkConfig myMachines);
-
-  };
+        myMachines = [
+          { hostName = "pincer"; module = ./machines/x1-pincer.nix; }
+          { hostName = "dragon"; }
+        ];
+      in builtins.listToAttrs (map mkConfig myMachines);
+    };
 }
-- 
cgit v1.2.3