From 30c3ae54e1b16f270b40b9309628f447c14799cd Mon Sep 17 00:00:00 2001
From: Elec3137 <elec3137@proton.me>
Date: Tue, 24 Feb 2026 08:42:46 -0800
Subject: [PATCH 1/2] nixos/foot: add option xdg.serverAutostart

---
 nixos/modules/programs/foot/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/modules/programs/foot/default.nix b/nixos/modules/programs/foot/default.nix
index 1492d6c1cc53..bf61863ab093 100644
--- a/nixos/modules/programs/foot/default.nix
+++ b/nixos/modules/programs/foot/default.nix
@@ -48,6 +48,10 @@ in
       };
     };
 
+    xdg = {
+      serverAutostart = lib.mkEnableOption "starting the foot server via xdg-autostart";
+    };
+
     theme = lib.mkOption {
       type = with lib.types; nullOr str;
       default = null;
@@ -74,7 +78,11 @@ in
     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";
     };
+
     programs = {
       foot.settings.main.include = lib.optionals (cfg.theme != null) [
         "${pkgs.foot.themes}/share/foot/themes/${cfg.theme}"

From 712437666997abefd6bf93aaf43c8250083e3455 Mon Sep 17 00:00:00 2001
From: Elec3137 <elec3137@proton.me>
Date: Mon, 2 Mar 2026 07:13:30 -0800
Subject: [PATCH 2/2] nixos/foot: use cfg.package instead of hardcoding
 pkgs.foot

---
 nixos/modules/programs/foot/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/foot/default.nix b/nixos/modules/programs/foot/default.nix
index bf61863ab093..e80195cf9622 100644
--- a/nixos/modules/programs/foot/default.nix
+++ b/nixos/modules/programs/foot/default.nix
@@ -85,7 +85,7 @@ in
 
     programs = {
       foot.settings.main.include = lib.optionals (cfg.theme != null) [
-        "${pkgs.foot.themes}/share/foot/themes/${cfg.theme}"
+        "${cfg.package.themes}/share/foot/themes/${cfg.theme}"
       ];
       # https://codeberg.org/dnkl/foot/wiki#user-content-shell-integration
       bash.interactiveShellInit = lib.mkIf cfg.enableBashIntegration ". ${./bashrc} # enable shell integration for foot terminal";