From 574137b8aeb0de239a083a61c285dfc0345e05b3 Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck@fcuny.net>
Date: Tue, 12 Aug 2025 09:35:09 -0700
Subject: move each machine configuration to a folder

This will give me a bit more flexibility to configure things per machine
in the future.
---
 flake/hosts.nix | 103 ++++++++++++++++++++++++--------------------------------
 1 file changed, 44 insertions(+), 59 deletions(-)

(limited to 'flake/hosts.nix')

diff --git a/flake/hosts.nix b/flake/hosts.nix
index d855a4a..41e983d 100644
--- a/flake/hosts.nix
+++ b/flake/hosts.nix
@@ -15,7 +15,6 @@ let
     mkIf
     nixosSystem
     readDir
-    replaceStrings
     substring
     ;
 
@@ -33,37 +32,25 @@ let
   mapHosts = foldl' (
     hosts: system:
     hosts
-    // (mapAttrs' (
-      filename: _:
-      let
-        name = replaceStrings [ ".nix" ] [ "" ] filename;
-      in
-      {
-        inherit name;
-        value = {
-          inherit system;
-          hostconf = "${self}/machines/nixos/${system}/${filename}";
-        };
-      }
-    ) (builtins.readDir "${self}/machines/nixos/${system}"))
+    // (mapAttrs' (name: _: {
+      inherit name;
+      value = {
+        inherit system;
+        hostconf = "${self}/machines/nixos/${system}/${name}";
+      };
+    }) (builtins.readDir "${self}/machines/nixos/${system}"))
   ) { };
 
   mapMacs = foldl' (
     hosts: system:
     hosts
-    // (mapAttrs' (
-      filename: _:
-      let
-        name = replaceStrings [ ".nix" ] [ "" ] filename;
-      in
-      {
-        inherit name;
-        value = {
-          inherit system;
-          hostconf = "${self}/machines/darwin/${system}/${filename}";
-        };
-      }
-    ) (builtins.readDir "${self}/machines/darwin/${system}"))
+    // (mapAttrs' (name: _: {
+      inherit name;
+      value = {
+        inherit system;
+        hostconf = "${self}/machines/darwin/${system}/${name}";
+      };
+    }) (builtins.readDir "${self}/machines/darwin/${system}"))
   ) { };
 
   defaultModules = [
@@ -105,22 +92,21 @@ let
             inherit self;
             inherit inputs;
           };
-          modules =
-            [
-              { inherit adminUser; }
-              {
-                nixpkgs.pkgs = pkgs;
-                nixpkgs.hostPlatform = system;
-                system.stateVersion = 5;
-                environment.systemPackages = [
-                  pkgs.git
-                ];
-              }
-            ]
-            ++ darwinDefaultModules
-            ++ [
-              hostconf
-            ];
+          modules = [
+            { inherit adminUser; }
+            {
+              nixpkgs.pkgs = pkgs;
+              nixpkgs.hostPlatform = system;
+              system.stateVersion = 5;
+              environment.systemPackages = [
+                pkgs.git
+              ];
+            }
+          ]
+          ++ darwinDefaultModules
+          ++ [
+            hostconf
+          ];
         }
       );
     }
@@ -155,22 +141,21 @@ let
             }) nixosConfigurations;
             inherit inputs;
           };
-          modules =
-            [
-              { inherit adminUser; }
-              {
-                system.configurationRevision = mkIf (self ? rev) self.rev;
-                system.nixos.versionSuffix = mkForce "git.${substring 0 11 inputs.nixpkgs.rev}";
-                nixpkgs.pkgs = pkgs;
-                environment.systemPackages = [
-                  pkgs.git
-                ];
-              }
-            ]
-            ++ defaultModules
-            ++ [
-              hostconf
-            ];
+          modules = [
+            { inherit adminUser; }
+            {
+              system.configurationRevision = mkIf (self ? rev) self.rev;
+              system.nixos.versionSuffix = mkForce "git.${substring 0 11 inputs.nixpkgs.rev}";
+              nixpkgs.pkgs = pkgs;
+              environment.systemPackages = [
+                pkgs.git
+              ];
+            }
+          ]
+          ++ defaultModules
+          ++ [
+            hostconf
+          ];
         }
       );
     }
-- 
cgit v1.2.3