From 20ce47fa2046178b47cc58a57472f61e9399cf22 Mon Sep 17 00:00:00 2001 From: Yingjie Wang Date: Wed, 3 Apr 2024 22:27:27 -0400 Subject: [PATCH 1/8] update: add ~/.local/bin to PATH in bashrc (for zathura-pywal) --- .bashrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bashrc b/.bashrc index 5bfd976..d4cde4f 100644 --- a/.bashrc +++ b/.bashrc @@ -106,7 +106,7 @@ alias setkb='setxkbmap de;echo "Keyboard set back to de."' alias res1='xrandr --output DisplayPort-0 --mode 2560x1440 --rate 120' alias res2='xrandr --output DisplayPort-0 --mode 1920x1080 --rate 120' -export PATH="/usr/lib/ccache/bin/:$PATH" +export PATH="$HOME/.local/bin/:/usr/lib/ccache/bin/:$PATH" # ----------------------------------------------------- # DEVELOPMENT From 4b9812dc7f7c4e776a4d6dcb4ff1e8be42e1b9e9 Mon Sep 17 00:00:00 2001 From: Yingjie Wang Date: Thu, 4 Apr 2024 00:02:50 -0400 Subject: [PATCH 2/8] update: add notify-sent to volume change --- hypr/conf/keybindings/custom.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hypr/conf/keybindings/custom.conf b/hypr/conf/keybindings/custom.conf index 9d07479..ef1b5b6 100644 --- a/hypr/conf/keybindings/custom.conf +++ b/hypr/conf/keybindings/custom.conf @@ -75,8 +75,8 @@ bind = $mainMod CTRL, right, workspace, e+1 # Fn keys bind = , XF86MonBrightnessUp, exec, brightnessctl -q s +10% bind = , XF86MonBrightnessDown, exec, brightnessctl -q s 10%- -bind = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5% -bind = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5% +bind = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5% && notify-send -t 400 "Volume: $(pactl get-sink-volume @DEFAULT_SINK@ | awk '/front-left/ {print $5}')" +bind = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5% && notify-send -t 400 "Volume: $(pactl get-sink-volume @DEFAULT_SINK@ | awk '/front-left/ {print $5}')" bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle bind = , XF86AudioPlay, exec, playerctl play-pause bind = , XF86AudioPause, exec, playerctl pause From 71caefa11a07beae65d8c154a3ca63c34fe4b425 Mon Sep 17 00:00:00 2001 From: Yingjie Wang Date: Thu, 4 Apr 2024 02:29:48 -0400 Subject: [PATCH 3/8] update: rm volume number from waybar --- waybar/themes/ml4w-blur-custom/modules.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/waybar/themes/ml4w-blur-custom/modules.json b/waybar/themes/ml4w-blur-custom/modules.json index e58eb30..72dbe1f 100644 --- a/waybar/themes/ml4w-blur-custom/modules.json +++ b/waybar/themes/ml4w-blur-custom/modules.json @@ -334,8 +334,8 @@ // Pulseaudio "pulseaudio": { // "scroll-step": 1, // %, can be a float - "format": "{icon} {volume}%", - "format-bluetooth": "{volume}% {icon} {format_source}", + "format": "{icon}", + "format-bluetooth": "{icon} {format_source}", "format-bluetooth-muted": " {icon} {format_source}", "format-muted": " {format_source}", "format-source": "{volume}% ", From 1c96f24b092add07b640446f4b2285f3242d4ebe Mon Sep 17 00:00:00 2001 From: Yingjie Wang Date: Thu, 4 Apr 2024 03:17:29 -0400 Subject: [PATCH 4/8] update: new battary icons in waybar --- waybar/themes/ml4w-blur-custom/modules.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/waybar/themes/ml4w-blur-custom/modules.json b/waybar/themes/ml4w-blur-custom/modules.json index 72dbe1f..bb20f05 100644 --- a/waybar/themes/ml4w-blur-custom/modules.json +++ b/waybar/themes/ml4w-blur-custom/modules.json @@ -323,12 +323,15 @@ "critical": 15 }, "format": "{icon} {capacity}%", - "format-charging": " {capacity}%", + "format-charging": "{icon} {capacity}%", "format-plugged": " {capacity}%", "format-alt": "{icon} {time}", // "format-good": "", // An empty format will hide the module // "format-full": "", - "format-icons": [" ", " ", " ", " ", " "] + "format-icons": { + "Charging": ["󰢟","󰢜","󰂆","󰂇","󰂈","󰢝","󰂉","󰢞","󰂊","󰂋","󰂅"], + "default": ["󱃍","󰁺","󰁻","󰁼","󰁽","󰁾","󰁿","󰂀","󰂁","󰂂","󰁹"] + } }, // Pulseaudio From 475fbc55cc9c2135423203dc62de090e581c643b Mon Sep 17 00:00:00 2001 From: Yingjie Wang Date: Thu, 4 Apr 2024 04:42:52 -0400 Subject: [PATCH 5/8] update: better battery in waybar --- waybar/themes/ml4w-blur-custom/config | 3 ++- waybar/themes/ml4w-blur-custom/modules.json | 30 ++++++++++++++++----- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/waybar/themes/ml4w-blur-custom/config b/waybar/themes/ml4w-blur-custom/config index df6e6bb..2081fca 100644 --- a/waybar/themes/ml4w-blur-custom/config +++ b/waybar/themes/ml4w-blur-custom/config @@ -43,7 +43,8 @@ "custom/updates", "pulseaudio", //"bluetooth", - //"battery", + "battery", + "battery#charging", "network", "cpu", "memory", diff --git a/waybar/themes/ml4w-blur-custom/modules.json b/waybar/themes/ml4w-blur-custom/modules.json index bb20f05..dc5ad64 100644 --- a/waybar/themes/ml4w-blur-custom/modules.json +++ b/waybar/themes/ml4w-blur-custom/modules.json @@ -322,16 +322,32 @@ "warning": 30, "critical": 15 }, - "format": "{icon} {capacity}%", - "format-charging": "{icon} {capacity}%", + "format": "{icon} {capacity}%", + "format-charging": "", "format-plugged": " {capacity}%", "format-alt": "{icon} {time}", // "format-good": "", // An empty format will hide the module - // "format-full": "", - "format-icons": { - "Charging": ["󰢟","󰢜","󰂆","󰂇","󰂈","󰢝","󰂉","󰢞","󰂊","󰂋","󰂅"], - "default": ["󱃍","󰁺","󰁻","󰁼","󰁽","󰁾","󰁿","󰂀","󰂁","󰂂","󰁹"] - } + "format-full": "󱟢 {capacity}%", + //"format-icons": { + // "Charging": ["󰢟","󰢜","󰂆","󰂇","󰂈","󰢝","󰂉","󰢞","󰂊","󰂋","󰂅"], + // "default": ["󱃍","󰁺","󰁻","󰁼","󰁽","󰁾","󰁿","󰂀","󰂁","󰂂","󰁹"] + //} + "format-icons": ["󱃍","󰁺","󰁻","󰁼","󰁽","󰁾","󰁿","󰂀","󰂁","󰂂","󰁹"] + }, + "battery#charging": { + "states": { + // "good": 95, + "warning": 30, + "critical": 15 + }, + "format": "", + "format-charging": "{icon} {capacity}%", + // "format-good": "", // An empty format will hide the module + //"format-icons": { + // "Charging": ["󰢟","󰢜","󰂆","󰂇","󰂈","󰢝","󰂉","󰢞","󰂊","󰂋","󰂅"], + // "default": ["󱃍","󰁺","󰁻","󰁼","󰁽","󰁾","󰁿","󰂀","󰂁","󰂂","󰁹"] + //} + "format-icons": ["󰢟","󰢜","󰂆","󰂇","󰂈","󰢝","󰂉","󰢞","󰂊","󰂋","󰂅"] }, // Pulseaudio From bc227bed4998905ca7a5b80e19ca6c7f908ed3d3 Mon Sep 17 00:00:00 2001 From: Yingjie Wang Date: Thu, 4 Apr 2024 04:44:25 -0400 Subject: [PATCH 6/8] minor: trail space --- waybar/themes/ml4w-blur-custom/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/waybar/themes/ml4w-blur-custom/config b/waybar/themes/ml4w-blur-custom/config index 2081fca..4ee1b28 100644 --- a/waybar/themes/ml4w-blur-custom/config +++ b/waybar/themes/ml4w-blur-custom/config @@ -43,7 +43,7 @@ "custom/updates", "pulseaudio", //"bluetooth", - "battery", + "battery", "battery#charging", "network", "cpu", From f095151882e41e73de9d0ea1f8bd889e8ab3f6bd Mon Sep 17 00:00:00 2001 From: Yingjie Wang Date: Thu, 4 Apr 2024 04:52:18 -0400 Subject: [PATCH 7/8] update: better cpu icon in waybar --- waybar/themes/ml4w-blur-custom/modules.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/waybar/themes/ml4w-blur-custom/modules.json b/waybar/themes/ml4w-blur-custom/modules.json index dc5ad64..e12f204 100644 --- a/waybar/themes/ml4w-blur-custom/modules.json +++ b/waybar/themes/ml4w-blur-custom/modules.json @@ -240,7 +240,7 @@ // CPU "cpu": { - "format": " {usage}%", + "format": "󰒇 {usage}%", "on-click": "alacritty -e htop" }, From 77cd4cf9801c31c2179e6738c305b72c6549a647 Mon Sep 17 00:00:00 2001 From: Yingjie Wang Date: Thu, 4 Apr 2024 05:10:16 -0400 Subject: [PATCH 8/8] minor: space in cpu module in waybar --- waybar/themes/ml4w-blur-custom/modules.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/waybar/themes/ml4w-blur-custom/modules.json b/waybar/themes/ml4w-blur-custom/modules.json index e12f204..4258419 100644 --- a/waybar/themes/ml4w-blur-custom/modules.json +++ b/waybar/themes/ml4w-blur-custom/modules.json @@ -240,7 +240,7 @@ // CPU "cpu": { - "format": "󰒇 {usage}%", + "format": "󰒇 {usage}%", "on-click": "alacritty -e htop" },