3 files changed, 27 insertions, 3 deletions
diff --git a/common/modules/terminal/alacritty.nix b/common/modules/terminal/alacritty.nix
index 7cbcfec..606e4f0 100644
--- a/common/modules/terminal/alacritty.nix
+++ b/common/modules/terminal/alacritty.nix
@@ -25,7 +25,15 @@ in
           hide_when_typing = true;
         };
         general = {
-          import = lib.optionals config.beeMods.matugen.enable [ "~/.config/alacritty/themes/matugen.toml" ];
+          import =
+            if
+              config.beeMods.matugen.enable
+              && config.beeMods.windowManagers.beeConfig.enable
+              && !config.beeMods.windowManagers.noctalia
+            then
+              [ "~/.config/alacritty/themes/matugen.toml" ]
+            else
+              [ "~/.config/alacritty/themes/noctalia" ];
         };
         window = {
           dynamic_padding = true;
diff --git a/common/modules/terminal/foot.nix b/common/modules/terminal/foot.nix
index afc4539..7603776 100644
--- a/common/modules/terminal/foot.nix
+++ b/common/modules/terminal/foot.nix
@@ -11,7 +11,15 @@ in
       enable = true;
       settings = {
         main = {
-          include = lib.optionals config.beeMods.matugen.enable [ "~/.config/foot/themes/matugen" ];
+          include =
+            if
+              config.beeMods.matugen.enable
+              && config.beeMods.windowManagers.beeConfig.enable
+              && !config.beeMods.windowManagers.noctalia
+            then
+              [ "~/.config/foot/themes/matugen" ]
+            else
+              [ "~/.config/foot/themes/noctalia" ];
           line-height = 13;
           letter-spacing = 0;
           vertical-letter-offset = 0;
diff --git a/common/modules/terminal/ghostty.nix b/common/modules/terminal/ghostty.nix
index c47e991..9c74e2a 100644
--- a/common/modules/terminal/ghostty.nix
+++ b/common/modules/terminal/ghostty.nix
@@ -11,7 +11,15 @@ in
       enable = true;
       enableFishIntegration = true;
       settings = {
-        theme = lib.optionalString config.beeMods.matugen.enable "matugen";
+        theme =
+          if
+            config.beeMods.matugen.enable
+            && config.beeMods.windowManagers.beeConfig.enable
+            && !config.beeMods.windowManagers.noctalia
+          then
+            [ "matugen" ]
+          else
+            [ "noctalia" ];
 
         font-family = cfg.font.family;
         font-size = cfg.font.size;