From 54678bfee1f49c88578c10a6f31819ae54ed361a Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck@fcuny.net>
Date: Fri, 9 Jan 2026 18:43:38 -0800
Subject: make the adminUser configuration more flexible

The UID is different on linux and darwin.
---
 flake.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index 3da041d..c2a3b63 100644
--- a/flake.nix
+++ b/flake.nix
@@ -96,15 +96,22 @@
         };
       };
 
-      adminUser = {
+      baseAdminUser = {
         name = "fcuny";
-        uid = 1000;
         userinfo = {
           email = "franck@fcuny.net";
           fullName = "Franck Cuny";
         };
       };
 
+      nixosAdminUser = baseAdminUser // {
+        uid = 1000;
+      };
+
+      darwinAdminUser = baseAdminUser // {
+        uid = 501;
+      };
+
       defaultModules = [
         nixSettings
         agenix.nixosModules.age
@@ -150,10 +157,8 @@
             system = "aarch64-darwin";
             config = ./machines/mbp-work.nix;
             adminUser = {
-              name = "fcuny";
               userinfo = {
                 email = "fcuny@roblox.com";
-                fullName = "Franck Cuny";
               };
             };
           };
@@ -164,7 +169,7 @@
         name: machine:
         let
           pkgs = pkgsFor machine.system;
-          machineAdminUser = machine.adminUser or adminUser;
+          machineAdminUser = nixpkgs.lib.recursiveUpdate nixosAdminUser (machine.adminUser or { });
         in
         nixpkgs.lib.nixosSystem {
           inherit (machine) system;
@@ -195,7 +200,7 @@
         name: machine:
         let
           pkgs = pkgsFor machine.system;
-          machineAdminUser = machine.adminUser or adminUser;
+          machineAdminUser = nixpkgs.lib.recursiveUpdate darwinAdminUser (machine.adminUser or { });
         in
         darwin.lib.darwinSystem {
           inherit (machine) system;
@@ -219,10 +224,8 @@
       ) machines.darwin;
     in
     {
-      # Host configurations
       inherit nixosConfigurations darwinConfigurations;
 
-      # Overlays
       overlays.default = _final: prev: {
         sapi = prev.callPackage ./pkgs/sapi { };
         hashi = prev.callPackage ./pkgs/hashi { };
@@ -251,7 +254,6 @@
         let
           pkgs = pkgsFor system;
 
-          # Pre-commit hooks
           pre-commit-check = pre-commit-hooks.lib.${system}.run {
             src = ./.;
             hooks = {
-- 
cgit v1.2.3