From e31c7962668d32902d82d3de239a8912667c9ef5 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Fri, 14 Oct 2022 19:38:12 +0800
Subject: [PATCH] simplify aarch64 nix remote builds

---
 nixops/rpi-server.nix | 2 +-
 nixops/rpi.nix        | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/nixops/rpi-server.nix b/nixops/rpi-server.nix
index 3114c514..bae109f4 100644
--- a/nixops/rpi-server.nix
+++ b/nixops/rpi-server.nix
@@ -114,7 +114,7 @@
 
   nix.binaryCachePublicKeys = ["nixbld.m-labs.hk-1:5aSRVA5b320xbNvu30tqxVPXpld73bhtOeH6uAjRyHc="];
   nix.binaryCaches = ["https://cache.nixos.org" "https://nixbld.m-labs.hk"];
-  nix.trustedUsers = ["root" "nix"];
+  nix.trustedUsers = ["root" "sb"];
 
   nix.extraOptions = ''
     experimental-features = nix-command flakes impure-derivations
diff --git a/nixops/rpi.nix b/nixops/rpi.nix
index 1cd1eff5..857eab4d 100644
--- a/nixops/rpi.nix
+++ b/nixops/rpi.nix
@@ -43,9 +43,6 @@ in
   users.defaultUserShell = pkgs.fish;
   users.extraUsers = (import ./common-users.nix { inherit pkgs; }) //
     (pkgs.lib.optionalAttrs experimental-users (import ./experimental-users.nix { inherit pkgs; })) // {
-    nix = {
-      isNormalUser = true;
-    };
     nixbld = {
       isNormalUser = true;
       extraGroups = ["plugdev" "dialout"];
@@ -70,7 +67,7 @@ in
 
   nix.binaryCachePublicKeys = ["nixbld.m-labs.hk-1:5aSRVA5b320xbNvu30tqxVPXpld73bhtOeH6uAjRyHc="];
   nix.binaryCaches = ["https://cache.nixos.org" "https://nixbld.m-labs.hk"];
-  nix.trustedUsers = ["root" "nix" "sb"];
+  nix.trustedUsers = ["root" "sb"];
 
   nix.extraOptions = ''
     experimental-features = nix-command flakes impure-derivations