From 21d7604861d2cb6a32b397c6370c80a5aa85f7b6 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Sun, 7 Mar 2021 18:26:20 +0000
Subject: [PATCH] flake: refactor to differentiate common modules

---
 flake.nix | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/flake.nix b/flake.nix
index 07f0af7..7ea8712 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,26 +9,30 @@
 
   outputs = { self, nixpkgs, nur, home-manager }:
     let
-      buildHost = name: system: nixpkgs.lib.nixosSystem {
+      inherit (nixpkgs) lib;
+
+      defaultModules = [
+        ({ pkgs, ... }: {
+          # Let 'nixos-version --json' know about the Git revision
+          system.configurationRevision =
+            if self ? rev
+            then self.rev
+            else throw "Refusing to build from a dirty Git tree!";
+        })
+        { nixpkgs.overlays = [ nur.overlay ]; }
+        home-manager.nixosModules.home-manager
+        {
+          home-manager.users.ambroisie = import ./home;
+          # Nix Flakes compatibility
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+        }
+      ];
+
+      buildHost = name: system: lib.nixosSystem {
         inherit system;
-        modules = [
-          ({ pkgs, ... }: {
-            # Let 'nixos-version --json' know about the Git revision
-            # of this flake.
-            system.configurationRevision =
-              if self ? rev
-              then self.rev
-              else throw "Refusing to build from a dirty Git tree!";
-          })
-          { nixpkgs.overlays = [ nur.overlay ]; }
+        modules = defaultModules ++ [
           (./. + "/${name}.nix")
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.users.ambroisie = import ./home;
-            # Nix Flakes compatibility
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-          }
         ];
       };
     in