From dacf64ca7fd6d6d2cf927c709a74cb7adc8e6236 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Tue, 30 Dec 2025 19:02:53 -0800 Subject: add back some abstractions related to user management --- flake.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index 6bda8cf..595783d 100644 --- a/flake.nix +++ b/flake.nix @@ -94,6 +94,15 @@ }; }; + adminUser = { + name = "fcuny"; + uid = 1000; + userinfo = { + email = "franck@fcuny.net"; + fullName = "Franck Cuny"; + }; + }; + defaultModules = [ nixSettings agenix.nixosModules.age @@ -137,6 +146,13 @@ HQ-KWNY2VH41P = { system = "aarch64-darwin"; config = ./machines/mbp-work.nix; + adminUser = { + name = "fcuny"; + userinfo = { + email = "fcuny@roblox.com"; + fullName = "Franck Cuny"; + }; + }; }; }; }; @@ -145,15 +161,18 @@ name: machine: let pkgs = pkgsFor machine.system; + machineAdminUser = machine.adminUser or adminUser; in nixpkgs.lib.nixosSystem { inherit (machine) system; specialArgs = { hostName = name; + adminUser = machineAdminUser; inherit self inputs; hostConfigurations = nixpkgs.lib.mapAttrs (_: conf: conf.config) nixosConfigurations; }; modules = [ + { adminUser = machineAdminUser; } { system.configurationRevision = self.rev or self.dirtyRev or null; system.nixos.versionSuffix = nixpkgs.lib.mkForce "git.${builtins.substring 0 11 nixpkgs.rev}"; @@ -173,14 +192,17 @@ name: machine: let pkgs = pkgsFor machine.system; + machineAdminUser = machine.adminUser or adminUser; in darwin.lib.darwinSystem { inherit (machine) system; specialArgs = { hostName = name; + adminUser = machineAdminUser; inherit self inputs; }; modules = [ + { adminUser = machineAdminUser; } { nixpkgs.pkgs = pkgs; nixpkgs.hostPlatform = machine.system; -- cgit v1.2.3