Dynamically generate diff variants derived from Nix config.

3 files changed, 16 insertions, 13 deletions

diff --git a/common/modules/mango/default.nix b/common/modules/mango/default.nix
index 38d503f..e9f6f24 100644
--- a/common/modules/mango/default.nix
+++ b/common/modules/mango/default.nix
@@ -116,8 +116,8 @@ in
             ${
               if (cfg.window.blur.enable && cfg.window.opacity == 1.0) then
                 ''
-                  focused_opacity=0.91
-                  unfocused_opacity=0.91
+                  focused_opacity=0.90
+                  unfocused_opacity=0.90
                 ''
               else
                 ''
@@ -139,10 +139,10 @@ in
             zoom_end_ratio=0.8
             fadein_begin_opacity=0.5
             fadeout_begin_opacity=0.5
-            animation_duration_move=300
-            animation_duration_open=350
-            animation_duration_tag=350
-            animation_duration_close=150
+            animation_duration_move=250
+            animation_duration_open=250
+            animation_duration_tag=250
+            animation_duration_close=100
             animation_duration_focus=0
             animation_curve_open=0.05,0.7,0.1,1.0
             animation_curve_move=0.46,1.0,0.29,1
diff --git a/common/modules/mango/waybar.nix b/common/modules/mango/waybar.nix
index fddaed4..b4aeb48 100644
--- a/common/modules/mango/waybar.nix
+++ b/common/modules/mango/waybar.nix
@@ -334,7 +334,7 @@ in
 
       #workspaces button:hover,
       #tags button:hover {
-        color: @text_accent;
+        color: @text_main;
       }
 
 
@@ -386,7 +386,7 @@ in
       }
 
       #workspaces button.hidden {
-        color: @text_muted;
+        color: @text_main;
         background-color: transparent;
       }
 
@@ -401,7 +401,7 @@ in
       }
 
       #taskbar button {
-        color: @text_dim;
+        color: @text_main;
         margin: 2px; 
         padding: 0px 3px;
         border-radius: 0px;
diff --git a/common/modules/matugen/templates/matugen-waybar.nix b/common/modules/matugen/templates/matugen-waybar.nix
index add8a09..602a846 100644
--- a/common/modules/matugen/templates/matugen-waybar.nix
+++ b/common/modules/matugen/templates/matugen-waybar.nix
@@ -7,13 +7,16 @@
   config = lib.mkIf config.beeMods.mango.waybar {
     xdg.configFile."matugen/templates/waybar.css" = {
       text = ''
-        @define-color bg_panel alpha({{colors.surface.default.hex}}, 0.9);
+        ${lib.optionalString (config.beeMods.mango.window.blur.enable) ''
+          @define-color bg_panel rgba({{colors.surface.default.red}}, {{colors.surface.default.green}}, {{colors.surface.default.blue}}, 0.9);
+        ''}
+        ${lib.optionalString (
+          !config.beeMods.mango.window.blur.enable
+        ) "@define-color bg_panel  {{colors.surface.default.hex}};          "}
+
         @define-color bg_base transparent;
         @define-color border_color {{colors.primary.default.hex}};
         @define-color text_main {{colors.primary.default.hex}};
-        @define-color text_muted {{colors.primary.default.hex}};
-        @define-color text_dim {{colors.primary.default.hex}};
-        @define-color text_accent {{colors.primary.default.hex}};
         @define-color text_dark {{colors.surface_container_highest.default.hex}};
         @define-color alert_urgent {{colors.error.default.hex}};
         @define-color alert_minimized {{colors.error_container.default.hex}};