From 758f62d39d8e2a55158ca064efc385e88fecdbaf Mon Sep 17 00:00:00 2001
From: Luke Worth <luke.worth@bellroy.com>
Date: Wed, 3 Jul 2024 10:34:58 +1000
Subject: [PATCH] services/nix-daemon: improve support for env vars

---
 modules/services/nix-daemon.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/services/nix-daemon.nix b/modules/services/nix-daemon.nix
index 42d31c94..6b461b01 100644
--- a/modules/services/nix-daemon.nix
+++ b/modules/services/nix-daemon.nix
@@ -20,6 +20,17 @@ in
       description = "Whether to make the nix-daemon service socket activated.";
     };
 
+    services.nix-daemon.environmentVariables = mkOption {
+      type = types.attrsOf types.str;
+      default = { };
+      example = {
+        AWS_CONFIG_FILE = "/etc/nix/aws/config";
+        AWS_SHARED_CREDENTIALS_FILE  = "/etc/nix/aws/credentials";
+        NIX_SSL_CERT_FILE = "/etc/nix/my-cert-file.crt";
+      };
+      description = "Extra environment variables provided to nix-daemon";
+    };
+
     services.nix-daemon.logFile = mkOption {
       type = types.nullOr types.path;
       default = null;
@@ -62,6 +73,7 @@ in
         };
 
       serviceConfig.EnvironmentVariables = mkMerge [
+        cfg.environmentVariables
         config.nix.envVars
         {
           NIX_SSL_CERT_FILE = mkIf