Compare commits
16 Commits
c326a20a99
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
8b880ea838
|
|||
|
84a8da445a
|
|||
| 0c7b82c7bc | |||
|
8dcbae1568
|
|||
|
59569acb4f
|
|||
| 4191642f08 | |||
| 0085e879d5 | |||
| 3136948589 | |||
| e6ab8c75cb | |||
| f853c4d033 | |||
|
43fcdd0b61
|
|||
|
abb539e52b
|
|||
|
78feda56cd
|
|||
|
9c0cfe74c0
|
|||
|
fac34d4a8f
|
|||
| b19be6ff13 |
300
catppuccin-macchiato/config-laptop.jsonc
Normal file
300
catppuccin-macchiato/config-laptop.jsonc
Normal file
@@ -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": ["", "", "", "", ""],
|
||||||
|
},
|
||||||
|
}
|
||||||
@@ -2,17 +2,20 @@
|
|||||||
"layer": "top",
|
"layer": "top",
|
||||||
"position": "top",
|
"position": "top",
|
||||||
"height": 40,
|
"height": 40,
|
||||||
"width": 2550,
|
"width": 2545,
|
||||||
"spacing": 1,
|
"spacing": 1,
|
||||||
"reload_style_on_change": true,
|
"reload_style_on_change": true,
|
||||||
"margin": "10 5 0 5",
|
"fixed-center": true,
|
||||||
|
"margin": "8px 5px 0 5px",
|
||||||
"modules-left": [
|
"modules-left": [
|
||||||
"custom/launcher",
|
"custom/launcher",
|
||||||
"hyprland/workspaces",
|
"hyprland/workspaces",
|
||||||
"tray",
|
"tray",
|
||||||
"hyprland/mode",
|
"hyprland/submap",
|
||||||
|
"custom/mpd-scroll",
|
||||||
"custom/mpv-scroll",
|
"custom/mpv-scroll",
|
||||||
"custom/firefox",
|
"custom/firefox-scroll",
|
||||||
|
"cava",
|
||||||
],
|
],
|
||||||
"modules-center": ["hyprland/window"],
|
"modules-center": ["hyprland/window"],
|
||||||
"modules-right": [
|
"modules-right": [
|
||||||
@@ -22,8 +25,8 @@
|
|||||||
"custom/kernel",
|
"custom/kernel",
|
||||||
// "disk#ssd",
|
// "disk#ssd",
|
||||||
// "temperature",
|
// "temperature",
|
||||||
"cpu",
|
// "cpu",
|
||||||
"memory",
|
// "memory",
|
||||||
"bluetooth",
|
"bluetooth",
|
||||||
"network",
|
"network",
|
||||||
"pulseaudio",
|
"pulseaudio",
|
||||||
@@ -59,8 +62,10 @@
|
|||||||
"tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%",
|
"tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%",
|
||||||
"on-click": "blueman-manager",
|
"on-click": "blueman-manager",
|
||||||
},
|
},
|
||||||
"hyprland/mode": {
|
"hyprland/submap": {
|
||||||
"format": "<span style=\"italic\">{}</span>",
|
"format": "{}",
|
||||||
|
"max-length": 8,
|
||||||
|
"tooltip": false,
|
||||||
},
|
},
|
||||||
"hyprland/scratchpad": {
|
"hyprland/scratchpad": {
|
||||||
"format": "{icon} {count}",
|
"format": "{icon} {count}",
|
||||||
@@ -232,13 +237,17 @@
|
|||||||
},
|
},
|
||||||
"hyprland/window": {
|
"hyprland/window": {
|
||||||
"max-length": 88,
|
"max-length": 88,
|
||||||
|
"rewrite": {
|
||||||
|
"(.*) - YouTube(.*)": "",
|
||||||
|
"(.*) - mpv(.*)": "",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
"custom/updates": {
|
"custom/updates": {
|
||||||
"format": "{} {icon}",
|
"format": "{} {icon}",
|
||||||
"return-type": "json",
|
"return-type": "json",
|
||||||
"format-icons": {
|
"format-icons": {
|
||||||
"has-updates": "",
|
"has-updates": "",
|
||||||
"updated": "",
|
"updated": "",
|
||||||
},
|
},
|
||||||
"exec-if": "which waybar-module-pacman-updates",
|
"exec-if": "which waybar-module-pacman-updates",
|
||||||
"exec": "waybar-module-pacman-updates --no-zero-output --tooltip-align-columns",
|
"exec": "waybar-module-pacman-updates --no-zero-output --tooltip-align-columns",
|
||||||
@@ -249,15 +258,14 @@
|
|||||||
"on-click": "rofi -show drun",
|
"on-click": "rofi -show drun",
|
||||||
"tooltip": false,
|
"tooltip": false,
|
||||||
},
|
},
|
||||||
"custom/firefox": {
|
"custom/firefox-scroll": {
|
||||||
"exec": "$HOME/.config/waybar/scripts/scroll-firefox.sh",
|
"exec": "$HOME/.config/waybar/scripts/scroll-firefox.sh",
|
||||||
"format": "<span color='#E66000'> </span>{}",
|
"format": "<span color='#E66000'> </span>{}",
|
||||||
"max-length": 35,
|
"max-length": 35,
|
||||||
"on-click": "playerctl -p firefox play-pause",
|
"on-click": "playerctl -p firefox play-pause",
|
||||||
"hide-empty-text": true,
|
"hide-empty-text": true,
|
||||||
},
|
},
|
||||||
"custom/mpv-scroll": {
|
"custom/mpd-scroll": {
|
||||||
"escape": "true",
|
|
||||||
"exec": "$HOME/.config/waybar/scripts/scroll-mpd.sh",
|
"exec": "$HOME/.config/waybar/scripts/scroll-mpd.sh",
|
||||||
"format": "{}",
|
"format": "{}",
|
||||||
"max-length": 35,
|
"max-length": 35,
|
||||||
@@ -267,4 +275,33 @@
|
|||||||
"on-scroll-up": "mpc volume +5",
|
"on-scroll-up": "mpc volume +5",
|
||||||
"hide-empty-text": true,
|
"hide-empty-text": true,
|
||||||
},
|
},
|
||||||
|
"cava": {
|
||||||
|
// "cava_config": "$HOME/.config/cava/config",
|
||||||
|
"framerate": 144,
|
||||||
|
"autosens": 0,
|
||||||
|
"sensitivity": 69,
|
||||||
|
"bars": 21,
|
||||||
|
"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",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"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,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,9 +2,7 @@
|
|||||||
|
|
||||||
* {
|
* {
|
||||||
border: none;
|
border: none;
|
||||||
font-family:
|
font-family: "JetBrainsMono Nerd Font", "Font Awesome", "Noto Sans CJK JP";
|
||||||
JetBrainsMono Nerd Font,
|
|
||||||
Font Awesome;
|
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
border-radius: 0.69em;
|
border-radius: 0.69em;
|
||||||
@@ -20,6 +18,12 @@ window#waybar.hidden {
|
|||||||
opacity: 0.2;
|
opacity: 0.2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#window {
|
||||||
|
background-color: inherit;
|
||||||
|
padding: 0 10px;
|
||||||
|
margin: 5px 1px;
|
||||||
|
}
|
||||||
|
|
||||||
tooltip {
|
tooltip {
|
||||||
background-color: @base;
|
background-color: @base;
|
||||||
border: 1px solid @subtext0;
|
border: 1px solid @subtext0;
|
||||||
@@ -85,7 +89,7 @@ button:hover {
|
|||||||
background-image: linear-gradient(0deg, @surface1, @mantle);
|
background-image: linear-gradient(0deg, @surface1, @mantle);
|
||||||
}
|
}
|
||||||
|
|
||||||
#mode {
|
#submap {
|
||||||
background-color: @base;
|
background-color: @base;
|
||||||
box-shadow: inset 0 -2px @text;
|
box-shadow: inset 0 -2px @text;
|
||||||
}
|
}
|
||||||
@@ -103,7 +107,7 @@ button:hover {
|
|||||||
#custom-kernel,
|
#custom-kernel,
|
||||||
#idle_inhibitor,
|
#idle_inhibitor,
|
||||||
#scratchpad,
|
#scratchpad,
|
||||||
#mode,
|
#submap,
|
||||||
#tray {
|
#tray {
|
||||||
padding: 0 10px;
|
padding: 0 10px;
|
||||||
margin: 5px 1px;
|
margin: 5px 1px;
|
||||||
@@ -125,7 +129,7 @@ button:hover {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#custom-kernel {
|
#custom-kernel {
|
||||||
background-color: @rosewater;
|
background-color: @mauve;
|
||||||
color: @mantle;
|
color: @mantle;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -167,7 +171,7 @@ label:focus {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#network.disconnected {
|
#network.disconnected {
|
||||||
background-color: red;
|
background-color: @red;
|
||||||
color: @mantle;
|
color: @mantle;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -178,7 +182,7 @@ label:focus {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#pulseaudio {
|
#pulseaudio {
|
||||||
background-color: @yellow;
|
background-color: @sapphire;
|
||||||
color: @mantle;
|
color: @mantle;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -201,8 +205,8 @@ label:focus {
|
|||||||
|
|
||||||
#tray {
|
#tray {
|
||||||
/* background-color: @overlay0; */
|
/* background-color: @overlay0; */
|
||||||
background-color: @surface1;
|
background-color: @surface0;
|
||||||
color: @text;
|
color: @mantle;
|
||||||
}
|
}
|
||||||
|
|
||||||
#tray > .passive {
|
#tray > .passive {
|
||||||
@@ -240,15 +244,15 @@ label:focus {
|
|||||||
color: #1793d1;
|
color: #1793d1;
|
||||||
}
|
}
|
||||||
|
|
||||||
#custom-mpv-scroll {
|
#custom-mpd-scroll {
|
||||||
color: @base;
|
color: @mantle;
|
||||||
background-color: @blue;
|
background-color: @mauve;
|
||||||
padding: 0 10px;
|
padding: 0 10px;
|
||||||
margin: 5px 1px;
|
margin: 5px 1px;
|
||||||
}
|
}
|
||||||
#custom-updates {
|
#custom-updates {
|
||||||
background-color: @yellow;
|
background-color: @yellow;
|
||||||
color: @base;
|
color: @mantle;
|
||||||
padding: 0 10px;
|
padding: 0 10px;
|
||||||
margin: 5px 1px;
|
margin: 5px 1px;
|
||||||
}
|
}
|
||||||
@@ -259,9 +263,46 @@ label:focus {
|
|||||||
margin: 0 0 0 0.24em;
|
margin: 0 0 0 0.24em;
|
||||||
}
|
}
|
||||||
|
|
||||||
#custom-firefox {
|
#custom-firefox-scroll {
|
||||||
color: @base;
|
color: @mantle;
|
||||||
background-color: @pink;
|
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;
|
padding: 0 10px;
|
||||||
margin: 5px 1px;
|
margin: 5px 1px;
|
||||||
}
|
}
|
||||||
|
|||||||
1
colors.css
Symbolic link
1
colors.css
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
catppuccin-macchiato/colors.css
|
||||||
1
config-laptop.jsonc
Symbolic link
1
config-laptop.jsonc
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
catppuccin-macchiato/config-laptop.jsonc
|
||||||
1
config.jsonc
Symbolic link
1
config.jsonc
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
catppuccin-macchiato/config.jsonc
|
||||||
1
scripts/escape-pango.sh
Symbolic link
1
scripts/escape-pango.sh
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
../../../projects/scripts/waybar/escape-pango.sh
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
STATUS="$(playerctl -p firefox status)"
|
|
||||||
|
|
||||||
if [ -z "$STATUS" ] || [ "$STATUS" = "Stopped" ]; then
|
|
||||||
exit 0
|
|
||||||
elif [ "$STATUS" = "Paused" ]; then
|
|
||||||
STATUS=" "
|
|
||||||
elif [ "$STATUS" = "Playing" ]; then
|
|
||||||
STATUS=" "
|
|
||||||
else
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
TITLE="$(playerctl -p firefox metadata title)"
|
|
||||||
ARTIST="$(playerctl -p firefox metadata artist)"
|
|
||||||
|
|
||||||
printf "%s\n" "$STATUS$TITLE - $ARTIST"
|
|
||||||
@@ -1,235 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
import gi
|
|
||||||
|
|
||||||
gi.require_version("Playerctl", "2.0")
|
|
||||||
import argparse
|
|
||||||
import json
|
|
||||||
import logging
|
|
||||||
import os
|
|
||||||
import signal
|
|
||||||
import sys
|
|
||||||
from typing import List
|
|
||||||
|
|
||||||
import gi
|
|
||||||
from gi.repository import GLib, Playerctl
|
|
||||||
from gi.repository.Playerctl import Player
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
is_plain = False
|
|
||||||
|
|
||||||
|
|
||||||
def signal_handler(sig, frame):
|
|
||||||
logger.info("Received signal to stop, exiting")
|
|
||||||
sys.stdout.write("\n")
|
|
||||||
sys.stdout.flush()
|
|
||||||
# loop.quit()
|
|
||||||
sys.exit(0)
|
|
||||||
|
|
||||||
|
|
||||||
class PlayerManager:
|
|
||||||
def __init__(self, selected_player=None, excluded_player=[]):
|
|
||||||
self.manager = Playerctl.PlayerManager()
|
|
||||||
self.loop = GLib.MainLoop()
|
|
||||||
self.manager.connect(
|
|
||||||
"name-appeared", lambda *args: self.on_player_appeared(*args)
|
|
||||||
)
|
|
||||||
self.manager.connect(
|
|
||||||
"player-vanished", lambda *args: self.on_player_vanished(*args)
|
|
||||||
)
|
|
||||||
|
|
||||||
signal.signal(signal.SIGINT, signal_handler)
|
|
||||||
signal.signal(signal.SIGTERM, signal_handler)
|
|
||||||
signal.signal(signal.SIGPIPE, signal.SIG_DFL)
|
|
||||||
self.selected_player = selected_player
|
|
||||||
self.excluded_player = excluded_player.split(",") if excluded_player else []
|
|
||||||
|
|
||||||
self.init_players()
|
|
||||||
|
|
||||||
def init_players(self):
|
|
||||||
for player in self.manager.props.player_names:
|
|
||||||
if player.name in self.excluded_player:
|
|
||||||
continue
|
|
||||||
if self.selected_player is not None and self.selected_player != player.name:
|
|
||||||
logger.debug(f"{player.name} is not the filtered player, skipping it")
|
|
||||||
continue
|
|
||||||
self.init_player(player)
|
|
||||||
|
|
||||||
def run(self):
|
|
||||||
logger.info("Starting main loop")
|
|
||||||
self.loop.run()
|
|
||||||
|
|
||||||
def init_player(self, player):
|
|
||||||
logger.info(f"Initialize new player: {player.name}")
|
|
||||||
player = Playerctl.Player.new_from_name(player)
|
|
||||||
player.connect("playback-status", self.on_playback_status_changed, None)
|
|
||||||
player.connect("metadata", self.on_metadata_changed, None)
|
|
||||||
self.manager.manage_player(player)
|
|
||||||
self.on_metadata_changed(player, player.props.metadata)
|
|
||||||
|
|
||||||
def get_players(self) -> List[Player]:
|
|
||||||
return self.manager.props.players
|
|
||||||
|
|
||||||
def write_output(self, text, player):
|
|
||||||
logger.debug(f"Writing output: {text}")
|
|
||||||
|
|
||||||
if not is_plain:
|
|
||||||
output = {
|
|
||||||
"text": text,
|
|
||||||
"class": "custom-" + player.props.player_name,
|
|
||||||
"alt": player.props.player_name,
|
|
||||||
}
|
|
||||||
|
|
||||||
sys.stdout.write(json.dumps(output))
|
|
||||||
sys.stdout.flush()
|
|
||||||
else:
|
|
||||||
sys.stdout.write(text + "\n")
|
|
||||||
# sys.stdout.write(text)
|
|
||||||
sys.stdout.flush()
|
|
||||||
|
|
||||||
def clear_output(self):
|
|
||||||
sys.stdout.write("\n")
|
|
||||||
sys.stdout.flush()
|
|
||||||
|
|
||||||
def on_playback_status_changed(self, player, status, _=None):
|
|
||||||
logger.debug(
|
|
||||||
f"Playback status changed for player {player.props.player_name}: {status}"
|
|
||||||
)
|
|
||||||
self.on_metadata_changed(player, player.props.metadata)
|
|
||||||
|
|
||||||
def get_first_playing_player(self):
|
|
||||||
players = self.get_players()
|
|
||||||
logger.debug(f"Getting first playing player from {len(players)} players")
|
|
||||||
if len(players) > 0:
|
|
||||||
# if any are playing, show the first one that is playing
|
|
||||||
# reverse order, so that the most recently added ones are preferred
|
|
||||||
for player in players[::-1]:
|
|
||||||
if player.props.status == "Playing":
|
|
||||||
return player
|
|
||||||
# if none are playing, show the first one
|
|
||||||
return players[0]
|
|
||||||
else:
|
|
||||||
logger.debug("No players found")
|
|
||||||
return None
|
|
||||||
|
|
||||||
def show_most_important_player(self):
|
|
||||||
logger.debug("Showing most important player")
|
|
||||||
# show the currently playing player
|
|
||||||
# or else show the first paused player
|
|
||||||
# or else show nothing
|
|
||||||
current_player = self.get_first_playing_player()
|
|
||||||
if current_player is not None:
|
|
||||||
self.on_metadata_changed(current_player, current_player.props.metadata)
|
|
||||||
else:
|
|
||||||
self.clear_output()
|
|
||||||
|
|
||||||
def on_metadata_changed(self, player, metadata, _=None):
|
|
||||||
logger.debug(f"Metadata changed for player {player.props.player_name}")
|
|
||||||
player_name = player.props.player_name
|
|
||||||
artist = player.get_artist()
|
|
||||||
title = player.get_title()
|
|
||||||
title = title.replace("&", "&")
|
|
||||||
|
|
||||||
track_info = ""
|
|
||||||
if (
|
|
||||||
player_name == "spotify"
|
|
||||||
and "mpris:trackid" in metadata.keys()
|
|
||||||
and ":ad:" in player.props.metadata["mpris:trackid"]
|
|
||||||
):
|
|
||||||
track_info = "Advertisement"
|
|
||||||
elif artist is not None and title is not None:
|
|
||||||
track_info = f"{artist} - {title}"
|
|
||||||
else:
|
|
||||||
track_info = title
|
|
||||||
|
|
||||||
if track_info:
|
|
||||||
if player.props.status == "Playing":
|
|
||||||
track_info = "playing " + track_info
|
|
||||||
else:
|
|
||||||
track_info = "paused " + track_info
|
|
||||||
# only print output if no other player is playing
|
|
||||||
current_playing = self.get_first_playing_player()
|
|
||||||
if (
|
|
||||||
current_playing is None
|
|
||||||
or current_playing.props.player_name == player.props.player_name
|
|
||||||
):
|
|
||||||
self.write_output(track_info, player)
|
|
||||||
else:
|
|
||||||
logger.debug(
|
|
||||||
f"Other player {current_playing.props.player_name} is playing, skipping"
|
|
||||||
)
|
|
||||||
|
|
||||||
def on_player_appeared(self, _, player):
|
|
||||||
logger.info(f"Player has appeared: {player.name}")
|
|
||||||
if player.name in self.excluded_player:
|
|
||||||
logger.debug(
|
|
||||||
"New player appeared, but it's in exclude player list, skipping"
|
|
||||||
)
|
|
||||||
return
|
|
||||||
if player is not None and (
|
|
||||||
self.selected_player is None or player.name == self.selected_player
|
|
||||||
):
|
|
||||||
self.init_player(player)
|
|
||||||
else:
|
|
||||||
logger.debug(
|
|
||||||
"New player appeared, but it's not the selected player, skipping"
|
|
||||||
)
|
|
||||||
|
|
||||||
def on_player_vanished(self, _, player):
|
|
||||||
logger.info(f"Player {player.props.player_name} has vanished")
|
|
||||||
self.show_most_important_player()
|
|
||||||
|
|
||||||
|
|
||||||
def parse_arguments():
|
|
||||||
parser = argparse.ArgumentParser()
|
|
||||||
|
|
||||||
# Increase verbosity with every occurrence of -v
|
|
||||||
parser.add_argument("-v", "--verbose", action="count", default=0)
|
|
||||||
|
|
||||||
parser.add_argument("-x", "--exclude", "- Comma-separated list of excluded player")
|
|
||||||
parser.add_argument(
|
|
||||||
"-p", "--plain", action="store_true", help="Plain text output", default=False
|
|
||||||
)
|
|
||||||
|
|
||||||
# Define for which player we"re listening
|
|
||||||
parser.add_argument("--player")
|
|
||||||
|
|
||||||
parser.add_argument("--enable-logging", action="store_true")
|
|
||||||
|
|
||||||
return parser.parse_args()
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
global is_plain
|
|
||||||
arguments = parse_arguments()
|
|
||||||
|
|
||||||
# Initialize logging
|
|
||||||
if arguments.enable_logging:
|
|
||||||
logfile = os.path.join(
|
|
||||||
os.path.dirname(os.path.realpath(__file__)), "media-player.log"
|
|
||||||
)
|
|
||||||
logging.basicConfig(
|
|
||||||
filename=logfile,
|
|
||||||
level=logging.DEBUG,
|
|
||||||
format="%(asctime)s %(name)s %(levelname)s:%(lineno)d %(message)s",
|
|
||||||
)
|
|
||||||
|
|
||||||
# Logging is set by default to WARN and higher.
|
|
||||||
# With every occurrence of -v it's lowered by one
|
|
||||||
logger.setLevel(max((3 - arguments.verbose) * 10, 0))
|
|
||||||
|
|
||||||
logger.info("Creating player manager")
|
|
||||||
if arguments.player:
|
|
||||||
logger.info(f"Filtering for player: {arguments.player}")
|
|
||||||
if arguments.exclude:
|
|
||||||
logger.info(f"Exclude player {arguments.exclude}")
|
|
||||||
if arguments.plain:
|
|
||||||
logger.info("Plain text output")
|
|
||||||
is_plain = arguments.plain
|
|
||||||
|
|
||||||
player = PlayerManager(arguments.player, arguments.exclude)
|
|
||||||
player.run()
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
|
|
||||||
main()
|
|
||||||
1
scripts/mediaplayer.py
Symbolic link
1
scripts/mediaplayer.py
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
../../../projects/scripts/waybar/mediaplayer.py
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
# https://blog.dhampir.no/content/sleeping-without-a-subprocess-in-bash-and-how-to-sleep-forever
|
|
||||||
snore() {
|
|
||||||
local IFS
|
|
||||||
[[ -n "${_snore_fd:-}" ]] || exec {_snore_fd}<> <(:)
|
|
||||||
read -r ${1:+-t "$1"} -u $_snore_fd || :
|
|
||||||
}
|
|
||||||
|
|
||||||
DELAY=0.2
|
|
||||||
|
|
||||||
while snore $DELAY; do
|
|
||||||
WP_OUTPUT=$(wpctl get-volume @DEFAULT_AUDIO_SINK@)
|
|
||||||
|
|
||||||
if [[ $WP_OUTPUT =~ ^Volume:[[:blank:]]([0-9]+)\.([0-9]{2})([[:blank:]].MUTED.)?$ ]]; then
|
|
||||||
if [[ -n ${BASH_REMATCH[3]} ]]; then
|
|
||||||
printf "MUTE\n"
|
|
||||||
else
|
|
||||||
VOLUME=$((10#${BASH_REMATCH[1]}${BASH_REMATCH[2]}))
|
|
||||||
ICON=(
|
|
||||||
""
|
|
||||||
""
|
|
||||||
""
|
|
||||||
)
|
|
||||||
|
|
||||||
if [[ $VOLUME -gt 50 ]]; then
|
|
||||||
printf "%s" "${ICON[0]} "
|
|
||||||
elif [[ $VOLUME -gt 25 ]]; then
|
|
||||||
printf "%s" "${ICON[1]} "
|
|
||||||
elif [[ $VOLUME -ge 0 ]]; then
|
|
||||||
printf "%s" "${ICON[2]} "
|
|
||||||
fi
|
|
||||||
|
|
||||||
printf "$VOLUME%%\n"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
exit 0
|
|
||||||
1
scripts/pipewire.sh
Symbolic link
1
scripts/pipewire.sh
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
../../../projects/scripts/waybar/pipewire.sh
|
||||||
1
scripts/playerctl.sh
Symbolic link
1
scripts/playerctl.sh
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
../../../projects/scripts/waybar/playerctl.sh
|
||||||
1
scripts/reload-waybar
Symbolic link
1
scripts/reload-waybar
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
../../../projects/scripts/waybar/reload-waybar
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
zscroll -p ' | ' --delay 0.2 \
|
|
||||||
--length 30 \
|
|
||||||
--match-command "$HOME/.config/waybar/scripts/firefox-status.sh" \
|
|
||||||
--match-text ' ' "" \
|
|
||||||
--match-text ' ' "--scroll 0" \
|
|
||||||
--update-interval 1 \
|
|
||||||
--update-check true "$HOME/.config/waybar/scripts/firefox-status.sh" &
|
|
||||||
wait
|
|
||||||
1
scripts/scroll-firefox.sh
Symbolic link
1
scripts/scroll-firefox.sh
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
../../../projects/scripts/waybar/scroll-firefox.sh
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
zscroll -p ' | ' --delay 0.2 --before-text " x" \
|
|
||||||
--length 30 \
|
|
||||||
--match-command "mpc status" \
|
|
||||||
--match-text "playing" "--before-text ' '" \
|
|
||||||
--match-text "paused" "--before-text ' ' --scroll 0" \
|
|
||||||
--update-interval 1 \
|
|
||||||
--update-check true "mpc current" &
|
|
||||||
wait
|
|
||||||
1
scripts/scroll-mpd.sh
Symbolic link
1
scripts/scroll-mpd.sh
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
../../../projects/scripts/waybar/scroll-mpd.sh
|
||||||
1
scripts/scroll-mpv.sh
Symbolic link
1
scripts/scroll-mpv.sh
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
../../../projects/scripts/waybar/scroll-mpv.sh
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
for _ in {1..5}; do
|
|
||||||
text="$(curl -s "https://wttr.in/$1?format=1" | sed -E "s/\s+/ /g")"
|
|
||||||
if [[ "$?" = 0 ]]; then
|
|
||||||
# text="$(echo "$text" | awk '{print $2}')"
|
|
||||||
tooltip=$(curl -s "https://wttr.in/$1?format=4")
|
|
||||||
if [ "$?" = 0 ]; then
|
|
||||||
tooltip=$(echo "$tooltip" | sed -E "s/\s+/ /g")
|
|
||||||
echo "{\"text\":\"$text\", \"tooltip\":\"$tooltip\"}"
|
|
||||||
exit
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
sleep 2
|
|
||||||
done
|
|
||||||
echo "{\"text\":\"error\", \"tooltip\":\"error\"}"
|
|
||||||
1
scripts/wttr.sh
Symbolic link
1
scripts/wttr.sh
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
../../../projects/scripts/waybar/wttr.sh
|
||||||
Reference in New Issue
Block a user