Add noctalia niri and way to switch between my config and noxtalia easily

10 files changed, 476 insertions, 444 deletions

diff --git a/common/modules/matugen/default.nix b/common/modules/matugen/default.nix
index 6eb8182..9e9f3d6 100644
--- a/common/modules/matugen/default.nix
+++ b/common/modules/matugen/default.nix
@@ -21,7 +21,7 @@ in
     enable = lib.mkEnableOption "Enable Dynamic colors";
   };
 
-  config = lib.mkIf cfg.enable (
+  config = lib.mkIf (cfg.enable && config.beeMods.windowManagers.beeConfig.enable) (
     lib.optionalAttrs homeManager {
       xdg.configFile = {
         "matugen/config.toml" = {
@@ -96,13 +96,15 @@ in
                 output_path = '~/.config/rofi/shared/colors.rasi'
               ''}
 
-              [templates.gtk3]
-              input_path = '~/.config/matugen/templates/gtk.css'
-              output_path = '~/.config/gtk-3.0/matugen.css'
+              ${lib.optionalString (config.gtk.theme.name == "adw-gtk3") ''
+                [templates.gtk3]
+                input_path = '~/.config/matugen/templates/gtk.css'
+                output_path = '~/.config/gtk-3.0/matugen.css'
 
-              [templates.gtk4]
-              input_path = '~/.config/matugen/templates/gtk.css'
-              output_path = '~/.config/gtk-4.0/matugen.css'
+                [templates.gtk4]
+                input_path = '~/.config/matugen/templates/gtk.css'
+                output_path = '~/.config/gtk-4.0/matugen.css'
+              ''}
 
               [templates.neovim]
               input_path = '~/.config/matugen/templates/neovim.json'
diff --git a/common/modules/matugen/templates/matugen-btop.nix b/common/modules/matugen/templates/matugen-btop.nix
index 1f23c25..e698fa4 100644
--- a/common/modules/matugen/templates/matugen-btop.nix
+++ b/common/modules/matugen/templates/matugen-btop.nix
@@ -4,7 +4,7 @@
   ...
 }:
 {
-  config = lib.mkIf config.programs.btop.enable {
+  config = lib.mkIf (config.programs.btop.enable && config.beeMods.windowManagers.beeConfig.enable) {
     xdg.configFile = {
       "matugen/templates/btop.theme" = {
         text = ''
diff --git a/common/modules/matugen/templates/matugen-discord.nix b/common/modules/matugen/templates/matugen-discord.nix
index 2f61fea..d3e72a5 100644
--- a/common/modules/matugen/templates/matugen-discord.nix
+++ b/common/modules/matugen/templates/matugen-discord.nix
@@ -4,280 +4,285 @@
   ...
 }:
 {
-  xdg.configFile = {
-    "matugen/templates/discord-system24.css" = {
-      text = ''
-        /**
-         * @name system24-matugen
-         * @description a tui-style discord theme. Matugen Material UI + Original Base Colors.
-         * @author refact0r
-         * @version 2.0.0
-         * @invite nz87hXyvcy
-         * @website https://github.com/refact0r/system24
-         * @source https://github.com/refact0r/system24/blob/master/theme/system24.theme.css
-        */
 
-        /* import theme modules */
-        @import url("https://refact0r.github.io/system24/build/system24.css");
+  config =
+    lib.mkIf (config.programs.vesktop.enable && config.beeMods.windowManagers.beeConfig.enable)
+      {
+        xdg.configFile = {
+          "matugen/templates/discord-system24.css" = {
+            text = ''
+              /**
+               * @name system24-matugen
+               * @description a tui-style discord theme. Matugen Material UI + Original Base Colors.
+               * @author refact0r
+               * @version 2.0.0
+               * @invite nz87hXyvcy
+               * @website https://github.com/refact0r/system24
+               * @source https://github.com/refact0r/system24/blob/master/theme/system24.theme.css
+              */
 
-        body {
-            /* font options */
-            --font: "IosevkaInput"; 
-            --code-font: "IosevkaInput"; 
-            font-weight: 300; 
-            letter-spacing: -0.05ch; 
+              /* import theme modules */
+              @import url("https://refact0r.github.io/system24/build/system24.css");
 
-            /* sizes */
-            --gap: 12px; 
-            --divider-thickness: 4px; 
-            --border-thickness: 2px; 
-            --border-hover-transition: 0.2s ease; 
+              body {
+                  /* font options */
+                  --font: "IosevkaInput"; 
+                  --code-font: "IosevkaInput"; 
+                  font-weight: 300; 
+                  letter-spacing: -0.05ch; 
 
-            /* animation/transition options */
-            --animations: off; 
-            --list-item-transition: 0.2s ease; 
-            --dms-icon-svg-transition: 0.4s ease; 
+                  /* sizes */
+                  --gap: 12px; 
+                  --divider-thickness: 4px; 
+                  --border-thickness: 2px; 
+                  --border-hover-transition: 0.2s ease; 
 
-            /* top bar options */
-            --top-bar-height: var(--gap); 
-            --top-bar-button-position: titlebar; 
-            --top-bar-title-position: off; 
-            --subtle-top-bar-title: off; 
+                  /* animation/transition options */
+                  --animations: off; 
+                  --list-item-transition: 0.2s ease; 
+                  --dms-icon-svg-transition: 0.4s ease; 
 
-            /* window controls */
-            --custom-window-controls: off; 
-            --window-control-size: 14px; 
+                  /* top bar options */
+                  --top-bar-height: var(--gap); 
+                  --top-bar-button-position: titlebar; 
+                  --top-bar-title-position: off; 
+                  --subtle-top-bar-title: off; 
 
-            /* dms button options */
-            --custom-dms-icon: off; 
-            --dms-icon-svg-url: url(""); 
-            --dms-icon-svg-size: 90%; 
-            --dms-icon-color-before: var(--icon-subtle); 
-            --dms-icon-color-after: var(--white); 
-            --custom-dms-background: off; 
-            --dms-background-image-url: url(""); 
-            --dms-background-image-size: cover; 
-            --dms-background-color: linear-gradient(70deg, var(--blue-2), var(--purple-2), var(--red-2)); 
+                  /* window controls */
+                  --custom-window-controls: off; 
+                  --window-control-size: 14px; 
 
-            /* background image options */
-            --background-image: off; 
-            --background-image-url: url(""); 
+                  /* dms button options */
+                  --custom-dms-icon: off; 
+                  --dms-icon-svg-url: url(""); 
+                  --dms-icon-svg-size: 90%; 
+                  --dms-icon-color-before: var(--icon-subtle); 
+                  --dms-icon-color-after: var(--white); 
+                  --custom-dms-background: off; 
+                  --dms-background-image-url: url(""); 
+                  --dms-background-image-size: cover; 
+                  --dms-background-color: linear-gradient(70deg, var(--blue-2), var(--purple-2), var(--red-2)); 
 
-            /* transparency/blur options */
-            --transparency-tweaks: off; 
-            --remove-bg-layer: off; 
-            --panel-blur: off; 
-            --blur-amount: 12px; 
-            --bg-floating: var(--bg-3); 
+                  /* background image options */
+                  --background-image: off; 
+                  --background-image-url: url(""); 
 
-            /* other options */
-            --small-user-panel: on; 
+                  /* transparency/blur options */
+                  --transparency-tweaks: off; 
+                  --remove-bg-layer: off; 
+                  --panel-blur: off; 
+                  --blur-amount: 12px; 
+                  --bg-floating: var(--bg-3); 
 
-            /* unrounding options */
-            --unrounding: on; 
+                  /* other options */
+                  --small-user-panel: on; 
 
-            /* styling options */
-            --custom-spotify-bar: on; 
-            --ascii-titles: on; 
-            --ascii-loader: system24; 
+                  /* unrounding options */
+                  --unrounding: on; 
 
-            /* panel labels */
-            --panel-labels: on; 
-            --label-color: var(--text-muted); 
-            --label-font-weight: 500; 
-        }
+                  /* styling options */
+                  --custom-spotify-bar: on; 
+                  --ascii-titles: on; 
+                  --ascii-loader: system24; 
 
-        /* color options */
-        :root {
-            --colors: on; 
+                  /* panel labels */
+                  --panel-labels: on; 
+                  --label-color: var(--text-muted); 
+                  --label-font-weight: 500; 
+              }
 
-            /* text colors - mapped to matugen safe hex */
-            --text-0: var(--bg-4); 
-            --text-1: {{colors.on_surface.default.hex}}; 
-            --text-2: {{colors.on_surface.default.hex}}; 
-            --text-3: {{colors.on_surface_variant.default.hex}}; 
-            --text-4: {{colors.outline.default.hex}}; 
-            --text-5: {{colors.outline_variant.default.hex}}; 
+              /* color options */
+              :root {
+                  --colors: on; 
 
-            /* background colors - mapped to matugen safe hex */
-            --bg-1: {{colors.surface_variant.default.hex}}; 
-            --bg-2: {{colors.surface_container_high.default.hex}}; 
-            --bg-3: {{colors.surface_container_low.default.hex}}; 
-            <* if {{ is_dark_mode }} *>
-            --bg-4: {{colors.surface.default.hex}}; 
-            <* else *>
-            --bg-4: {{colors.surface_container_low.default.hex}}; 
-            <* endif *>
+                  /* text colors - mapped to matugen safe hex */
+                  --text-0: var(--bg-4); 
+                  --text-1: {{colors.on_surface.default.hex}}; 
+                  --text-2: {{colors.on_surface.default.hex}}; 
+                  --text-3: {{colors.on_surface_variant.default.hex}}; 
+                  --text-4: {{colors.outline.default.hex}}; 
+                  --text-5: {{colors.outline_variant.default.hex}}; 
 
-            /* hovers - using on_surface hex + CSS hex opacity (1a=10%, 33=20%, 4d=30%) */
-            --hover: {{colors.on_surface.default.hex}}1a; 
-            --active: {{colors.on_surface.default.hex}}33; 
-            --active-2: {{colors.on_surface.default.hex}}4d; 
-            --message-hover: var(--hover); 
+                  /* background colors - mapped to matugen safe hex */
+                  --bg-1: {{colors.surface_variant.default.hex}}; 
+                  --bg-2: {{colors.surface_container_high.default.hex}}; 
+                  --bg-3: {{colors.surface_container_low.default.hex}}; 
+                  <* if {{ is_dark_mode }} *>
+                  --bg-4: {{colors.surface.default.hex}}; 
+                  <* else *>
+                  --bg-4: {{colors.surface_container_low.default.hex}}; 
+                  <* endif *>
 
-            /* accent colors - Replaced with Matugen Colors */
-            --accent-1: {{colors.tertiary.default.hex}}; 
-            --accent-2: {{colors.primary.default.hex}}; 
-            --accent-3: {{colors.primary.default.hex}}; 
-            --accent-4: {{colors.primary_container.default.hex}}; 
-            --accent-5: {{colors.primary_fixed_dim.default.hex}}; 
-            --accent-new: {{colors.error.default.hex}}; 
+                  /* hovers - using on_surface hex + CSS hex opacity (1a=10%, 33=20%, 4d=30%) */
+                  --hover: {{colors.on_surface.default.hex}}1a; 
+                  --active: {{colors.on_surface.default.hex}}33; 
+                  --active-2: {{colors.on_surface.default.hex}}4d; 
+                  --message-hover: var(--hover); 
 
-            /* Math kept identical, only source colors swapped to Matugen */
-            --mention: linear-gradient(to right, color-mix(in hsl, {{colors.primary.default.hex}}, transparent 90%) 40%, transparent); 
-            --mention-hover: linear-gradient(to right, color-mix(in hsl, {{colors.primary.default.hex}}, transparent 95%) 40%, transparent); 
-            --reply: linear-gradient(to right, color-mix(in hsl, {{colors.on_surface_variant.default.hex}}, transparent 90%) 40%, transparent); 
-            --reply-hover: linear-gradient(to right, color-mix(in hsl, {{colors.on_surface_variant.default.hex}}, transparent 95%) 40%, transparent); 
+                  /* accent colors - Replaced with Matugen Colors */
+                  --accent-1: {{colors.tertiary.default.hex}}; 
+                  --accent-2: {{colors.primary.default.hex}}; 
+                  --accent-3: {{colors.primary.default.hex}}; 
+                  --accent-4: {{colors.primary_container.default.hex}}; 
+                  --accent-5: {{colors.primary_fixed_dim.default.hex}}; 
+                  --accent-new: {{colors.error.default.hex}}; 
 
-            /* status indicator colors - Kept original as requested, updated offline */
-            --online: var(--green-2); 
-            --dnd: var(--red-2); 
-            --idle: var(--yellow-2); 
-            --streaming: var(--purple-2); 
-            --offline: {{colors.outline.default.hex}}; 
+                  /* Math kept identical, only source colors swapped to Matugen */
+                  --mention: linear-gradient(to right, color-mix(in hsl, {{colors.primary.default.hex}}, transparent 90%) 40%, transparent); 
+                  --mention-hover: linear-gradient(to right, color-mix(in hsl, {{colors.primary.default.hex}}, transparent 95%) 40%, transparent); 
+                  --reply: linear-gradient(to right, color-mix(in hsl, {{colors.on_surface_variant.default.hex}}, transparent 90%) 40%, transparent); 
+                  --reply-hover: linear-gradient(to right, color-mix(in hsl, {{colors.on_surface_variant.default.hex}}, transparent 95%) 40%, transparent); 
 
-            /* border colors */
-            --border-light: var(--hover); 
-            --border: var(--active); 
-            --border-hover: {{colors.primary.default.hex}}; 
-            --button-border: {{colors.on_surface.default.hex}}1a; 
+                  /* status indicator colors - Kept original as requested, updated offline */
+                  --online: var(--green-2); 
+                  --dnd: var(--red-2); 
+                  --idle: var(--yellow-2); 
+                  --streaming: var(--purple-2); 
+                  --offline: {{colors.outline.default.hex}}; 
 
-            /* base colors - UNTOUCHED OKLCH FROM ORIGINAL */
-            --red-1: oklch(75% 0.13 0);
-            --red-2: oklch(70% 0.13 0);
-            --red-3: oklch(65% 0.13 0);
-            --red-4: oklch(60% 0.13 0);
-            --red-5: oklch(55% 0.13 0);
+                  /* border colors */
+                  --border-light: var(--hover); 
+                  --border: var(--active); 
+                  --border-hover: {{colors.primary.default.hex}}; 
+                  --button-border: {{colors.on_surface.default.hex}}1a; 
 
-            --green-1: oklch(75% 0.12 170);
-            --green-2: oklch(70% 0.12 170);
-            --green-3: oklch(65% 0.12 170);
-            --green-4: oklch(60% 0.12 170);
-            --green-5: oklch(55% 0.12 160);
+                  /* base colors - UNTOUCHED OKLCH FROM ORIGINAL */
+                  --red-1: oklch(75% 0.13 0);
+                  --red-2: oklch(70% 0.13 0);
+                  --red-3: oklch(65% 0.13 0);
+                  --red-4: oklch(60% 0.13 0);
+                  --red-5: oklch(55% 0.13 0);
 
-            --blue-1: oklch(75% 0.11 215);
-            --blue-2: oklch(70% 0.11 215);
-            --blue-3: oklch(65% 0.11 215);
-            --blue-4: oklch(60% 0.11 215);
-            --blue-5: oklch(55% 0.11 215);
+                  --green-1: oklch(75% 0.12 170);
+                  --green-2: oklch(70% 0.12 170);
+                  --green-3: oklch(65% 0.12 170);
+                  --green-4: oklch(60% 0.12 170);
+                  --green-5: oklch(55% 0.12 160);
 
-            --yellow-1: oklch(80% 0.12 90);
-            --yellow-2: oklch(75% 0.12 90);
-            --yellow-3: oklch(70% 0.12 90);
-            --yellow-4: oklch(65% 0.12 90);
-            --yellow-5: oklch(60% 0.12 90);
+                  --blue-1: oklch(75% 0.11 215);
+                  --blue-2: oklch(70% 0.11 215);
+                  --blue-3: oklch(65% 0.11 215);
+                  --blue-4: oklch(60% 0.11 215);
+                  --blue-5: oklch(55% 0.11 215);
 
-            --purple-1: oklch(75% 0.12 310);
-            --purple-2: oklch(70% 0.12 310);
-            --purple-3: oklch(65% 0.12 310);
-            --purple-4: oklch(60% 0.12 310);
-            --purple-5: oklch(55% 0.12 310);
-        }
-      '';
-    };
+                  --yellow-1: oklch(80% 0.12 90);
+                  --yellow-2: oklch(75% 0.12 90);
+                  --yellow-3: oklch(70% 0.12 90);
+                  --yellow-4: oklch(65% 0.12 90);
+                  --yellow-5: oklch(60% 0.12 90);
 
-    "matugen/templates/discord-midnight.css" = {
-      text = ''
-        /**
-         * @name midnight-matugen
-         * @description midnight-discord, generated by matugen
-         * @author refact0r
-         * @version 1.6.2
-         * @invite nz87hXyvcy
-         * @website https://github.com/refact0r/midnight-discord
-         * @source https://github.com/refact0r/midnight-discord/blob/master/midnight.theme.css
-         * @authorId 508863359777505290
-         * @authorLink https://www.refact0r.dev
-        */
+                  --purple-1: oklch(75% 0.12 310);
+                  --purple-2: oklch(70% 0.12 310);
+                  --purple-3: oklch(65% 0.12 310);
+                  --purple-4: oklch(60% 0.12 310);
+                  --purple-5: oklch(55% 0.12 310);
+              }
+            '';
+          };
 
-        /* IMPORTANT: make sure to enable dark mode in discord settings for the theme to apply properly!!! */
+          "matugen/templates/discord-midnight.css" = {
+            text = ''
+              /**
+               * @name midnight-matugen
+               * @description midnight-discord, generated by matugen
+               * @author refact0r
+               * @version 1.6.2
+               * @invite nz87hXyvcy
+               * @website https://github.com/refact0r/midnight-discord
+               * @source https://github.com/refact0r/midnight-discord/blob/master/midnight.theme.css
+               * @authorId 508863359777505290
+               * @authorLink https://www.refact0r.dev
+              */
 
-        @import url('https://refact0r.github.io/midnight-discord/build/midnight.css');
+              /* IMPORTANT: make sure to enable dark mode in discord settings for the theme to apply properly!!! */
 
-        /* customize things here */
-        :root {
-        	/* font, change to 'gg sans' for default discord font*/
-        	--font: 'IosevkaInput';
+              @import url('https://refact0r.github.io/midnight-discord/build/midnight.css');
 
-        	/* top left corner text */
-        	--corner-text: 'Midnight';
+              /* customize things here */
+              :root {
+              	/* font, change to 'gg sans' for default discord font*/
+              	--font: 'IosevkaInput';
 
-        	/* color of status indicators and window controls */
-          --online-indicator: {{colors.inverse_primary.default.hex}};     /* change to #23a55a for default green */
-        	--dnd-indicator: {{colors.error.default.hex}};                  /* change to #f13f43 for default red */
-        	--idle-indicator: {{colors.tertiary_container.default.hex}};    /* change to #f0b232 for default yellow */
-        	--streaming-indicator: {{colors.on_primary.default.hex}};       /* change to #593695 for default purple */
+              	/* top left corner text */
+              	--corner-text: 'Midnight';
 
-        	/* accent colors */
-          --accent-1: {{colors.tertiary.default.hex}};            /* links */
-        	--accent-2: {{colors.primary.default.hex}};             /* general unread/mention elements, some icons when active */
-        	--accent-3: {{colors.primary.default.hex}};             /* accent buttons */
-        	--accent-4: {{colors.surface_bright.default.hex}};      /* accent buttons when hovered */
-        	--accent-5: {{colors.primary_fixed_dim.default.hex}};   /* accent buttons when clicked */
-        	--mention:  {{colors.surface.default.hex}};             /* mentions & mention messages */
-        	--mention-hover: {{colors.surface_bright.default.hex}}; /* mentions & mention messages when hovered */
+              	/* color of status indicators and window controls */
+                --online-indicator: {{colors.inverse_primary.default.hex}};     /* change to #23a55a for default green */
+              	--dnd-indicator: {{colors.error.default.hex}};                  /* change to #f13f43 for default red */
+              	--idle-indicator: {{colors.tertiary_container.default.hex}};    /* change to #f0b232 for default yellow */
+              	--streaming-indicator: {{colors.on_primary.default.hex}};       /* change to #593695 for default purple */
 
-        	/* text colors */
-        	--text-0: {{colors.surface.default.hex}};               /* text on colored elements */
-        	--text-1: {{colors.on_surface.default.hex}};            /* other normally white text */
-        	--text-2: {{colors.on_surface.default.hex}};            /* headings and important text */
-        	--text-3: {{colors.on_surface_variant.default.hex}};    /* normal text */
-        	--text-4: {{colors.on_surface_variant.default.hex}};    /* icon buttons and channels */
-        	--text-5: {{colors.outline.default.hex}};               /* muted channels/chats and timestamps */
+              	/* accent colors */
+                --accent-1: {{colors.tertiary.default.hex}};            /* links */
+              	--accent-2: {{colors.primary.default.hex}};             /* general unread/mention elements, some icons when active */
+              	--accent-3: {{colors.primary.default.hex}};             /* accent buttons */
+              	--accent-4: {{colors.surface_bright.default.hex}};      /* accent buttons when hovered */
+              	--accent-5: {{colors.primary_fixed_dim.default.hex}};   /* accent buttons when clicked */
+              	--mention:  {{colors.surface.default.hex}};             /* mentions & mention messages */
+              	--mention-hover: {{colors.surface_bright.default.hex}}; /* mentions & mention messages when hovered */
 
-        	/* background and dark colors */
-          --bg-1: {{colors.surface_variant.default.hex}};                             /* dark buttons when clicked */
-        	--bg-2: {{colors.surface_container_high.default.hex}};              /* dark buttons */
-        	--bg-3: {{colors.surface_container_low.default.hex}};               /* spacing, secondary elements */
-        	--bg-4: {{colors.surface.default.hex}};                             /* main background color */
-        	--hover: {{colors.surface_bright.default.hex}};                     /* channels and buttons when hovered */
-        	--active: {{colors.surface_bright.default.hex}};                    /* channels and buttons when clicked or selected */
-        	--message-hover: {{colors.surface_bright.default.hex}};             /* messages when hovered */
+              	/* text colors */
+              	--text-0: {{colors.surface.default.hex}};               /* text on colored elements */
+              	--text-1: {{colors.on_surface.default.hex}};            /* other normally white text */
+              	--text-2: {{colors.on_surface.default.hex}};            /* headings and important text */
+              	--text-3: {{colors.on_surface_variant.default.hex}};    /* normal text */
+              	--text-4: {{colors.on_surface_variant.default.hex}};    /* icon buttons and channels */
+              	--text-5: {{colors.outline.default.hex}};               /* muted channels/chats and timestamps */
 
-        	/* amount of spacing and padding */
-        	--spacing: 12px;
+              	/* background and dark colors */
+                --bg-1: {{colors.surface_variant.default.hex}};                             /* dark buttons when clicked */
+              	--bg-2: {{colors.surface_container_high.default.hex}};              /* dark buttons */
+              	--bg-3: {{colors.surface_container_low.default.hex}};               /* spacing, secondary elements */
+              	--bg-4: {{colors.surface.default.hex}};                             /* main background color */
+              	--hover: {{colors.surface_bright.default.hex}};                     /* channels and buttons when hovered */
+              	--active: {{colors.surface_bright.default.hex}};                    /* channels and buttons when clicked or selected */
+              	--message-hover: {{colors.surface_bright.default.hex}};             /* messages when hovered */
 
-        	/* animations */
-        	/* ALL ANIMATIONS CAN BE DISABLED WITH REDUCED MOTION IN DISCORD SETTINGS */
-        	--list-item-transition: 0.2s ease;  /* channels/members/settings hover transition */
-        	--unread-bar-transition: 0.2s ease; /* unread bar moving into view transition */
-        	--moon-spin-transition: 0.4s ease;  /* moon icon spin */
-        	--icon-spin-transition: 1s ease;    /* round icon button spin (settings, emoji, etc.) */
+              	/* amount of spacing and padding */
+              	--spacing: 12px;
 
-        	/* corner roundness (border-radius) */
-        	--roundness-xl: 22px; /* roundness of big panel outer corners */
-        	--roundness-l: 20px; /* popout panels */
-        	--roundness-m: 16px; /* smaller panels, images, embeds */
-        	--roundness-s: 12px; /* members, settings inputs */
-        	--roundness-xs: 10px; /* channels, buttons */
-        	--roundness-xxs: 8px; /* searchbar, small elements */
+              	/* animations */
+              	/* ALL ANIMATIONS CAN BE DISABLED WITH REDUCED MOTION IN DISCORD SETTINGS */
+              	--list-item-transition: 0.2s ease;  /* channels/members/settings hover transition */
+              	--unread-bar-transition: 0.2s ease; /* unread bar moving into view transition */
+              	--moon-spin-transition: 0.4s ease;  /* moon icon spin */
+              	--icon-spin-transition: 1s ease;    /* round icon button spin (settings, emoji, etc.) */
 
-        	/* direct messages moon icon */
-        	/* change to block to show, none to hide */
-        	--discord-icon: none; /* discord icon */
-        	--moon-icon: block; /* moon icon */
-        	--moon-icon-url: url('https://upload.wikimedia.org/wikipedia/commons/c/c4/Font_Awesome_5_solid_moon.svg'); /* custom icon url */
-        	--moon-icon-size: auto;
+              	/* corner roundness (border-radius) */
+              	--roundness-xl: 22px; /* roundness of big panel outer corners */
+              	--roundness-l: 20px; /* popout panels */
+              	--roundness-m: 16px; /* smaller panels, images, embeds */
+              	--roundness-s: 12px; /* members, settings inputs */
+              	--roundness-xs: 10px; /* channels, buttons */
+              	--roundness-xxs: 8px; /* searchbar, small elements */
 
-        	/* filter uncolorable elements to fit theme */
-        	/* (just set to none, they're too much work to configure) */
-        	--login-bg-filter: saturate(0.3) hue-rotate(-15deg) brightness(0.4); /* login background artwork */
-        	--green-to-accent-3-filter: hue-rotate(56deg) saturate(1.43); /* add friend page explore icon */
-        	--blurple-to-accent-3-filter: hue-rotate(304deg) saturate(0.84) brightness(1.2); /* add friend page school icon */
-        }
+              	/* direct messages moon icon */
+              	/* change to block to show, none to hide */
+              	--discord-icon: none; /* discord icon */
+              	--moon-icon: block; /* moon icon */
+              	--moon-icon-url: url('https://upload.wikimedia.org/wikipedia/commons/c/c4/Font_Awesome_5_solid_moon.svg'); /* custom icon url */
+              	--moon-icon-size: auto;
 
-        /* Selected chat/friend text */
-        .selected_f5eb4b,
-        .selected_f6f816 .link_d8bfb3 {
-          color: var(--text-0) !important;
-          background: var(--accent-3) !important;
-        }
+              	/* filter uncolorable elements to fit theme */
+              	/* (just set to none, they're too much work to configure) */
+              	--login-bg-filter: saturate(0.3) hue-rotate(-15deg) brightness(0.4); /* login background artwork */
+              	--green-to-accent-3-filter: hue-rotate(56deg) saturate(1.43); /* add friend page explore icon */
+              	--blurple-to-accent-3-filter: hue-rotate(304deg) saturate(0.84) brightness(1.2); /* add friend page school icon */
+              }
 
-        .selected_f6f816 .link_d8bfb3 * {
-          color: var(--text-0) !important;
-          fill: var(--text-0) !important;
-        }
-      '';
-    };
-  };
+              /* Selected chat/friend text */
+              .selected_f5eb4b,
+              .selected_f6f816 .link_d8bfb3 {
+                color: var(--text-0) !important;
+                background: var(--accent-3) !important;
+              }
+
+              .selected_f6f816 .link_d8bfb3 * {
+                color: var(--text-0) !important;
+                fill: var(--text-0) !important;
+              }
+            '';
+          };
+        };
+      };
 }
diff --git a/common/modules/matugen/templates/matugen-dunst.nix b/common/modules/matugen/templates/matugen-dunst.nix
index dae700f..d7f9200 100644
--- a/common/modules/matugen/templates/matugen-dunst.nix
+++ b/common/modules/matugen/templates/matugen-dunst.nix
@@ -1,22 +1,29 @@
 {
-  xdg.configFile."matugen/templates/dunstrc" = {
-    text = ''
-      [global]
-      frame_color = "{{colors.primary.default.hex}}"
-      separator_color = "{{colors.primary_container.default.hex}}"
-      foreground = "{{colors.on_surface.default.hex}}"
-      highlight = "{{colors.primary.default.hex}}"
-      <* if {{ is_dark_mode }} *>
-      background = "{{colors.surface.default.hex}}"
-      <* else *>
-      background = "{{colors.surface_container.default.hex}}"
-      <* endif *>
+  config,
+  lib,
+  ...
+}:
+{
+  config = lib.mkIf config.services.dunst.enable {
+    xdg.configFile."matugen/templates/dunstrc" = {
+      text = ''
+        [global]
+        frame_color = "{{colors.primary.default.hex}}"
+        separator_color = "{{colors.primary_container.default.hex}}"
+        foreground = "{{colors.on_surface.default.hex}}"
+        highlight = "{{colors.primary.default.hex}}"
+        <* if {{ is_dark_mode }} *>
+        background = "{{colors.surface.default.hex}}"
+        <* else *>
+        background = "{{colors.surface_container.default.hex}}"
+        <* endif *>
 
-      [urgency_critical]
-      background = "{{colors.error_container.default.hex}}"
-      foreground = "{{colors.on_error_container.default.hex}}"
-      frame_color = "{{colors.error.default.hex}}"
-      highlight = "{{colors.error.default.hex}}"
-    '';
+        [urgency_critical]
+        background = "{{colors.error_container.default.hex}}"
+        foreground = "{{colors.on_error_container.default.hex}}"
+        frame_color = "{{colors.error.default.hex}}"
+        highlight = "{{colors.error.default.hex}}"
+      '';
+    };
   };
 }
diff --git a/common/modules/matugen/templates/matugen-gtk.nix b/common/modules/matugen/templates/matugen-gtk.nix
index 3bf2c1b..7351398 100644
--- a/common/modules/matugen/templates/matugen-gtk.nix
+++ b/common/modules/matugen/templates/matugen-gtk.nix
@@ -1,54 +1,63 @@
 {
-  xdg.configFile."matugen/templates/gtk.css" = {
-    text = ''
-      /*
-       * GTK Colors
-       * Generated with Matugen
-       */
+  config,
+  lib,
+  ...
+}:
+{
+  config =
+    lib.mkIf (config.gtk.theme.name == "adw-gtk3" && config.beeMods.windowManagers.beeConfig.enable)
+      {
+        xdg.configFile."matugen/templates/gtk.css" = {
+          text = ''
+            /*
+             * GTK Colors
+             * Generated with Matugen
+             */
 
-      /* via thairanaru on GitHub: */
+            /* via thairanaru on GitHub: */
 
-      /* Destructive colors are basically error colors */
-      @define-color destructive_bg_color {{colors.error.default.hex}};
-      @define-color destructive_fg_color {{colors.on_error.default.hex}};
-      /* Follow material spec */
-      @define-color error_bg_color {{colors.error.default.hex}};
-      @define-color error_fg_color {{colors.on_error.default.hex}};
-      /* Follow material spec (also I think looks nicer) */
-      @define-color accent_fg_color {{colors.on_primary.default.hex}};
-      @define-color accent_bg_color {{colors.primary.default.hex}};
-      /* Use surface instead of background */
-      @define-color window_bg_color {{colors.surface.default.hex}};
-      @define-color window_fg_color {{colors.on_surface.default.hex}};
-      /* Make it more similar to Adwaita */
-      @define-color view_bg_color {{colors.surface.default.hex}};
-      @define-color view_fg_color {{colors.on_surface.default.hex}};
-      @define-color headerbar_bg_color {{colors.surface.default.hex}};
-      @define-color headerbar_fg_color {{colors.on_surface.default.hex}};
-      @define-color sidebar_bg_color {{colors.surface_container.default.hex}};
-      @define-color sidebar_fg_color {{colors.on_surface.default.hex}};
-      /* There is only like one application I know that uses this, and there isn't a good way to get
-      a color between surface and surface container so I think just giving this surface is a good enough fallback*/
-      @define-color secondary_sidebar_bg_color {{colors.surface.default.hex}};
-      @define-color secondary_sidebar_fg_color {{colors.on_surface.default.hex}};
-      @define-color card_bg_color {{colors.surface_container.default.hex}};
-      @define-color card_fg_color {{colors.on_surface.default.hex}};
-      @define-color overview_bg_color {{colors.surface_container.default.hex}};
-      @define-color overview_fg_color {{colors.on_surface.default.hex}};
-      @define-color popover_bg_color {{colors.surface_container.default.hex}};
-      @define-color popover_fg_color {{colors.on_surface.default.hex}};
-      @define-color dialog_bg_color {{colors.surface.default.hex}};
-      @define-color dialog_fg_color {{colors.on_surface.default.hex}};
+            /* Destructive colors are basically error colors */
+            @define-color destructive_bg_color {{colors.error.default.hex}};
+            @define-color destructive_fg_color {{colors.on_error.default.hex}};
+            /* Follow material spec */
+            @define-color error_bg_color {{colors.error.default.hex}};
+            @define-color error_fg_color {{colors.on_error.default.hex}};
+            /* Follow material spec (also I think looks nicer) */
+            @define-color accent_fg_color {{colors.on_primary.default.hex}};
+            @define-color accent_bg_color {{colors.primary.default.hex}};
+            /* Use surface instead of background */
+            @define-color window_bg_color {{colors.surface.default.hex}};
+            @define-color window_fg_color {{colors.on_surface.default.hex}};
+            /* Make it more similar to Adwaita */
+            @define-color view_bg_color {{colors.surface.default.hex}};
+            @define-color view_fg_color {{colors.on_surface.default.hex}};
+            @define-color headerbar_bg_color {{colors.surface.default.hex}};
+            @define-color headerbar_fg_color {{colors.on_surface.default.hex}};
+            @define-color sidebar_bg_color {{colors.surface_container.default.hex}};
+            @define-color sidebar_fg_color {{colors.on_surface.default.hex}};
+            /* There is only like one application I know that uses this, and there isn't a good way to get
+            a color between surface and surface container so I think just giving this surface is a good enough fallback*/
+            @define-color secondary_sidebar_bg_color {{colors.surface.default.hex}};
+            @define-color secondary_sidebar_fg_color {{colors.on_surface.default.hex}};
+            @define-color card_bg_color {{colors.surface_container.default.hex}};
+            @define-color card_fg_color {{colors.on_surface.default.hex}};
+            @define-color overview_bg_color {{colors.surface_container.default.hex}};
+            @define-color overview_fg_color {{colors.on_surface.default.hex}};
+            @define-color popover_bg_color {{colors.surface_container.default.hex}};
+            @define-color popover_fg_color {{colors.on_surface.default.hex}};
+            @define-color dialog_bg_color {{colors.surface.default.hex}};
+            @define-color dialog_fg_color {{colors.on_surface.default.hex}};
 
-      /* Backdrop/unfocused states - prevents white flash on window unfocus */
-      @define-color headerbar_backdrop_color @window_bg_color;
-      @define-color sidebar_backdrop_color @sidebar_bg_color;
-      @define-color theme_unfocused_fg_color @window_fg_color;
-      @define-color theme_unfocused_text_color @view_fg_color;
-      @define-color theme_unfocused_bg_color @window_bg_color;
-      @define-color theme_unfocused_base_color @window_bg_color;
-      @define-color theme_unfocused_selected_bg_color @accent_bg_color;
-      @define-color theme_unfocused_selected_fg_color @accent_fg_color;
-    '';
-  };
+            /* Backdrop/unfocused states - prevents white flash on window unfocus */
+            @define-color headerbar_backdrop_color @window_bg_color;
+            @define-color sidebar_backdrop_color @sidebar_bg_color;
+            @define-color theme_unfocused_fg_color @window_fg_color;
+            @define-color theme_unfocused_text_color @view_fg_color;
+            @define-color theme_unfocused_bg_color @window_bg_color;
+            @define-color theme_unfocused_base_color @window_bg_color;
+            @define-color theme_unfocused_selected_bg_color @accent_bg_color;
+            @define-color theme_unfocused_selected_fg_color @accent_fg_color;
+          '';
+        };
+      };
 }
diff --git a/common/modules/matugen/templates/matugen-mango.nix b/common/modules/matugen/templates/matugen-mango.nix
index 7645ba9..440c4a9 100644
--- a/common/modules/matugen/templates/matugen-mango.nix
+++ b/common/modules/matugen/templates/matugen-mango.nix
@@ -4,20 +4,23 @@
   ...
 }:
 {
-  config = lib.mkIf config.beeMods.windowManagers.mango.enable {
-    xdg.configFile = {
-      "matugen/templates/mango.conf" = {
-        text = ''
-          rootcolor={{colors.background.default.hex_stripped}}ff
-          bordercolor={{colors.outline_variant.default.hex_stripped}}ff
-          focuscolor={{colors.primary.default.hex_stripped}}ff
-          maximizescreencolor={{colors.secondary_container.default.hex_stripped}}ff
-          urgentcolor={{colors.error.default.hex_stripped}}ff
-          scratchpadcolor={{colors.tertiary.default.hex_stripped}}ff
-          globalcolor={{colors.secondary_container.default.hex_stripped}}ff
-          overlaycolor={{colors.tertiary_container.default.hex_stripped}}ff
-        '';
+  config =
+    lib.mkIf
+      (config.beeMods.windowManagers.mango.enable && config.beeMods.windowManagers.beeConfig.enable)
+      {
+        xdg.configFile = {
+          "matugen/templates/mango.conf" = {
+            text = ''
+              rootcolor={{colors.background.default.hex_stripped}}ff
+              bordercolor={{colors.outline_variant.default.hex_stripped}}ff
+              focuscolor={{colors.primary.default.hex_stripped}}ff
+              maximizescreencolor={{colors.secondary_container.default.hex_stripped}}ff
+              urgentcolor={{colors.error.default.hex_stripped}}ff
+              scratchpadcolor={{colors.tertiary.default.hex_stripped}}ff
+              globalcolor={{colors.secondary_container.default.hex_stripped}}ff
+              overlaycolor={{colors.tertiary_container.default.hex_stripped}}ff
+            '';
+          };
+        };
       };
-    };
-  };
 }
diff --git a/common/modules/matugen/templates/matugen-nvim.nix b/common/modules/matugen/templates/matugen-nvim.nix
index 8e6f5f5..276d695 100644
--- a/common/modules/matugen/templates/matugen-nvim.nix
+++ b/common/modules/matugen/templates/matugen-nvim.nix
@@ -4,19 +4,23 @@
   ...
 }:
 {
-  xdg.configFile = {
-    "matugen/templates/neovim.json" = {
-      text = ''
-        {
-            "mode": "{{mode}}",
-            "source_color":"{{colors.primary.default.hex}}",
-            <* if {{ is_dark_mode }} *>
-            "background":"{{colors.surface.default.hex}}"
-            <* else *>
-            "background":"{{colors.surface_container_low.default.hex}}"
-            <* endif *>
-        }
-      '';
-    };
-  };
+  config =
+    lib.mkIf (config.wrappers.neovim.enable && config.beeMods.windowManagers.beeConfig.enable)
+      {
+        xdg.configFile = {
+          "matugen/templates/neovim.json" = {
+            text = ''
+              {
+                  "mode": "{{mode}}",
+                  "source_color":"{{colors.primary.default.hex}}",
+                  <* if {{ is_dark_mode }} *>
+                  "background":"{{colors.surface.default.hex}}"
+                  <* else *>
+                  "background":"{{colors.surface_container_low.default.hex}}"
+                  <* endif *>
+              }
+            '';
+          };
+        };
+      };
 }
diff --git a/common/modules/matugen/templates/matugen-sequences.nix b/common/modules/matugen/templates/matugen-sequences.nix
index 817edb9..13e25f1 100644
--- a/common/modules/matugen/templates/matugen-sequences.nix
+++ b/common/modules/matugen/templates/matugen-sequences.nix
@@ -4,7 +4,7 @@
   ...
 }:
 {
-  config = lib.mkIf config.beeMods.matugen.enable {
+  config = lib.mkIf (config.beeMods.terminal.foot && config.beeMods.windowManagers.beeConfig.enable) {
     xdg.configFile."matugen/templates/sequences" = {
       text = ''
         #!/bin/sh
diff --git a/common/modules/matugen/templates/matugen-terminal.nix b/common/modules/matugen/templates/matugen-terminal.nix
index 4d7106e..1f09579 100644
--- a/common/modules/matugen/templates/matugen-terminal.nix
+++ b/common/modules/matugen/templates/matugen-terminal.nix
@@ -4,116 +4,118 @@
   ...
 }:
 {
-  config = lib.mkMerge [
-    (lib.mkIf config.beeMods.terminal.foot {
-      xdg.configFile."matugen/templates/foot-colors.ini" = {
-        text = ''
-          [colors-dark]
-          foreground={{colors.on_surface.default.hex_stripped}}
-          <* if {{ is_dark_mode }} *>
-          background={{colors.surface.default.hex_stripped}}
-          <* else *>
-          background={{colors.surface_container_low.default.hex_stripped}}
-          <* endif *>
-          selection-foreground={{colors.on_primary_container.default.hex_stripped}}
-          selection-background={{colors.primary_container.default.hex_stripped}}
-          cursor = {{colors.on_primary.default.hex_stripped}} {{colors.primary.default.hex_stripped}}
+  config = lib.mkIf config.beeMods.windowManagers.beeConfig.enable (
+    lib.mkMerge [
+      (lib.mkIf config.beeMods.terminal.foot {
+        xdg.configFile."matugen/templates/foot-colors.ini" = {
+          text = ''
+            [colors-dark]
+            foreground={{colors.on_surface.default.hex_stripped}}
+            <* if {{ is_dark_mode }} *>
+            background={{colors.surface.default.hex_stripped}}
+            <* else *>
+            background={{colors.surface_container_low.default.hex_stripped}}
+            <* endif *>
+            selection-foreground={{colors.on_primary_container.default.hex_stripped}}
+            selection-background={{colors.primary_container.default.hex_stripped}}
+            cursor = {{colors.on_primary.default.hex_stripped}} {{colors.primary.default.hex_stripped}}
 
-          regular0={{colors.surface_container_high.default.hex_stripped}}
-          regular1={{colors.error.default.hex_stripped}}
-          regular2={{colors.primary.default.hex_stripped}}
-          regular3={{colors.tertiary.default.hex_stripped}}
-          regular4={{colors.secondary.default.hex_stripped}}
-          regular5={{colors.primary_fixed.default.hex_stripped}}
-          regular6={{colors.secondary_fixed.default.hex_stripped}}
-          regular7={{colors.on_surface_variant.default.hex_stripped}}
+            regular0={{colors.surface_container_high.default.hex_stripped}}
+            regular1={{colors.error.default.hex_stripped}}
+            regular2={{colors.primary.default.hex_stripped}}
+            regular3={{colors.tertiary.default.hex_stripped}}
+            regular4={{colors.secondary.default.hex_stripped}}
+            regular5={{colors.primary_fixed.default.hex_stripped}}
+            regular6={{colors.secondary_fixed.default.hex_stripped}}
+            regular7={{colors.on_surface_variant.default.hex_stripped}}
 
-          bright0={{colors.outline.default.hex_stripped}}
-          bright1={{colors.error.default.hex_stripped | to_color | lighten: 10.0}}
-          bright2={{colors.primary_container.default.hex_stripped}}
-          bright3={{colors.tertiary_container.default.hex_stripped}}
-          bright4={{colors.secondary_container.default.hex_stripped}}
-          bright5={{colors.inverse_primary.default.hex_stripped}}
-          bright6={{colors.outline_variant.default.hex_stripped}}
-          bright7={{colors.on_surface.default.hex_stripped}}
+            bright0={{colors.outline.default.hex_stripped}}
+            bright1={{colors.error.default.hex_stripped | to_color | lighten: 10.0}}
+            bright2={{colors.primary_container.default.hex_stripped}}
+            bright3={{colors.tertiary_container.default.hex_stripped}}
+            bright4={{colors.secondary_container.default.hex_stripped}}
+            bright5={{colors.inverse_primary.default.hex_stripped}}
+            bright6={{colors.outline_variant.default.hex_stripped}}
+            bright7={{colors.on_surface.default.hex_stripped}}
 
-          # dim-blend-towards=<* if {{ is_dark_mode }} *>black<* else *>white<* endif *>
-        '';
-      };
-    })
-    (lib.mkIf config.beeMods.terminal.alacritty {
-      xdg.configFile."matugen/templates/alacritty-colors.toml" = {
-        text = ''
-          [colors.primary]
-          <* if {{ is_dark_mode }} *>
-          background = '{{colors.background.default.hex}}'
-          <* else *>
-          background = '{{colors.surface_container_low.default.hex}}'
-          <* endif *>
-          foreground = '{{colors.on_surface.default.hex}}'
+            # dim-blend-towards=<* if {{ is_dark_mode }} *>black<* else *>white<* endif *>
+          '';
+        };
+      })
+      (lib.mkIf config.beeMods.terminal.alacritty {
+        xdg.configFile."matugen/templates/alacritty-colors.toml" = {
+          text = ''
+            [colors.primary]
+            <* if {{ is_dark_mode }} *>
+            background = '{{colors.background.default.hex}}'
+            <* else *>
+            background = '{{colors.surface_container_low.default.hex}}'
+            <* endif *>
+            foreground = '{{colors.on_surface.default.hex}}'
 
-          [colors.selection]
-          text = '{{colors.on_surface.default.hex}}'
-          background = '{{colors.primary_container.default.hex}}'
+            [colors.selection]
+            text = '{{colors.on_surface.default.hex}}'
+            background = '{{colors.primary_container.default.hex}}'
 
-          [colors.cursor]
-          text = '{{colors.background.default.hex}}'
-          cursor = '{{colors.primary.default.hex}}'
+            [colors.cursor]
+            text = '{{colors.background.default.hex}}'
+            cursor = '{{colors.primary.default.hex}}'
 
-          [colors.normal]
-          black   = '{{colors.surface_container_high.default.hex}}'
-          red     = '{{colors.error.default.hex}}'
-          green   = '{{colors.primary.default.hex}}'
-          yellow  = '{{colors.tertiary.default.hex}}'
-          blue    = '{{colors.secondary.default.hex}}'
-          magenta = '{{colors.primary_fixed.default.hex}}'
-          cyan    = '{{colors.secondary_fixed.default.hex}}'
-          white   = '{{colors.on_surface_variant.default.hex}}'
+            [colors.normal]
+            black   = '{{colors.surface_container_high.default.hex}}'
+            red     = '{{colors.error.default.hex}}'
+            green   = '{{colors.primary.default.hex}}'
+            yellow  = '{{colors.tertiary.default.hex}}'
+            blue    = '{{colors.secondary.default.hex}}'
+            magenta = '{{colors.primary_fixed.default.hex}}'
+            cyan    = '{{colors.secondary_fixed.default.hex}}'
+            white   = '{{colors.on_surface_variant.default.hex}}'
 
-          [colors.bright]
-          black   = '{{colors.outline.default.hex}}'
-          red     = '{{colors.error_container.default.hex | to_color | lighten: 10.0}}'
-          green   = '{{colors.primary_container.default.hex}}'
-          yellow  = '{{colors.tertiary_container.default.hex}}'
-          blue    = '{{colors.secondary_container.default.hex}}'
-          magenta = '{{colors.inverse_primary.default.hex}}'
-          cyan    = '{{colors.outline_variant.default.hex}}'
-          white   = '{{colors.on_surface.default.hex}}'
+            [colors.bright]
+            black   = '{{colors.outline.default.hex}}'
+            red     = '{{colors.error_container.default.hex | to_color | lighten: 10.0}}'
+            green   = '{{colors.primary_container.default.hex}}'
+            yellow  = '{{colors.tertiary_container.default.hex}}'
+            blue    = '{{colors.secondary_container.default.hex}}'
+            magenta = '{{colors.inverse_primary.default.hex}}'
+            cyan    = '{{colors.outline_variant.default.hex}}'
+            white   = '{{colors.on_surface.default.hex}}'
 
-        '';
-      };
-    })
-    (lib.mkIf config.beeMods.terminal.ghostty {
-      xdg.configFile."matugen/templates/ghostty-colors.conf" = {
-        text = ''
-          <* if {{ is_dark_mode }} *>
-          background = {{colors.background.default.hex}}
-          <* else *>
-          background = {{colors.surface_container_low.default.hex}}
-          <* endif *>
-          foreground = {{colors.on_surface.default.hex}}
-          cursor-color = {{colors.primary.default.hex}}
-          selection-background = {{colors.primary_container.default.hex}}
-          selection-foreground = {{colors.on_surface.default.hex}}
+          '';
+        };
+      })
+      (lib.mkIf config.beeMods.terminal.ghostty {
+        xdg.configFile."matugen/templates/ghostty-colors.conf" = {
+          text = ''
+            <* if {{ is_dark_mode }} *>
+            background = {{colors.background.default.hex}}
+            <* else *>
+            background = {{colors.surface_container_low.default.hex}}
+            <* endif *>
+            foreground = {{colors.on_surface.default.hex}}
+            cursor-color = {{colors.primary.default.hex}}
+            selection-background = {{colors.primary_container.default.hex}}
+            selection-foreground = {{colors.on_surface.default.hex}}
 
-          palette = 0={{colors.surface_container_high.default.hex}}
-          palette = 1={{colors.error.default.hex}}
-          palette = 2={{colors.primary.default.hex}}
-          palette = 3={{colors.tertiary.default.hex}}
-          palette = 4={{colors.secondary.default.hex}}
-          palette = 5={{colors.primary_fixed.default.hex}}
-          palette = 6={{colors.secondary_fixed.default.hex}}
-          palette = 7={{colors.on_surface_variant.default.hex}}
-          palette = 8={{colors.outline.default.hex}}
-          palette = 9={{colors.error_container.default.hex | to_color | lighten: 10.0}}
-          palette = 10={{colors.primary_container.default.hex}}
-          palette = 11={{colors.tertiary_container.default.hex}}
-          palette = 12={{colors.secondary_container.default.hex}}
-          palette = 13={{colors.inverse_primary.default.hex}}
-          palette = 14={{colors.outline_variant.default.hex}}
-          palette = 15={{colors.on_surface.default.hex}}
-        '';
-      };
-    })
-  ];
+            palette = 0={{colors.surface_container_high.default.hex}}
+            palette = 1={{colors.error.default.hex}}
+            palette = 2={{colors.primary.default.hex}}
+            palette = 3={{colors.tertiary.default.hex}}
+            palette = 4={{colors.secondary.default.hex}}
+            palette = 5={{colors.primary_fixed.default.hex}}
+            palette = 6={{colors.secondary_fixed.default.hex}}
+            palette = 7={{colors.on_surface_variant.default.hex}}
+            palette = 8={{colors.outline.default.hex}}
+            palette = 9={{colors.error_container.default.hex | to_color | lighten: 10.0}}
+            palette = 10={{colors.primary_container.default.hex}}
+            palette = 11={{colors.tertiary_container.default.hex}}
+            palette = 12={{colors.secondary_container.default.hex}}
+            palette = 13={{colors.inverse_primary.default.hex}}
+            palette = 14={{colors.outline_variant.default.hex}}
+            palette = 15={{colors.on_surface.default.hex}}
+          '';
+        };
+      })
+    ]
+  );
 }
diff --git a/common/modules/matugen/templates/matugen-yazi.nix b/common/modules/matugen/templates/matugen-yazi.nix
index ce84729..0df2339 100644
--- a/common/modules/matugen/templates/matugen-yazi.nix
+++ b/common/modules/matugen/templates/matugen-yazi.nix
@@ -4,7 +4,7 @@
   ...
 }:
 {
-  config = lib.mkIf config.programs.yazi.enable {
+  config = lib.mkIf (config.programs.yazi.enable && config.beeMods.windowManagers.beeConfig.enable) {
     xdg.configFile = {
       "matugen/templates/yazi.toml" = {
         text = ''