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

catppuccin-macchiato/config-laptop.jsonc

@@ -0,0 +1,300 @@
+{
+  "layer": "top",
+  "position": "top",
+  "height": 40,
+  "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/submap",
+    "custom/mpd-scroll",
+    "custom/firefox-scroll",
+    "cava",
+  ],
+  "modules-center": ["hyprland/window"],
+  "modules-right": [
+    "hyprland/scratchpad",
+    "idle_inhibitor",
+    "custom/updates",
+    // "custom/kernel",
+    // "disk#ssd",
+    // "temperature",
+    // "cpu",
+    // "memory",
+    // "custom/weather",
+    "bluetooth",
+    "network",
+    "pulseaudio",
+    "battery",
+    "clock",
+  ],
+
+  "bluetooth": {
+    "format-on": "bt ",
+    "format-off": "bt ({status}) ",
+    "format-connected": "{device_alias} ",
+    "format-connected-battery": "{device_alias} [{device_battery_percentage}%] ",
+    "format-device-preference": ["ugreen_1", "ugreen_2"],
+    "tooltip-format": "{controller_alias}\t{controller_address}\n\n{num_connections} connected",
+    "tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}",
+    "tooltip-format-enumerate-connected": "{device_alias}\t{device_address}",
+    "tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%",
+    "on-click": "blueman-manager",
+  },
+  "hyprland/submap": {
+    "format": "{}",
+    "max-length": 8,
+    "tooltip": false,
+  },
+  "hyprland/scratchpad": {
+    "format": "{icon} {count}",
+    "show-empty": false,
+    "format-icons": ["", ""],
+    "tooltip": true,
+    "tooltip-format": "{app}: {title}",
+  },
+  "idle_inhibitor": {
+    "format": "{icon}",
+    "format-icons": {
+      "activated": "",
+      "deactivated": "",
+    },
+  },
+  "tray": {
+    "icon-size": 14,
+    "spacing": 10,
+  },
+  "clock": {
+    "interval": 60,
+    "timezone": "America/Los_Angeles",
+    "format": "{:%R }",
+    "format-alt": "{:%F %R }",
+    "tooltip-format": "<tt><small>{calendar}</small></tt>",
+    "calendar": {
+      "mode": "year",
+      "mode-mon-col": 3,
+      "weeks-pos": "right",
+      "on-scroll": 1,
+      "on-click-right": "mode",
+      "format": {
+        "months": "<span color='#cba6f7'><b>{}</b></span>",
+        "days": "<span color='#cdd6f4'><b>{}</b></span>",
+        "weeks": "<span color='#94e2d5'>W{}</span>",
+        "weekdays": "<span color='#f9e2af'><b>{}</b></span>",
+        "today": "<span color='#f5e0dc'><b><u>{}</u></b></span>",
+      },
+    },
+    "actions": {
+      "on-click-right": "mode",
+      "on-click-forward": "tz_up",
+      "on-click-backward": "tz_down",
+      "on-scroll-up": "shift_up",
+      "on-scroll-down": "shift_down",
+    },
+  },
+  "cpu": {
+    "interval": 3,
+    "format": "{usage}% ",
+    "on-click": "ghostty --initial-command=btop",
+  },
+  "memory": {
+    "interval": 3,
+    "format": "{}% ",
+    "on-click": "ghostty --initial-command=btop",
+    "tooltip-format": "Used: {used:0.1f}G/{total:0.1f}G. Swap: {swapUsed:0.1f}G/{swapTotal:0.1f}G",
+    "states": {
+      "critical": 80,
+    },
+  },
+  "temperature": {
+    "interval": 3,
+    "hwmon-path": "/sys/class/hwmon/hwmon1/temp1_input",
+    "critical-threshold": 90,
+    "format-critical": "{temperatureC}°C {icon}",
+    "format": "{temperatureC}°C {icon}",
+    "format-icons": ["", "", ""],
+  },
+  "disk#ssd": {
+    "interval": 60,
+    "format": "{path} {free} ",
+    "path": "/",
+    "tooltip": true,
+    "warning": 80,
+    "critical": 90,
+  },
+  "network": {
+    "interval": 60,
+    "interface-ethernet": "enp1s*",
+    "interface-wifi": "wlan0",
+    "format-ethernet": "eth ",
+    "format-wifi": "{essid} ({signalStrength}%) ",
+    "tooltip-format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
+    "tooltip-format-wifi": "{ifname}: {ipaddr}/{cidr} ",
+    "format-linked": "(No IP) ",
+    "format-disconnected": "Disconnected ⚠",
+  },
+  "custom/weather": {
+    "interval": 600,
+    "exec": "~/.config/waybar/scripts/wttr.sh Los_Angeles",
+    "return-type": "json",
+    "format": "{}",
+    "tooltip": true,
+  },
+  "custom/kernel": {
+    "exec": "uname -r | sed -E 's/^([0-9]+\\.[0-9]+\\.[0-9]+)-.*-([a-zA-Z0-9]+)/\\1-\\2/'",
+    "format": "{} ",
+  },
+  "pulseaudio": {
+    "scroll-step": 2,
+    // "format": "{volume}% {icon} {format_source}",
+    // "format-bluetooth": "{volume}% {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": "",
+    "format-icons": {
+      "headphone": " ",
+      "hands-free": "",
+      "headset": "",
+      "phone": "",
+      "portable": "",
+      "car": "",
+    },
+    "on-click": "pavucontrol",
+  },
+  "custom/pipewire": {
+    "tooltip": false,
+    "max-length": 6,
+    "exec": "$HOME/.config/waybar/scripts/pipewire.sh",
+    "on-click-right": "qpwgraph",
+    "scroll-step": 2,
+    "format": "{volume}% {icon} {format_source}",
+    "format-bluetooth": "{volume}% {icon} {format_source}",
+    "format-bluetooth-muted": " {icon} {format_source}",
+    "format-muted": " {format_source}",
+    "format-source": "{volume}% ",
+    "format-source-muted": "",
+    "format-icons": {
+      "headphone": " ",
+      "hands-free": "",
+      "headset": "",
+      "phone": "",
+      "portable": "",
+      "car": "",
+    },
+    "on-click": "pavucontrol",
+  },
+  "hyprland/workspaces": {
+    "format": "{icon}",
+    "format-icons": {
+      "1": "一",
+      "2": "二",
+      "3": "三",
+      "4": "四",
+      "5": "五",
+      "6": "六",
+      "7": "七",
+      "8": "八",
+      "9": "九",
+      "10": "十",
+      // "11": "一",
+      // "12": "二",
+      // "13": "三",
+      // "14": "四",
+      // "15": "五",
+      // "16": "六",
+      // "17": "七",
+      // "18": "八",
+      // "19": "九",
+      // "20": "十",
+    },
+    "persistent-workspaces": {
+      // "*": 10,
+      "*": 5,
+    },
+    "sort-by": "number",
+    "all-outputs": false,
+  },
+  "hyprland/window": {
+    "max-length": 88,
+  },
+  "custom/updates": {
+    "format": "{} {icon}",
+    "return-type": "json",
+    "format-icons": {
+      "has-updates": "",
+      "updated": "",
+    },
+    "exec-if": "which waybar-module-pacman-updates",
+    "exec": "waybar-module-pacman-updates --no-zero-output --tooltip-align-columns",
+  },
+  "custom/launcher": {
+    "format": "{icon}",
+    "format-icons": [" "],
+    "on-click": "rofi -show drun",
+    "tooltip": false,
+  },
+  "custom/firefox-scroll": {
+    "exec": "$HOME/.config/waybar/scripts/scroll-firefox.sh",
+    "format": "<span color='#E66000'> </span>{}",
+    "max-length": 30,
+    "on-click": "playerctl -p firefox play-pause",
+    "hide-empty-text": true,
+  },
+  "custom/mpd-scroll": {
+    "escape": "true",
+    "exec": "$HOME/.config/waybar/scripts/scroll-mpd.sh",
+    "format": "{}",
+    "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,17 +2,19 @@
   "layer": "top",
   "position": "top",
   "height": 40,
-  "width": 2550,
+  "width": 2545,
   "spacing": 1,
   "reload_style_on_change": true,
-  "margin": "10 5 0 5",
+  "fixed-center": true,
+  "margin": "8px 5px 0 5px",
   "modules-left": [
     "custom/launcher",
     "hyprland/workspaces",
     "tray",
-    "hyprland/mode",
+    "hyprland/submap",
     "custom/mpd-scroll",
-    "custom/firefox",
+    "custom/mpv-scroll",
+    "custom/firefox-scroll",
     "cava",
   ],
   "modules-center": ["hyprland/window"],
@@ -60,8 +62,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}",
@@ -233,6 +237,10 @@
   },
   "hyprland/window": {
     "max-length": 88,
+    "rewrite": {
+      "(.*) - YouTube(.*)": "",
+      "(.*) - mpv(.*)": "",
+    },
   },
   "custom/updates": {
     "format": "{} {icon}",
@@ -250,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,
@@ -258,7 +266,6 @@
     "hide-empty-text": true,
   },
   "custom/mpd-scroll": {
-    "escape": "true",
     "exec": "$HOME/.config/waybar/scripts/scroll-mpd.sh",
     "format": "{}",
     "max-length": 35,
@@ -271,9 +278,9 @@
   "cava": {
     // "cava_config": "$HOME/.config/cava/config",
     "framerate": 144,
-    "autosens": 1,
-    "sensitivity": 100,
-    "bars": 14,
+    "autosens": 0,
+    "sensitivity": 69,
+    "bars": 21,
     "lower_cutoff_freq": 50,
     "higher_cutoff_freq": 10000,
     "method": "pipewire",
@@ -290,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

@@ -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;
@@ -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 {
@@ -241,14 +245,14 @@ label:focus {
 }
 
 #custom-mpd-scroll {
-  color: @base;
-  background-color: @blue;
+  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;
 }
@@ -259,15 +263,45 @@ label:focus {
   margin: 0 0 0 0.24em;
 }
 
-#custom-firefox {
-  color: @base;
-  background-color: @pink;
+#custom-firefox-scroll {
+  color: @mantle;
+  background-color: @peach;
   padding: 0 10px;
   margin: 5px 1px;
 }
 
 #cava {
   background-color: @blue;
+  color: @crust;
+  padding: 0 10px;
+  margin: 5px 1px;
+}
+
+#battery.critical:not(.charging) {
+  background-color: @red;
+  color: @base;
+  animation-name: blink;
+  animation-duration: 0.5s;
+  animation-timing-function: steps(12);
+  animation-iteration-count: infinite;
+  animation-direction: alternate;
+}
+
+#battery {
+  background-color: @rosewater;
+  color: @base;
+  padding: 0 10px;
+  margin: 5px 1px;
+}
+
+#battery.charging,
+#battery.plugged {
+  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-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