From d3dc9d62fcf9fdd58ee213d4e59633a586324318 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sat, 14 Mar 2026 16:43:46 +0100
Subject: [PATCH] nixos/foot: move mkIf outside .source option

Should resolve https://github.com/NixOS/nixpkgs/pull/493708#discussion_r2935397639
---
 nixos/modules/programs/foot/default.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/programs/foot/default.nix b/nixos/modules/programs/foot/default.nix
index e80195cf9622..b9a0da3113d0 100644
--- a/nixos/modules/programs/foot/default.nix
+++ b/nixos/modules/programs/foot/default.nix
@@ -75,13 +75,16 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    environment = {
-      systemPackages = [ cfg.package ];
-      etc."xdg/foot/foot.ini".source = settingsFormat.generate "foot.ini" cfg.settings;
-
-      etc."xdg/autostart/foot-server.desktop".source =
-        lib.mkIf cfg.xdg.serverAutostart "${cfg.package}/share/applications/foot-server.desktop";
-    };
+    environment = lib.mkMerge [
+      {
+        systemPackages = [ cfg.package ];
+        etc."xdg/foot/foot.ini".source = settingsFormat.generate "foot.ini" cfg.settings;
+      }
+      (lib.mkIf cfg.xdg.serverAutostart {
+        etc."xdg/autostart/foot-server.desktop".source =
+          "${cfg.package}/share/applications/foot-server.desktop";
+      })
+    ];
 
     programs = {
       foot.settings.main.include = lib.optionals (cfg.theme != null) [