From 9f60672b4ea86fb5482a7b3748422b3a0b14b9d8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 24 Jan 2024 20:53:24 +0800 Subject: [PATCH] feat(waybar): update waybar and xdg-desktop-portal --- .config/sway/conf.d/theme | 3 - .config/sway/scripts/logout.sh | 11 ++- .config/waybar/config | 137 +++++++------------------- .config/waybar/style.css | 5 +- .config/xdg-desktop-portal-wlr/config | 2 +- .gitmodules | 6 -- 6 files changed, 48 insertions(+), 116 deletions(-) delete mode 100644 .gitmodules diff --git a/.config/sway/conf.d/theme b/.config/sway/conf.d/theme index 32faf14..4f7507f 100644 --- a/.config/sway/conf.d/theme +++ b/.config/sway/conf.d/theme @@ -7,9 +7,6 @@ set $laptop eDP-1 bindswitch --reload --locked lid:on output $laptop disable bindswitch --reload --locked lid:off output $laptop enable -# bar -# bar swaybar_command waybar - #workspace_auto_back_and_forth yes force_display_urgency_hint 500 ms smart_borders no_gaps diff --git a/.config/sway/scripts/logout.sh b/.config/sway/scripts/logout.sh index 408a9a1..6c43908 100755 --- a/.config/sway/scripts/logout.sh +++ b/.config/sway/scripts/logout.sh @@ -14,11 +14,12 @@ choice=$(printf "%s\n" "${choices[@]}" | fuzzel -d --prompt "󰚥: ") if test "$choice" = lock ; then # sleep less when power on - if acpi -a | grep -q on; then - sleep_time=3600 - else - sleep_time=10 - fi + # if acpi -a | grep -q on; then + # sleep_time=3600 + # else + # sleep_time=10 + # fi + sleep_time=10 sleep 0.3 bright=`light` diff --git a/.config/waybar/config b/.config/waybar/config index d6d23d3..3e86fa5 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -1,102 +1,41 @@ -{ - "layer": "top", - "modules-left": [ - "sway/workspaces" - ], - "fixed-center": false, - "modules-center": [ - "sway/window" - ], - "modules-right": [ - "tray", - "custom/notification", - "custom/player", - "cpu", - "memory", - "network", - "battery", - "clock" - ], - "sway/workspaces": { - "show_special": true, - "on-click": "activate", - "persistent_workspaces": { - "9": [ - "HDMI-A-1" - ] - } - }, - "sway/window": { - "max-length": 50, - "separate-outputs": true - }, - "tray": { - "spacing": 10 - }, - "cpu": { - "format": " {load}", - "format-alt": " {usage}% @ {avg_frequency}GHz" - }, - "memory": { - "format": "󰍛 {used:0.1f}G / {total:0.1f}G", - "format-alt": "󰓡 Swap: {swapUsed:0.1f}G / {swapTotal:0.1f}G" - }, - "network": { - "format-wifi": " {essid} ({signalStrength}%)", - "format-ethernet": "󰈀 {ifname}", - "format-linked": " {ifname}", - "format-disconnected": "󰌙 Disconnected", - "format-alt": "󰩟 {ifname}: {ipaddr}/{cidr}", - "tooltip-format": "{ifname} via {gwaddr}" - }, - "battery": { - "states": { - "good": 75, - "warning": 15, - "critical": 5 - }, - "format": "{icon} {capacity}%", - "format-charging": "󰉁 {capacity}%", - "format-plugged": " {capacity}%", - "format-alt": "{icon} ETA: {time}", - "format-icons": [ - "", - "", - "", - "", - "" +[ + { + "layer": "top", + "name": "main", + "output": "!XMI Redmi 27 NU 3948622WH08F4", + "modules-left": [ + "sway/workspaces" + ], + "fixed-center": false, + "modules-center": [ + "sway/window" + ], + "modules-right": [ + "tray", + "custom/notification", + "custom/player", + "cpu", + "memory", + "network", + "battery", + "clock" + ], + "include": [ + "~/.config/waybar/sway-modules.json" ] }, - "clock": { - "format": "{:󰅐 %H:%M\t %m-%d}", - "tooltip-format": "{:%Y %B}\n{calendar}" - }, - "custom/notification": { - "tooltip": true, - "format": "{icon}", - "format-icons": { - "notification": " New notifications", - "none": " No notifications", - "dnd-notification": " DND on", - "dnd-none": " DND on" - }, - "return-type": "json", - "exec-if": "which swaync-client", - "exec": "swaync-client -swb", - "on-click": "swaync-client -t -sw", - "on-click-right": "swaync-client -d -sw", - "escape": true - }, - "custom/player": { - "format": "{icon} {}", - "format-icons": { - "Playing": "󰎈 ", - "Paused": "󰏤 " - }, - "return-type": "json", - "exec": "playerctl -a metadata --format '{\"text\": \"{{playerName}}: {{artist}} - {{markup_escape(title)}}\", \"tooltip\": \"{{markup_escape(title)}} - {{markup_escape(album)}}\", \"class\": \"{{status}}\", \"alt\": \"{{status}}\" }' -F", - "max-length": 40, - "on-click": "playerctl play-pause", - "on-click-right": "pavucontrol" + { + "layer": "top", + "name": "alt", + "output": "XMI Redmi 27 NU 3948622WH08F4", + "modules-left": [ + "sway/workspaces" + ], + "modules-right": [ + "sway/window" + ], + "sway/window": { + "max-length": 128 + } } -} +] diff --git a/.config/waybar/style.css b/.config/waybar/style.css index df5fbc1..9bd994e 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -5,7 +5,7 @@ * { border: none; border-radius: 1px; - font-family: "IBM Plex Sans", "Symbols Nerd Font" ,sans-serif; + font-family: "IBM Plex Sans", "Symbols Nerd Font", sans-serif; font-size: 14px; min-height: 0; } @@ -17,7 +17,8 @@ window#waybar { border-bottom: 1px solid @selection_background; } -#workspaces { +#workspaces, +#window { margin: 5px 10px; } diff --git a/.config/xdg-desktop-portal-wlr/config b/.config/xdg-desktop-portal-wlr/config index 8bf8ec7..2fc4f96 100644 --- a/.config/xdg-desktop-portal-wlr/config +++ b/.config/xdg-desktop-portal-wlr/config @@ -1,5 +1,5 @@ [screencast] -max_fps=60 +max_fps=120 exec_before=swaynag -m "Screen sharing enabled" -e bottom --background b16286 --text dbdbb2 --button-background b16286 --button-text ebdbb2 --border ebdbb2 --button-border-size 2 ; exec_after=enable_notifications.sh chooser_type=simple diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 3b793f6..0000000 --- a/.gitmodules +++ /dev/null @@ -1,6 +0,0 @@ -[submodule ".config/mpv/default-shader-pack"] - path = .config/mpv/default-shader-pack - url = https://github.com/iwalton3/default-shader-pack.git -[submodule ".config/hypr/plugins/hy3"] - path = .config/hypr/plugins/hy3 - url = https://github.com/outfoxxed/hy3.git