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

catppuccin-macchiato/config-laptop.jsonc

@@ -5,49 +5,35 @@
   "width": 1905,
   "spacing": 1,
   "reload_style_on_change": true,
+  "fixed-center": true,
   "margin": "10 5 0 5",
   "modules-left": [
     "custom/launcher",
     "hyprland/workspaces",
     "tray",
-    "hyprland/mode",
+    "hyprland/submap",
-    "custom/mpv-scroll",
+    "custom/mpd-scroll",
-    "custom/firefox",
+    "custom/firefox-scroll",
+    "cava",
   ],
   "modules-center": ["hyprland/window"],
   "modules-right": [
     "hyprland/scratchpad",
     "idle_inhibitor",
     "custom/updates",
-    "custom/kernel",
+    // "custom/kernel",
     // "disk#ssd",
     // "temperature",
-    "cpu",
+    // "cpu",
-    "memory",
+    // "memory",
+    // "custom/weather",
     "bluetooth",
     "network",
     "pulseaudio",
     "battery",
     "clock",
-    "custom/weather",
   ],
 
-  "hyprland/workspaces": {
-    "disable-scroll": false,
-    "all-outputs": true,
-    "warp-on-scroll": false,
-    "format": "{icon}",
-    "format-icons": {
-      //         "1": "",
-      //         "2": "",
-      //         "3": "",
-      //         "4": "",
-      //         "5": "",
-      "urgent": "",
-      //         "focused": "",
-      //         "default": ""
-    },
-  },
   "bluetooth": {
     "format-on": "bt ",
     "format-off": "bt ({status}) ",
@@ -60,8 +46,10 @@
     "tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%",
     "on-click": "blueman-manager",
   },
-  "hyprland/mode": {
+  "hyprland/submap": {
-    "format": "<span style=\"italic\">{}</span>",
+    "format": "{}",
+    "max-length": 8,
+    "tooltip": false,
   },
   "hyprland/scratchpad": {
     "format": "{icon} {count}",
@@ -84,7 +72,8 @@
   "clock": {
     "interval": 60,
     "timezone": "America/Los_Angeles",
-    "format": "{:%F %R }",
+    "format": "{:%R }",
+    "format-alt": "{:%F %R }",
     "tooltip-format": "<tt><small>{calendar}</small></tt>",
     "calendar": {
       "mode": "year",
@@ -162,9 +151,12 @@
   },
   "pulseaudio": {
     "scroll-step": 2,
-    "format": "{volume}% {icon} {format_source}",
+    // "format": "{volume}% {icon} {format_source}",
-    "format-bluetooth": "{volume}% {icon} {format_source}",
+    // "format-bluetooth": "{volume}% {icon} {format_source}",
-    "format-bluetooth-muted": " {icon} {format_source}",
+    // "format-bluetooth-muted": " {icon} {format_source}",
+    "format": "{volume}% {icon}",
+    "format-bluetooth": "{volume}% {icon}",
+    "format-bluetooth-muted": " {icon}",
     "format-muted": " {format_source}",
     "format-source": "{volume}% ",
     "format-source-muted": "",
@@ -178,21 +170,6 @@
     },
     "on-click": "pavucontrol",
   },
-  "battery": {
-    "states": {
-      "good": 75,
-      "warning": 30,
-      "critical": 15,
-    },
-    "format": "{capacity}% {icon}",
-    "format-full": "{capacity}% {icon}",
-    "format-charging": "{capacity}% ",
-    "format-plugged": "{capacity}% ",
-    "format-alt": "{time} {icon}",
-    // "format-good": "", // An empty format will hide the module
-    // "format-full": "",
-    "format-icons": ["", "", "", "", ""],
-  },
   "custom/pipewire": {
     "tooltip": false,
     "max-length": 6,
@@ -253,8 +230,8 @@
     "format": "{} {icon}",
     "return-type": "json",
     "format-icons": {
-      "has-updates": "󱍷",
+      "has-updates": "",
-      "updated": "",
+      "updated": "",
     },
     "exec-if": "which waybar-module-pacman-updates",
     "exec": "waybar-module-pacman-updates --no-zero-output --tooltip-align-columns",
@@ -265,22 +242,59 @@
     "on-click": "rofi -show drun",
     "tooltip": false,
   },
-  "custom/firefox": {
+  "custom/firefox-scroll": {
     "exec": "$HOME/.config/waybar/scripts/scroll-firefox.sh",
     "format": "<span color='#E66000'> </span>{}",
-    "max-length": 35,
+    "max-length": 30,
     "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": "{}",
-    "max-length": 35,
+    "max-length": 30,
     "on-click": "mpc toggle",
     "on-click-right": "ghostty --initial-command=ncmpcpp",
     "on-scroll-down": "mpc volume -5",
     "on-scroll-up": "mpc volume +5",
     "hide-empty-text": true,
   },
+  "cava": {
+    // "cava_config": "$HOME/.config/cava/config",
+    "framerate": 144,
+    "autosens": 0,
+    "sensitivity": 100,
+    "bars": 18,
+    "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",
+    },
+  },
+  "battery": {
+    "states": {
+      "good": 75,
+      "warning": 30,
+      "critical": 15,
+    },
+    "format": "{capacity}% {icon}",
+    "format-full": "{capacity}% {icon}",
+    "format-charging": "{capacity}% ",
+    "format-plugged": "{capacity}% ",
+    "format-alt": "{time} {icon}",
+    // "format-good": "", // An empty format will hide the module
+    // "format-full": "",
+    "format-icons": ["", "", "", "", ""],
+  },
 }

catppuccin-macchiato/config.jsonc

@@ -2,18 +2,19 @@
   "layer": "top",
   "position": "top",
   "height": 40,
-  "width": 2550,
+  "width": 2545,
   "spacing": 1,
   "reload_style_on_change": true,
   "fixed-center": true,
-  "margin": "10 5 0 5",
+  "margin": "8px 5px 0 5px",
   "modules-left": [
     "custom/launcher",
     "hyprland/workspaces",
     "tray",
     "hyprland/submap",
     "custom/mpd-scroll",
-    "custom/firefox",
+    "custom/mpv-scroll",
+    "custom/firefox-scroll",
     "cava",
   ],
   "modules-center": ["hyprland/window"],
@@ -236,6 +237,10 @@
   },
   "hyprland/window": {
     "max-length": 88,
+    "rewrite": {
+      "(.*) - YouTube(.*)": "",
+      "(.*) - mpv(.*)": "",
+    },
   },
   "custom/updates": {
     "format": "{} {icon}",
@@ -253,7 +258,7 @@
     "on-click": "rofi -show drun",
     "tooltip": false,
   },
-  "custom/firefox": {
+  "custom/firefox-scroll": {
     "exec": "$HOME/.config/waybar/scripts/scroll-firefox.sh",
     "format": "<span color='#E66000'> </span>{}",
     "max-length": 35,
@@ -261,7 +266,6 @@
     "hide-empty-text": true,
   },
   "custom/mpd-scroll": {
-    "escape": "true",
     "exec": "$HOME/.config/waybar/scripts/scroll-mpd.sh",
     "format": "{}",
     "max-length": 35,
@@ -275,8 +279,8 @@
     // "cava_config": "$HOME/.config/cava/config",
     "framerate": 144,
     "autosens": 0,
-    "sensitivity": 100,
+    "sensitivity": 69,
-    "bars": 12,
+    "bars": 21,
     "lower_cutoff_freq": 50,
     "higher_cutoff_freq": 10000,
     "method": "pipewire",
@@ -293,4 +297,11 @@
       "on-click-right": "mode",
     },
   },
+  "custom/mpv-scroll": {
+    "exec": "$HOME/.config/waybar/scripts/scroll-mpv.sh",
+    "format": "<span color='#450241'> </span> {}",
+    "max-length": 35,
+    "on-click": "playerctl -p firefox play-pause",
+    "hide-empty-text": true,
+  },
 }

catppuccin-macchiato/style.css

@@ -263,7 +263,7 @@ label:focus {
   margin: 0 0 0 0.24em;
 }
 
-#custom-firefox {
+#custom-firefox-scroll {
   color: @mantle;
   background-color: @peach;
   padding: 0 10px;
@@ -299,3 +299,10 @@ label:focus {
   color: @base;
   background-color: @green;
 }
+
+#custom-mpv-scroll {
+  background-color: @flamingo;
+  color: @base;
+  padding: 0 10px;
+  margin: 5px 1px;
+}

colors.css

@@ -0,0 +1 @@
+catppuccin-macchiato/colors.css

config-laptop.jsonc

@@ -0,0 +1 @@
+catppuccin-macchiato/config-laptop.jsonc

config.jsonc

@@ -0,0 +1 @@
+catppuccin-macchiato/config.jsonc

scripts/escape-mpc-pango.sh

@@ -1 +0,0 @@
-../../../projects/scripts/waybar/escape-mpc-pango.sh

scripts/escape-pango.sh

@@ -0,0 +1 @@
+../../../projects/scripts/waybar/escape-pango.sh

scripts/firefox-status.sh

@@ -1 +0,0 @@
-../../../projects/scripts/waybar/firefox-status.sh

scripts/playerctl.sh

@@ -0,0 +1 @@
+../../../projects/scripts/waybar/playerctl.sh

scripts/reload-waybar

@@ -0,0 +1 @@
+../../../projects/scripts/waybar/reload-waybar

scripts/scroll-mpv.sh

@@ -0,0 +1 @@
+../../../projects/scripts/waybar/scroll-mpv.sh

style.css

@@ -0,0 +1 @@
+catppuccin-macchiato/style.css