waybar use mocchiato color

Tao-Boy · Dec 18, 2024 · f7dfb92 · f7dfb92
1 parent 4647ba6
commit f7dfb92
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 66 deletions.
diff --git a/waybar/.config/waybar/config.jsonc b/waybar/.config/waybar/config.jsonc
@@ -3,7 +3,7 @@
   "output": [ "*" ],
   "position": "top",
   "mod": "dock",
-  "height": 30,
+  "height": 20,
   "exclusive": true,
   "passthrough": false,
   "gtk-layer-shell": true,
@@ -17,9 +17,9 @@
 	"modules-left": [ "custom/padd",
     "custom/l_end", "hyprland/workspaces", "custom/r_end",
     "custom/padd"],
-	"modules-center": [ "custom/padd", "custom/l_end", "custom/cava", "idle_inhibitor", "clock", "custom/timer", "custom/r_end", "custom/padd"],
+	"modules-center": [ "custom/padd", "custom/l_end", "custom/cava", "idle_inhibitor", "clock", "custom/timer", "custom/r_end", "custom/padd" ],
 	"modules-right": [ "custom/padd",
-    "custom/l_end", "backlight", "pulseaudio", "pulseaudio#microphone", "network", "bluetooth", "custom/r_end",
+    "custom/l_end", "pulseaudio", "pulseaudio#microphone", "network", "backlight", "bluetooth", "custom/r_end",
     "custom/l_end", "tray", "custom/r_end",
     "custom/l_end", "battery", "custom/power", "custom/r_end",
     "custom/padd" ],

diff --git a/waybar/.config/waybar/modules-center.json b/waybar/.config/waybar/modules-center.json
@@ -1,7 +1,7 @@
 {
   "custom/cava": {
     "format": "{}",
-    "exec": "waybar_cava.sh",
+    "exec": "waybar_cava.sh --width 16 --stb 0",
     "restart-interval": 5,
     "hide-empty": true,
     "on-click": "playerctl play-pause"
@@ -19,9 +19,9 @@
 
 
   "clock": {
-    "format": "{:%I:%M %p}",
+    "format": "{:%R 󰃭 %d·%m·%y}",
     "rotate": 0,
-    "format-alt": "{:%R 󰃭 %d·%m·%y}",
+    "format-alt": "{:%I:%M %p}",
     "tooltip-format": "<span>{calendar}</span>",
     "calendar": {
         "mode": "month",

diff --git a/waybar/.config/waybar/modules-right.json b/waybar/.config/waybar/modules-right.json
@@ -54,7 +54,7 @@
         "tooltip": true,
         "format-wifi": " ",
         "rotate": 0,
-        "format-ethernet": "󰈀 ",
+        "format-ethernet": "󰀂 {ifname}",
         "tooltip-format": "Network: <big><b>{essid}</b></big>\nSignal strength: <b>{signaldBm}dBm ({signalStrength}%)</b>\nFrequency: <b>{frequency}MHz</b>\nInterface: <b>{ifname}</b>\nIP: <b>{ipaddr}/{cidr}</b>\nGateway: <b>{gwaddr}</b>\nNetmask: <b>{netmask}</b>",
         "format-linked": "󰈀 {ifname} (No IP)",
         "format-disconnected": "󰖪 ",
@@ -64,12 +64,9 @@
     },
 
     "bluetooth": {
-        "format": "",
-        "format-disabled": "",
+        "format": " {status}",
         "format-connected": " {num_connections}",
-        //"format-connected-battery": "{icon} {num_connections}",
-        //"format-connected-battery": "{icon} {device_alias}-{device_battery_percentage}%",
-        //"format-icons": ["󰥇", "󰤾", "󰤿", "󰥀", "󰥁", "󰥂", "󰥃", "󰥄", "󰥅", "󰥆", "󰥈"],
+        "format-connected-battery": " {device_alias}-{device_battery_percentage}%",
         //// "format-device-preference": [ "device1", "device2" ], // preference list deciding the displayed device If this config option is not defined or none of the devices in the list are connected, it will fall back to showing the last connected device.
         "tooltip-format": "{controller_alias}\n{num_connections} connected",
         "tooltip-format-connected": "{controller_alias}\n{num_connections} connected\n\n{device_enumerate}",

diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css
@@ -1,16 +1,17 @@
 * {
-    border: none;
-    border-radius: 0px;
+    border: none; border-radius: 0px;
     font-family: "JetBrainsMono Nerd Font";
     font-weight: bold;
     font-size: 16px;
     min-height: 10px;
 }
 
+@import "mocchiato.css";
 @import "theme.css";
 
-window#waybar {
-    background: shade(@base, 0.9);
+#waybar {
+    /*background: shade(@base, 0.9);*/
+    background: transparent;
 }
 
 tooltip {
@@ -21,8 +22,6 @@ tooltip {
 }
 
 #workspaces button {
-    box-shadow: none;
-    text-shadow: none;
     padding: 0px;
     border-radius: 12px;
     margin-top: 4px;
@@ -36,19 +35,21 @@ tooltip {
 }
 
 #workspaces button.active {
-    background: @wb-act-bg;
-    color: @sky;
-    margin-left: 4px;
-    padding-left: 12px;
-    padding-right: 12px;
-    margin-right: 4px;
+    /*background: @pink;*/
+    background: transparent;
+    color: @pink;
+    /*margin-left: 4px;*/
+    /*padding-left: 12px;*/
+    /*padding-right: 12px;*/
+    /*margin-right: 4px;*/
     animation: ws_active 20s ease-in-out 1;
     transition: all 0.4s cubic-bezier(.55,-0.68,.48,1.682);
 }
 
 #workspaces button:hover {
-    background: @wb-hvr-bg;
-    color: @sapphire;
+    /*background: @wb-hvr-bg;*/
+    background: transparent;
+    color: @teal;
     animation: ws_hover 20s ease-in-out 1;
     transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
 }
@@ -94,86 +95,76 @@ tooltip {
     min-height: 10px
 }
 
+
+#custom-color,
 #custom-timer,
+#custom-cava,
 #backlight,
 #battery,
 #bluetooth,
-#custom-cava,
 #custom-cliphist,
 #clock,
-#custom-cpuinfo,
-#cpu,
-#custom-gpuinfo,
 #idle_inhibitor,
 #custom-keybindhint,
 #language,
-#memory,
-#mpris,
 #network,
+#pulseaudio,
 #custom-notifications,
 #custom-power,
-#privacy,
-#pulseaudio,
-#custom-spotify,
 #taskbar,
 #custom-theme,
 #tray,
-#custom-updates,
-#custom-wallchange,
-#custom-wbar,
 #window,
 #workspaces,
 #custom-l_end,
-#custom-r_end,
-#custom-sl_end,
-#custom-sr_end,
-#custom-rl_end,
-#custom-rr_end {
+#custom-r_end {
     color: @main-fg;
-    background: @main-bg;
+    background: @surface0;
     opacity: 1;
     margin: 5px 0px 5px 0px;
     padding-left: 6px;
     padding-right: 6px;
 }
-
 #workspaces,
 #taskbar {
     padding: 0px;
 }
-
 #custom-r_end {
     border-radius: 0px 28px 28px 0px;
     margin-right: 12px;
     padding-right: 4px;
 }
-
 #custom-l_end {
     border-radius: 28px 0px 0px 28px;
     margin-left: 12px;
     padding-left: 4px;
 }
 
-#custom-sr_end {
-    border-radius: 0px;
-    margin-right: 12px;
-    padding-right: 4px;
+#custom-cava,
+#idle_inhibitor,
+#clock,
+#custom-timer {
+    color: @lavender;
 }
-
-#custom-sl_end {
-    border-radius: 0px;
-    margin-left: 12px;
-    padding-left: 4px;
+#custom-color {
+    color: @pink;
 }
-
-#custom-rr_end {
-    border-radius: 0px 10px 10px 0px;
-    margin-right: 12px;
-    padding-right: 4px;
+#pulseaudio {
+  color: @maroon;
+  padding-left: 0px;
 }
-
-#custom-rl_end {
-    border-radius: 10px 0px 0px 10px;
-    margin-left: 12px;
-    padding-left: 4px;
+#network {
+  color: @peach;
+}
+#backlight {
+  color: @yellow;
+}
+#bluetooth {
+  color: @rosewater;
+}
+#battery {
+  color: @pink;
+}
+#custom-power {
+  color: @mauve;
 }