home

commit 3e9015a04174bc9fe0bb4dbcfcc3a14989f98536
parent 9c16bd30de4bdaa6f5c03421b50f9a1789758c25
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Fri, 19 Nov 2021 16:22:31 +0100

systems/modules: add builder user to builder profile.

It was set on wakasu only instead of all builder hosts.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
systems/hosts/wakasu.nix
 | 
8
--------
M
systems/modules/profiles/builder.nix
 | 
10
++++++++++

2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/systems/hosts/wakasu.nix b/systems/hosts/wakasu.nix
@@ -47,14 +47,6 @@ in
     "powerpc64le-linux"
   ];
 
-  users.extraUsers.builder = {
-    isNormalUser = true;
-    uid = 1018;
-    extraGroups = [ ];
-    openssh.authorizedKeys.keys = [ (builtins.readFile "/etc/nixos/secrets/builder.pub") ];
-  };
-  nix.trustedUsers = [ "root" "vincent" "builder" ];
-
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/6590b73d-72a4-4356-94b1-f56ac45c976d";
     fsType = "ext4";
diff --git a/systems/modules/profiles/builder.nix b/systems/modules/profiles/builder.nix
@@ -17,6 +17,7 @@ in
     sops.secrets.builder = {
       sopsFile = ../../../secrets/builder.yaml;
     };
+
     nix.buildMachines = (filter isCurrentHost
       [
         {
@@ -50,4 +51,13 @@ in
     };
 
   };
+
+  users.extraUsers.builder = {
+    isNormalUser = true;
+    uid = 1018;
+    extraGroups = [ ];
+    openssh.authorizedKeys.keys = [ (builtins.readFile "/etc/nixos/secrets/builder.pub") ];
+  };
+  nix.trustedUsers = [ "root" "vincent" "builder" ];
+
 }