Merge branch 'waybar-rice'

home/hyprland/waybar/default.nix

@@ -35,7 +35,7 @@ in
         repo = "waybar";
         rev = "f74ab1eecf2dcaf22569b396eed53b2b2fbe8aff";
         sha256 = "WLJMA2X20E5PCPg0ZPtSop0bfmu+pLImP9t8A8V4QK8=";
-      } + "/themes/machiatto.css";
+      } + "/themes/macchiato.css";
   };
 
   programs.waybar = {
@@ -45,18 +45,39 @@ in
       target = "graphical-session.target";
     };
     style = ''
+      @import "macchiato.css";
       * {
-        font-family: "FiraCodeNerdFont-Regular";
+        border: none;
-        font-size: 14px;
+        border-radius: 10px;
-        font-weight: bold;
+        min-height: 10px;
-        border-radius: 0px;
+        font-family: "JetbrainsMono Nerd Font";
+        font-size: 15px;
         transition-property: background-color;
         transition-duration: 0.5s;
+        color: @text;
       }
+
+      window#waybar {
+        background: transparent;
+      }
+
+      window#waybar.hidden {
+        opacity: 0.2;
+      }
+
+      #window {
+        margin-top: 6px;
+        padding-left: 10px;
+        padding-right: 10px;
+        border-radius: 10px;
+        transition: none;
+        color: transparent;
+        background: transparent;
+      }
+
       @keyframes blink_red {
         to {
-          background-color: rgb(242, 143, 173);
+          background-color: @red;
-          color: rgb(26, 24, 38);
         }
       }
       .warning,
@@ -68,49 +89,38 @@ in
         animation-iteration-count: infinite;
         animation-direction: alternate;
       }
-      window#waybar {
-        background-color: transparent;
-      }
-      window > box {
-        margin-left: 0px;
-        margin-right: 0px;
-        margin-top: 0px;
-        border-bottom: 2px solid @color1;
-        background-color: @background;
-      }
       #workspaces {
-        padding-left: 0px;
+        padding-left: 12px;
-        padding-right: 4px;
+        padding-right: 12px;
+        background-color: @base;
       }
       #workspaces button {
-        padding-top: 5px;
+        padding-left: 12px;
-        padding-bottom: 5px;
+        padding-right: 12px;
-        padding-left: 6px;
-        padding-right: 6px;
-        color: @color1;
       }
       #workspaces button.active {
-        background-color: @color1;
+        background-color: @surface1;
-        color: rgb(26, 24, 38);
       }
       #workspaces button.urgent {
-        color: rgb(26, 24, 38);
+        color: alpha(@red, 0.4);
       }
       #workspaces button:hover {
-        background-color: #b38dac;
+        background-color: @surface2;
-        color: rgb(26, 24, 38);
       }
       tooltip {
-        background: #3b4253;
+        background-color: @base;
       }
       tooltip label {
-        color: #e4e8ef;
+        color: @text;
       }
       #custom-launcher {
-        font-size: 20px;
+        font-size: 15px;
-        padding-left: 8px;
+        padding-left: 5px;
-        padding-right: 6px;
+        padding-right: 12px;
-        color: #7ebae4;
+        background-color: @base;
+      }
+      .modules-right {
+        background-color: @base;
       }
       #mode,
       #clock,
@@ -126,54 +136,25 @@ in
       #battery,
       #custom-powermenu,
       #custom-flakestat,
-      #custom-arrhist,
+      #custom-arrhist {
-      #custom-cava-internal {
+        padding-left: 12px;
-        padding-left: 10px;
+        padding-right: 12px;
-        padding-right: 10px;
-        color: @color1;
-      }
-      #network.disconnected {
-        color: #cccccc;
       }
       #battery.charging,
       #battery.full,
       #battery.discharging {
-        color: #cf876f;
+        color: @maroon;
       }
       #battery.critical:not(.charging) {
-        color: #d6dce7;
+        color: @red;
-      }
-      #custom-powermenu {
-        color: #bd6069;
-      }
-      #tray {
-        padding-right: 8px;
-        padding-left: 10px;
-      }
-      #tray menu {
-        background: #3b4252;
-        color: #dee2ea;
-      }
-      #mpd.paused {
-        color: rgb(192, 202, 245);
-        font-style: italic;
-      }
-      #mpd.stopped {
-        background: transparent;
-      }
-      #mpd {
-        color: #e4e8ef;
-      }
-      #custom-cava-internal {
-        font-family: "Hack Nerd Font";
       }
     '';
     settings = [
       ({
         "layer" = "top";
         "position" = "top";
-        modules-left = [ "custom/flakestat" "hyprland/workspaces" ];
+        modules-left = [ "custom/flakestat" ];
-        modules-center = [ "clock" ];
+        modules-center = [ "hyprland/workspaces" ];
         modules-right =
           [
             (lib.mkIf (withArrhist) "custom/arrhist")
@@ -183,6 +164,7 @@ in
             "cpu"
             "tray"
             (lib.mkIf (withBattery) "battery")
+            "clock"
           ];
         "hyprland/workspaces" = {
           "format" = "{name}";