Merge branch 'master' of gitea.suda.codes:sudacode/waybar

catppuccin-macchiato/config.jsonc

@@ -5,14 +5,16 @@
   "width": 2550,
   "spacing": 1,
   "reload_style_on_change": true,
+  "fixed-center": true,
   "margin": "10 5 0 5",
   "modules-left": [
     "custom/launcher",
     "hyprland/workspaces",
     "tray",
-    "hyprland/mode",
-    "custom/mpv-scroll",
+    "hyprland/submap",
+    "custom/mpd-scroll",
     "custom/firefox",
+    "cava",
   ],
   "modules-center": ["hyprland/window"],
   "modules-right": [
@@ -22,8 +24,8 @@
     "custom/kernel",
     // "disk#ssd",
     // "temperature",
-    "cpu",
-    "memory",
+    // "cpu",
+    // "memory",
     "bluetooth",
     "network",
     "pulseaudio",
@@ -59,8 +61,10 @@
     "tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%",
     "on-click": "blueman-manager",
   },
-  "hyprland/mode": {
-    "format": "<span style=\"italic\">{}</span>",
+  "hyprland/submap": {
+    "format": "{}",
+    "max-length": 8,
+    "tooltip": false,
   },
   "hyprland/scratchpad": {
     "format": "{icon} {count}",
@@ -237,8 +241,8 @@
     "format": "{} {icon}",
     "return-type": "json",
     "format-icons": {
-      "has-updates": "󱍷",
-      "updated": "",
+      "has-updates": "",
+      "updated": "",
     },
     "exec-if": "which waybar-module-pacman-updates",
     "exec": "waybar-module-pacman-updates --no-zero-output --tooltip-align-columns",
@@ -256,7 +260,7 @@
     "on-click": "playerctl -p firefox play-pause",
     "hide-empty-text": true,
   },
-  "custom/mpv-scroll": {
+  "custom/mpd-scroll": {
     "escape": "true",
     "exec": "$HOME/.config/waybar/scripts/scroll-mpd.sh",
     "format": "{}",
@@ -267,4 +271,26 @@
     "on-scroll-up": "mpc volume +5",
     "hide-empty-text": true,
   },
+  "cava": {
+    // "cava_config": "$HOME/.config/cava/config",
+    "framerate": 144,
+    "autosens": 0,
+    "sensitivity": 100,
+    "bars": 12,
+    "lower_cutoff_freq": 50,
+    "higher_cutoff_freq": 10000,
+    "method": "pipewire",
+    "source": "auto",
+    "stereo": true,
+    "reverse": false,
+    "bar_delimiter": 0,
+    "monstercat": false,
+    "waves": false,
+    "noise_reduction": 0.77,
+    "input_delay": 4,
+    "format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"],
+    "actions": {
+      "on-click-right": "mode",
+    },
+  },
 }

catppuccin-macchiato/style.css

@@ -2,9 +2,7 @@
 
 * {
   border: none;
-  font-family:
-    JetBrainsMono Nerd Font,
-    Font Awesome;
+  font-family: "JetBrainsMono Nerd Font", "Font Awesome", "Noto Sans CJK JP";
   font-size: 13px;
   min-height: 0;
   border-radius: 0.69em;
@@ -20,6 +18,12 @@ window#waybar.hidden {
   opacity: 0.2;
 }
 
+#window {
+  background-color: inherit;
+  padding: 0 10px;
+  margin: 5px 1px;
+}
+
 tooltip {
   background-color: @base;
   border: 1px solid @subtext0;
@@ -85,7 +89,7 @@ button:hover {
   background-image: linear-gradient(0deg, @surface1, @mantle);
 }
 
-#mode {
+#submap {
   background-color: @base;
   box-shadow: inset 0 -2px @text;
 }
@@ -103,7 +107,7 @@ button:hover {
 #custom-kernel,
 #idle_inhibitor,
 #scratchpad,
-#mode,
+#submap,
 #tray {
   padding: 0 10px;
   margin: 5px 1px;
@@ -125,7 +129,7 @@ button:hover {
 }
 
 #custom-kernel {
-  background-color: @rosewater;
+  background-color: @mauve;
   color: @mantle;
 }
 
@@ -167,7 +171,7 @@ label:focus {
 }
 
 #network.disconnected {
-  background-color: red;
+  background-color: @red;
   color: @mantle;
 }
 
@@ -178,7 +182,7 @@ label:focus {
 }
 
 #pulseaudio {
-  background-color: @yellow;
+  background-color: @sapphire;
   color: @mantle;
 }
 
@@ -201,8 +205,8 @@ label:focus {
 
 #tray {
   /* background-color: @overlay0; */
-  background-color: @surface1;
-  color: @text;
+  background-color: @surface0;
+  color: @mantle;
 }
 
 #tray > .passive {
@@ -240,15 +244,15 @@ label:focus {
   color: #1793d1;
 }
 
-#custom-mpv-scroll {
-  color: @base;
-  background-color: @blue;
+#custom-mpd-scroll {
+  color: @mantle;
+  background-color: @mauve;
   padding: 0 10px;
   margin: 5px 1px;
 }
 #custom-updates {
   background-color: @yellow;
-  color: @base;
+  color: @mantle;
   padding: 0 10px;
   margin: 5px 1px;
 }
@@ -260,8 +264,15 @@ label:focus {
 }
 
 #custom-firefox {
-  color: @base;
-  background-color: @pink;
+  color: @mantle;
+  background-color: @peach;
+  padding: 0 10px;
+  margin: 5px 1px;
+}
+
+#cava {
+  background-color: @blue;
+  color: @crust;
   padding: 0 10px;
   margin: 5px 1px;
 }