Use system zsh plugins, remove redundant waybar network modules

- Source zsh-autosuggestions and zsh-syntax-highlighting from
  /usr/share/zsh/plugins/ instead of oh-my-zsh custom dir
- Add both as official packages
- Remove waybar network and custom/vpn modules (nm-applet covers this)
- Move tray from modules-left to first position in modules-right
This commit is contained in:
nevaforget 2026-03-31 10:27:53 +02:00
parent ca7f9bb79e
commit 077e852b3b
4 changed files with 9 additions and 42 deletions

View File

@ -117,12 +117,12 @@ if command -v fzf &>/dev/null; then
export FZF_ALT_C_OPTS="--preview 'eza --tree --color=always {} | head -200'" export FZF_ALT_C_OPTS="--preview 'eza --tree --color=always {} | head -200'"
fi fi
# --- Plugins (oh-my-zsh) --- # --- Plugins (system packages) ---
if [[ -d "${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting" ]]; then if [[ -f /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]]; then
source "${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
fi fi
if [[ -d "${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions" ]]; then if [[ -f /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh ]]; then
source "${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh" source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
ZSH_AUTOSUGGEST_STRATEGY=(history completion) ZSH_AUTOSUGGEST_STRATEGY=(history completion)
fi fi

View File

@ -8,7 +8,6 @@
"modules-left": [ "modules-left": [
"group/sys", "group/sys",
"niri/workspaces", "niri/workspaces",
"tray",
"wlr/taskbar", "wlr/taskbar",
"niri/window" "niri/window"
], ],
@ -16,9 +15,10 @@
], ],
"modules-right": [ "modules-right": [
"tray",
"mpris", "mpris",
"custom/cpugov", "custom/cpugov",
"group/net", "bluetooth",
"group/sound", "group/sound",
"backlight", "backlight",
"battery", "battery",
@ -34,14 +34,6 @@
"privacy" "privacy"
] ]
}, },
"group/net": {
"orientation": "inherit",
"modules": [
"custom/vpn",
"network",
"bluetooth"
]
},
"group/stats": { "group/stats": {
"orientation": "inherit", "orientation": "inherit",
"modules": [ "modules": [
@ -73,23 +65,6 @@
"clock" "clock"
] ]
}, },
"network": {
"format-wifi": "{icon}",
"format-ethernet": " {ifname}",
"format-disconnected": "󰱟 Offline",
"tooltip-format": "󰊗 {ifname} via {gwaddr}",
"tooltip-format-wifi": " WiFi {essid} ({signalStrength}%)",
"tooltip-format-ethernet": "󰱔 {ifname}",
"tooltip-format-disconnected": "Disconnected",
"on-click": "nm-connection-editor",
"format-icons": [
"󱛅",
"󱛂",
"󱛃",
"󱚽"
],
"max-length": 5
},
"tray": { "tray": {
"icon-size": 15, "icon-size": 15,
"spacing": 10 "spacing": 10
@ -364,14 +339,6 @@
"tooltip-format-activated": "󱎴 No Lockscreen on idle", "tooltip-format-activated": "󱎴 No Lockscreen on idle",
"tooltip-format-deactivated": "󰷛 Lockscreen on idle" "tooltip-format-deactivated": "󰷛 Lockscreen on idle"
}, },
"custom/vpn": {
"format": "󰖂",
"exec": "echo '{\"class\": \"connected\", \"tooltip\": \"VPN Connected\"}'",
"exec-if": "nmcli -t -f TYPE,STATE connection show --active | grep -qE '^(vpn|wireguard):'",
"return-type": "json",
"interval": 5,
"signal": 9
},
"power-profiles-daemon": { "power-profiles-daemon": {
"format": "{icon}", "format": "{icon}",
"tooltip-format": "Power profile: {profile}\nDriver: {driver}", "tooltip-format": "Power profile: {profile}\nDriver: {driver}",

View File

@ -42,7 +42,6 @@ window#waybar {
#memory, #memory,
#bluetooth, #bluetooth,
#temperature, #temperature,
#network,
#pulseaudio, #pulseaudio,
#tray, #tray,
#mode, #mode,
@ -59,7 +58,6 @@ window#waybar {
#custom-gpu-usage, #custom-gpu-usage,
#custom-cpugov, #custom-cpugov,
#custom-dnd, #custom-dnd,
#custom-vpn.connected,
#power-profiles-daemon, #power-profiles-daemon,
#privacy, #privacy,
#gamemode, #gamemode,

View File

@ -14,6 +14,8 @@ zip
# Shell & Terminal # Shell & Terminal
zsh zsh
zsh-autosuggestions
zsh-syntax-highlighting
foot foot
foot-terminfo foot-terminfo
bat bat