diff --git a/bin/start_waybar.sh b/bin/start_waybar.sh index 822b084..2a73b6c 100755 --- a/bin/start_waybar.sh +++ b/bin/start_waybar.sh @@ -4,7 +4,7 @@ CONFIG_DIR=$HOME/.config/sway/waybar.d CONFIG=$CONFIG_DIR/config CONFIG_HOST=$CONFIG_DIR/config_$(hostname) if [ -f $CONFIG_HOST ]; then -CONFIG=$CONFIG_HOST + CONFIG=$CONFIG_HOST fi STYLE=$CONFIG_DIR/style.css diff --git a/hosts.d/7DPQTN2.conf b/hosts.d/7DPQTN2.conf index f78d5a7..848d345 100644 --- a/hosts.d/7DPQTN2.conf +++ b/hosts.d/7DPQTN2.conf @@ -3,11 +3,14 @@ set $intern "Chimei Innolux Corporation 0x14D3 0x00000000" set $extern "Dell Inc. Dell U4919DW 9YVZWP2" set $extern2 "Dell Inc. Dell U4919DW 10WZWP2" +set $extern3 "Dell Inc. DELL U3415W F1T1W61R0ACL" ### Output configuration -output $intern position 0 0 -output $extern position 1920 0 resolution 5120x1440 -output $extern2 position -1600 -1440 resolution 5120x1440 +output $intern position 1600 1440 +output $extern position 0 1440 resolution 5120x1440 +# output $extern2 position -1600 -1440 resolution 5120x1440 +output $extern2 position 0 0 resolution 5120x1440 +output $extern3 position 840 0 bindswitch --reload --locked lid:on output $intern disable bindswitch --reload --locked lid:off output $intern enable diff --git a/waybar.d/config_7DPQTN2 b/waybar.d/config_7DPQTN2 new file mode 100644 index 0000000..cc6daba --- /dev/null +++ b/waybar.d/config_7DPQTN2 @@ -0,0 +1,209 @@ +// vi: ft=jsonc +// normal #ebdbb2 +// blue #268bd2 +// red #fb4934 +// green #b8bb26 +{ + "layer": "top", + "height": 25, + "modules-left": [ + "sway/workspaces", + "custom/separator#left" + ], + "modules-center": [ + "custom/separator#right", + "custom/media", + "custom/separator#center", + "pulseaudio", + "custom/separator#left" + ], + "modules-right": [ + "custom/separator#right", + // "custom/card", + // "custom/separator#right", + // "custom/mail", + // "custom/separator#right", + "network#wl0", + "network#en0", + // "network#vpn0", + "custom/separator#right", + "cpu", + "memory", + "custom/separator#right", + "battery", + "custom/separator#right", + "custom/calendar", + "clock", + "tray" + ], + "custom/separator#left": { + "format": " " + }, + "custom/separator#center": { + // "format": " " + "format": " | " + }, + "custom/separator#right": { + "format": " " + }, + "custom/calendar": { + "format": "{icon} {}", + "tooltip-format": "{}", + "tooltip": true, + "return-type": "json", + "interval": 300, + "format-icons": { + "now": " ", + "today": " ", + "idle": " " + }, + "escape": false, + "exec": "$HOME/.config/sway/bin/waybar_khal.py 2> /dev/null", + "on-click": "foot -T float khal interactive" + }, + "custom/card": { + "format": "{icon} {}", + "tooltip-format": "{}", + "tooltip": true, + "return-type": "json", + "min-length": 3, + "max-length": 3, + "interval": 10, + "format-icons": { + "available": "", + "missing": "" + }, + "escape": true, + "exec": "$HOME/.config/sway/bin/waybar_card.sh 2> /dev/null" + }, + "custom/mail": { + "format": "{icon} {}", + "tooltip-format": "{}", + "tooltip": true, + "return-type": "json", + "min-length": 5, + "max-length": 5, + "interval": 30, + "format-icons": { + "unread": " ", + "read": " " + }, + "escape": true, + "exec": "$HOME/.config/sway/bin/waybar_mail.py 2> /dev/null" + }, + "custom/media": { + "format": "{icon} {}", + "tooltip-format": "{}", + "tooltip": true, + "return-type": "json", + "min-length": 30, + "max-length": 40, + "format-icons": { + "chromium": " ", + "firefox": " ", + "Plexamp": "♫ ", + "default": "♪ " + }, + "escape": true, + "exec": "$HOME/.config/sway/bin/waybar_mediaplayer.py 2> /dev/null" + }, + "clock": { + "format": "{: %a, %b %d, %H:%M}", + "on-click": "foot -T float khal interactive" + }, + "cpu": { + "format": " {usage:3}%", + "states": { + "warning": 70, + "critical": 90 + }, + "on-click": "foot -T float bashtop" + }, + "memory": { + "format": " {}%", + "states": { + "warning": 70, + "critical": 90 + }, + "on-click": "foot -T float bashtop" + }, + "battery": { + "bat": "BAT0", + "design-capacity": false, + "states": { + "warning": 30, + "critical": 15 + }, + "format": "{icon} {capacity:3}%", + "format-charging": " {capacity:3}%", + "format-icons": ["", "", "", "", ""] + }, + "network#wl0": { + "interval": 2, + "interface": "wl0", + "format": "{ifname}", + "format-wifi": "{ifname} {essid} ({signalStrength:3}%)", + "format-ethernet": "{ifname}", + "format-linked": "{ifname}", + "format-disconnected": "{ifname}", + "tooltip-format": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}", + "tooltip-format-linked": "{ifname} linked", + "tooltip-format-disconnected": "{ifname} disconnected", + "on-click": "foot -T float nmtui" + }, + "network#en0": { + "interval": 2, + "interface": "en0", + "format": "{ifname}", + "format-wifi": " {essid} ({signalStrength:3}%)", + "format-ethernet": "{ifname}", + "format-linked": "{ifname}", + "format-disconnected": "{ifname}", + "tooltip-format": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}", + "tooltip-format-linked": "{ifname} linked", + "tooltip-format-disconnected": "{ifname} disconnected", + "on-click": "foot -T float nmtui" + }, + "network#vpn0": { + "interval": 2, + "interface": "vpn0", + "format": "{ifname}", + "format-wifi": " {essid} ({signalStrength:3}%)", + "format-ethernet": "{ifname}", + "format-linked": "{ifname}", + "format-disconnected": "{ifname}", + "tooltip-format": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}", + "tooltip-format-linked": "{ifname} linked", + "tooltip-format-disconnected": "{ifname} disconnected", + "on-click": "foot -T float nmtui" + }, + "pulseaudio": { + "format": "{icon} {volume}% {format_source}", + "format-bluetooth": "{icon} {volume}% {format_source}", + "format-bluetooth-muted": " {icon} {format_source}", + "format-muted": "{format_source}", + "format-source": "{volume}%", + "format-source-muted": "", + "format-icons": { + "headphone": "🎧", + "hands-free": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": ["", "", ""] + }, + "min-length": 9, + "max-length": 20, + "on-click": "$HOME/.config/sway/bin/sway_volume mute", + "on-click-middle": "$HOME/.config/sway/bin/sway_volume gui", + "on-click-right": "$HOME/.config/sway/bin/sway_volume source-mute", + "on-scroll-up": "$HOME/.config/sway/bin/sway_volume increase", + "on-scroll-down": "$HOME/.config/sway/bin/sway_volume decrease-mute" + }, + "tray": { + "padding": 10, + "spacing": 10 + } +} +