From caa9b4db8d1a24a83200a708929686ffc4816f82 Mon Sep 17 00:00:00 2001
From: Jez Cope <j.cope@erambler.co.uk>
Date: Wed, 12 Jan 2022 14:39:16 +0000
Subject: [PATCH] flake: slight refactor of overlay handling

---
 flake.nix | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/flake.nix b/flake.nix
index c0722dd..e4b8b8e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,10 +14,18 @@
   };
 
   outputs = { self, nixpkgs, home-manager, nur, emacs-overlay, ... }@inputs:
-    with nixpkgs.lib; {
-      nixosConfigurations = genAttrs [ "arianrhod" "gwydion" ] (hostName:
+    let
+      inherit (nixpkgs.lib) genAttrs nixosSystem;
+
+      system = "x86_64-linux";
+      hosts = [ "arianrhod" "gwydion" ];
+      overlay = import ./overlay.nix;
+    in {
+      inherit overlay;
+
+      nixosConfigurations = genAttrs hosts (hostName:
         nixosSystem {
-          system = "x86_64-linux";
+          inherit system;
           modules = [
             ./profiles
             ./configuration.nix
@@ -25,15 +33,16 @@
             (./secrets + "/${hostName}.nix")
 
             {
-              nixpkgs.overlays =
-                [ (import ./overlay.nix) nur.overlay emacs-overlay.overlay ];
+              nixpkgs.overlays = [ overlay nur.overlay emacs-overlay.overlay ];
             }
 
             home-manager.nixosModules.home-manager
             {
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
-              home-manager.users.jez = import ./home;
+              home-manager = {
+                useGlobalPkgs = true;
+                useUserPackages = true;
+                users.jez = import ./home;
+              };
             }
           ];
           specialArgs = { inherit inputs hostName; };