Waybar: Use colors from color HM module

home/modules/hyprland/default.nix

@@ -35,10 +35,11 @@
   mkBinds = key: actions: builtins.map (mkBind key) actions;
 
   # These functions are used to generate the keybindings.info file for Rofi
-  mkBindHelpKey = key: ''${builtins.replaceStrings ["$mainMod " ", "] ["${cfg.keybindings.main-mod}-" "-"] key}'';
+  fixupNoMod = key: ''${builtins.replaceStrings ["<-"] ["<"] key}'';
+  mkBindHelpKey = key: ''${builtins.replaceStrings ["$mainMod" " " ","] ["${cfg.keybindings.main-mod}" "-" ""] key}'';
   mkBindHelpAction = action: ''${builtins.replaceStrings [","] [""] action}'';
   mkBindHelp = key: action: "<${mkBindHelpKey key}>: ${mkBindHelpAction action}";
-  mkBindsHelp = key: actions: builtins.map (mkBindHelp key) actions;
+  mkBindsHelp = key: actions: builtins.map fixupNoMod (builtins.map (mkBindHelp key) actions);
 
   mkWallpaper = monitor: "${monitor}, ${config.home.homeDirectory}/NixFlake/wallpapers/${cfg.theme}.png";
 
@@ -48,6 +49,7 @@
 
   always-bind = {
     # Hyprland control
+    "$mainMod, A" = ["exec, rofi -drun-show-actions -show drun"];
     "$mainMod, Q" = ["killactive"];
     "$mainMod, V" = ["togglefloating"];
     "$mainMod, F" = ["fullscreen"];

home/modules/rofi/default.nix

@@ -28,7 +28,6 @@ in {
         };
     in {
       bindings = {
-        "$mainMod, A" = ["exec, rofi -drun-show-actions -show drun"];
         "$mainMod, escape" = ["exec, \"${power-menu}\""];
       };
     };

home/modules/waybar/colors/Foggy-Lake.css

@@ -1,37 +0,0 @@
-/*
-*
-* Catppuccin Latte palette
-* Maintainer: rubyowo
-*
-*/
-
-@define-color base   #eff1f5;
-@define-color mantle #e6e9ef;
-@define-color crust  #dce0e8;
-
-@define-color text     #4c4f69;
-@define-color subtext0 #6c6f85;
-@define-color subtext1 #5c5f77;
-
-@define-color surface0 #ccd0da;
-@define-color surface1 #bcc0cc;
-@define-color surface2 #acb0be;
-
-@define-color overlay0 #9ca0b0;
-@define-color overlay1 #8c8fa1;
-@define-color overlay2 #7c7f93;
-
-@define-color blue      #1e66f5;
-@define-color lavender  #7287fd;
-@define-color sapphire  #209fb5;
-@define-color sky       #04a5e5;
-@define-color teal      #179299;
-@define-color green     #40a02b;
-@define-color yellow    #df8e1d;
-@define-color peach     #fe640b;
-@define-color maroon    #e64553;
-@define-color red       #d20f39;
-@define-color mauve     #8839ef;
-@define-color pink      #ea76cb;
-@define-color flamingo  #dd7878;
-@define-color rosewater #dc8a78;

home/modules/waybar/colors/Three-Bears.css

@@ -1,14 +0,0 @@
-@define-color dark #2A231C;
-@define-color light #EBEBE5;
-@define-color accent-dark #463A2E;
-@define-color accent-light #865E43;
-
-@define-color pastel-a #797D62;
-@define-color pastel-b #9B9B7A;
-@define-color pastel-c #D9AE94;
-@define-color pastel-d #E5C59E;
-@define-color pastel-e #F1DCA7;
-@define-color pastel-f #F8D488;
-@define-color pastel-g #E4B074;
-@define-color pastel-h #D08C60;
-@define-color pastel-i #997B66;

home/modules/waybar/default.nix

@@ -8,6 +8,7 @@
 with lib;
 with mylib.modules; let
   cfg = config.modules.waybar;
+  color = config.modules.color;
   hyprcfg = config.modules.hyprland;
 in {
   options.modules.waybar = import ./options.nix {inherit lib mylib;};
@@ -32,7 +33,8 @@ in {
           "custom/launcher" = {
             format = "<span font='FontAwesome'></span> ";
             interval = "once";
-            tooltip = false;
+            on-click = "rofi -drun-show-actions -show drun";
+            tooltip-format = "<tt>Tux Alhamdulillah<tt>";
           };
 
           "hyprland/workspaces" = {
@@ -84,15 +86,15 @@ in {
         };
       };
 
-      style =
+      style = ''
-        (builtins.readFile ./colors/${hyprcfg.theme}.css)
-        + ''
         /*Order is Top-Right-Bottom-Left for combined properties*/
         window#waybar {
-            font-family: JetBrainsMono Nerd Font Mono;
+          font-family: ${color.font};
           font-weight: bold;
-            color: @base;
+          color: #${color.light.base};
-            background-color: rgba(239, 241, 245, 0.6);
+
+          /*Can't use color.light.base here because waybar doesn't support rrggbbaa*/
+          background-color: rgba(239, 241, 245, 0.5);
         }
 
         /*Square Widgets*/
@@ -102,11 +104,11 @@ in {
           padding: 0px 10px 0px 10px;
           margin: 5px 5px 5px 5px;
           border-radius: 6px;
-            color: @base;
+          color: #${color.light.base};
         }
 
         #workspaces button:hover {
-            color: @pink;
+          color: #${color.light.pink};
         }
 
         /*Tux Icon*/
@@ -131,37 +133,37 @@ in {
 
         /*Colors*/
         #custom-launcher {
-            background-color: @flamingo;
+          background-color: #${color.light.flamingo};
         }
         #user {
-            background-color: @pink;
+          background-color: #${color.light.pink};
         }
         #window {
-            background-color: @mauve;
+          background-color: #${color.light.mauve};
         }
         #workspaces button {
-            background-color: @red;
+          background-color: #${color.light.red};
         }
         #pulseaudio {
-            background-color: @maroon;
+          background-color: #${color.light.maroon};
         }
         #network {
-            background-color: @peach;
+          background-color: #${color.light.peach};
         }
         #cpu {
-            background-color: @yellow;
+          background-color: #${color.light.yellow};
         }
         #memory {
-            background-color: @green;
+          background-color: #${color.light.green};
         }
         #temperature {
-            background-color: @teal;
+          background-color: #${color.light.teal};
         }
         #clock {
-            background-color: @sky;
+          background-color: #${color.light.sky};
         }
         #tray {
-            background-color: @sapphire;
+          background-color: #${color.light.sapphire};
         }
       '';
     };