feat(waybar): update waybar and xdg-desktop-portal

This commit is contained in:
Ryan 2024-01-24 20:53:24 +08:00
parent d9b78e8b0b
commit 9f60672b4e
6 changed files with 48 additions and 116 deletions

View File

@ -7,9 +7,6 @@ set $laptop eDP-1
bindswitch --reload --locked lid:on output $laptop disable bindswitch --reload --locked lid:on output $laptop disable
bindswitch --reload --locked lid:off output $laptop enable bindswitch --reload --locked lid:off output $laptop enable
# bar
# bar swaybar_command waybar
#workspace_auto_back_and_forth yes #workspace_auto_back_and_forth yes
force_display_urgency_hint 500 ms force_display_urgency_hint 500 ms
smart_borders no_gaps smart_borders no_gaps

View File

@ -14,11 +14,12 @@ choice=$(printf "%s\n" "${choices[@]}" | fuzzel -d --prompt "󰚥: ")
if test "$choice" = lock ; then if test "$choice" = lock ; then
# sleep less when power on # sleep less when power on
if acpi -a | grep -q on; then # if acpi -a | grep -q on; then
sleep_time=3600 # sleep_time=3600
else # else
sleep_time=10 # sleep_time=10
fi # fi
sleep_time=10
sleep 0.3 sleep 0.3
bright=`light` bright=`light`

View File

@ -1,102 +1,41 @@
{ [
"layer": "top", {
"modules-left": [ "layer": "top",
"sway/workspaces" "name": "main",
], "output": "!XMI Redmi 27 NU 3948622WH08F4",
"fixed-center": false, "modules-left": [
"modules-center": [ "sway/workspaces"
"sway/window" ],
], "fixed-center": false,
"modules-right": [ "modules-center": [
"tray", "sway/window"
"custom/notification", ],
"custom/player", "modules-right": [
"cpu", "tray",
"memory", "custom/notification",
"network", "custom/player",
"battery", "cpu",
"clock" "memory",
], "network",
"sway/workspaces": { "battery",
"show_special": true, "clock"
"on-click": "activate", ],
"persistent_workspaces": { "include": [
"9": [ "~/.config/waybar/sway-modules.json"
"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": [
"",
"",
"",
"",
""
] ]
}, },
"clock": { {
"format": "{:󰅐 %H:%M\t %m-%d}", "layer": "top",
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>" "name": "alt",
}, "output": "XMI Redmi 27 NU 3948622WH08F4",
"custom/notification": { "modules-left": [
"tooltip": true, "sway/workspaces"
"format": "{icon}", ],
"format-icons": { "modules-right": [
"notification": " <span foreground='red'><sup></sup></span> New notifications", "sway/window"
"none": " No notifications", ],
"dnd-notification": " DND on", "sway/window": {
"dnd-none": " DND on" "max-length": 128
}, }
"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"
} }
} ]

View File

@ -5,7 +5,7 @@
* { * {
border: none; border: none;
border-radius: 1px; 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; font-size: 14px;
min-height: 0; min-height: 0;
} }
@ -17,7 +17,8 @@ window#waybar {
border-bottom: 1px solid @selection_background; border-bottom: 1px solid @selection_background;
} }
#workspaces { #workspaces,
#window {
margin: 5px 10px; margin: 5px 10px;
} }

View File

@ -1,5 +1,5 @@
[screencast] [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_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 ; exec_after=enable_notifications.sh
chooser_type=simple chooser_type=simple

6
.gitmodules vendored
View File

@ -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