From 61d2bd2895d4189aa020b1c1081aaea75f6f4bdf Mon Sep 17 00:00:00 2001
From: Barrett Ruth <br.barrettruth@gmail.com>
Date: Tue, 17 Feb 2026 09:02:13 -0500
Subject: [PATCH] fix(dunst): actually trigger daylight, midnight themes

---
 home/modules/theme.nix | 3 +--
 home/modules/ui.nix    | 8 ++++++++
 scripts/theme          | 3 +--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/home/modules/theme.nix b/home/modules/theme.nix
index f6213a2..f1295fd 100644
--- a/home/modules/theme.nix
+++ b/home/modules/theme.nix
@@ -110,8 +110,7 @@ in
         link "$cfg/hypr/themes/$theme.conf" "$cfg/hypr/themes/theme.conf"
         link "$cfg/waybar/themes/$theme.css" "$cfg/waybar/themes/theme.css"
         link "$cfg/fuzzel/themes/$theme.ini" "$cfg/fuzzel/themes/theme.ini"
-        $DRY_RUN_CMD mkdir -p "$cfg/dunst/dunstrc.d"
-        link "$cfg/dunst/themes/$theme.conf" "$cfg/dunst/dunstrc.d/theme.conf"
+        link "$cfg/dunst/themes/$theme.conf" "$cfg/dunst/themes/theme.conf"
       ''}
       link "$cfg/sioyek/themes/$theme.config" "$cfg/sioyek/themes/theme.config"
       link "$cfg/fzf/themes/$theme" "$cfg/fzf/themes/theme"
diff --git a/home/modules/ui.nix b/home/modules/ui.nix
index be69a6c..d5e9f03 100644
--- a/home/modules/ui.nix
+++ b/home/modules/ui.nix
@@ -307,6 +307,14 @@ in
   };
   xdg.configFile."dunst/themes/midnight.conf".text = mkDunstTheme config.palettes.midnight;
   xdg.configFile."dunst/themes/daylight.conf".text = mkDunstTheme config.palettes.daylight;
+
+  xdg.configFile."dunst/config".text = ''
+    include ${config.xdg.configHome}/dunst/dunstrc
+    include ${config.xdg.configHome}/dunst/themes/theme.conf
+  '';
+
+  systemd.user.services.dunst.Service.ExecStart = lib.mkForce
+    "${pkgs.dunst}/bin/dunst -config ${config.xdg.configHome}/dunst/config";
   xdg.configFile."waybar/themes/midnight.css".text = mkWaybarTheme config.palettes.midnight;
   xdg.configFile."waybar/themes/daylight.css".text = mkWaybarTheme config.palettes.daylight;
 
diff --git a/scripts/theme b/scripts/theme
index b169a33..8802113 100755
--- a/scripts/theme
+++ b/scripts/theme
@@ -99,8 +99,7 @@ Linux)
 
     dunst_themes="$cfg/dunst/themes"
     [ -f "$dunst_themes/$theme.conf" ] && {
-      mkdir -p "$cfg/dunst/dunstrc.d"
-      ln -sf "$dunst_themes/$theme.conf" "$cfg/dunst/dunstrc.d/theme.conf"
+      ln -sf "$dunst_themes/$theme.conf" "$dunst_themes/theme.conf"
       systemctl --user restart dunst
     }