diff --git a/dot_config/waybar/config.tmpl b/dot_config/waybar/config.tmpl index f85b498..e337390 100755 --- a/dot_config/waybar/config.tmpl +++ b/dot_config/waybar/config.tmpl @@ -1,5 +1,5 @@ // vim: ft=json5 -{{- $hasBattery := false -}} +{{ $hasBattery := false -}} {{- if eq .chezmoi.os "linux" -}} {{- if (glob "/sys/class/power_supply/BAT*") -}} {{- $hasBattery = true -}} @@ -17,10 +17,8 @@ "height": 32, "modules-left": ["custom/launcher","sway/workspaces","cpu","memory","disk","sway/window"], "modules-center": ["custom/media"], - "modules-right": ["custom/update_audio","sway/mode","custom/kernel",{{- if eq .chezmoi.os "linux" -}}"network"{{- else }} "custom/network"{{ end}},"pulseaudio","tray","clock",{{- if $hasBattery -}} -"battery", -{{- end -}}"custom/power"], - + "modules-right": ["custom/update_audio","sway/mode","custom/kernel",{{- if eq .chezmoi.os "linux" -}}"network"{{- else }} "custom/network"{{ end}},"pulseaudio","tray","clock",{{- if $hasBattery -}}"battery",{{- end -}}"custom/power"], + "keyboard-state": { "numlock": true, diff --git a/dot_config/waybar/media.json b/dot_config/waybar/media.json index 90f7118..7cf6674 100644 --- a/dot_config/waybar/media.json +++ b/dot_config/waybar/media.json @@ -10,4 +10,4 @@ "exec": "playerctl -a metadata --format '{\"text\": \"{{artist}} - {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}'", "on-click": "playerctl play-pause", "interval": 1, -}, +}}