From 9b9c9a57b626d72c4def5c2ddb7253bccb19c75d Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 28 Jan 2025 19:30:20 +0000
Subject: [PATCH] =?UTF-8?q?nix:=20don=E2=80=99t=20set=20`$NIX=5FREMOTE`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

NixOS doesn’t bother doing this, and Nix already matches this
conditional behaviour when `$NIX_REMOTE` is unset.
---
 modules/nix/default.nix       | 20 +++++---------------
 tests/services-nix-daemon.nix |  3 ---
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index b70487d7..b373e778 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -785,21 +785,11 @@ in
     # Set up the environment variables for running Nix.
     environment.variables = cfg.envVars // { NIX_PATH = cfg.nixPath; };
 
-    environment.extraInit = mkMerge [
-      (mkIf cfg.channel.enable ''
-        if [ -e "$HOME/.nix-defexpr/channels" ]; then
-          export NIX_PATH="$HOME/.nix-defexpr/channels''${NIX_PATH:+:$NIX_PATH}"
-        fi
-      '')
-      # Not in NixOS module
-      ''
-        # Set up secure multi-user builds: non-root users build through the
-        # Nix daemon.
-        if [ ! -w /nix/var/nix/db ]; then
-            export NIX_REMOTE=daemon
-        fi
-      ''
-    ];
+    environment.extraInit = mkIf cfg.channel.enable ''
+      if [ -e "$HOME/.nix-defexpr/channels" ]; then
+        export NIX_PATH="$HOME/.nix-defexpr/channels''${NIX_PATH:+:$NIX_PATH}"
+      fi
+    '';
 
     environment.extraSetup = mkIf (!cfg.channel.enable) ''
       rm --force $out/bin/nix-channel
diff --git a/tests/services-nix-daemon.nix b/tests/services-nix-daemon.nix
index 3a217cbb..86dbd57c 100644
--- a/tests/services-nix-daemon.nix
+++ b/tests/services-nix-daemon.nix
@@ -27,8 +27,5 @@ in
 
     echo checking nix-daemon reload in /activate >&2
     grep "launchctl kill HUP system/org.nixos.nix-daemon" ${config.out}/activate
-
-    echo checking NIX_REMOTE=daemon in setEnvironment >&2
-    grep "NIX_REMOTE=daemon" ${config.system.build.setEnvironment}
   '';
 }