Merge branch 'master' of git.darkou.fr:dbroqua/home

This commit is contained in:
Damien Broqua 2022-11-15 16:52:36 +01:00
commit 78497ba62a
3 changed files with 23 additions and 9 deletions

View File

@ -1,7 +1,7 @@
[ [
{ {
"name": "thinkstation", "name": "thinkstation",
"layer": "bottom", "layer": "bottom",
"position": "top", "position": "top",
"margin": 4, "margin": 4,
"output": "HDMI-A-3", "output": "HDMI-A-3",
@ -25,7 +25,7 @@
"clock", "clock",
"tray" "tray"
], ],
"sway/workspaces": { "sway/workspaces": {
"all-outputs": true "all-outputs": true
}, },
"sway/mode": { "sway/mode": {
@ -146,10 +146,10 @@
"sway/mode", "sway/mode",
], ],
"modules-center": [ "modules-center": [
"custom/clock", "custom/clock",
], ],
"modules-right": [ "modules-right": [
"network#openvpn", "custom/vpn",
"network", "network",
"temperature", "temperature",
"cpu", "cpu",
@ -159,11 +159,11 @@
"pulseaudio", "pulseaudio",
"tray" "tray"
], ],
"custom/clock": { "custom/clock": {
"exec": "date +'%A %d/%m/%Y %H:%M'", "exec": "date +'%A %d/%m/%Y %H:%M'",
"interval": 60, "interval": 60,
}, },
"sway/workspaces": { "sway/workspaces": {
"all-outputs": true "all-outputs": true
}, },
"sway/mode": { "sway/mode": {
@ -204,6 +204,14 @@
"tooltip": true, "tooltip": true,
"interval": 60, "interval": 60,
}, },
"custom/vpn": {
"format": "{icon}",
"tooltip-format": "{icon}",
"exec": "$HOME/.config/waybar/modules/vpn_echo.sh",
"return-type": "json",
"interval": 5,
"format-icons": ["",""]
},
"network#openvpn": { "network#openvpn": {
"interface": "tun0", "interface": "tun0",
"format": "🔒", "format": "🔒",

View File

@ -0,0 +1,4 @@
#!/bin/bash
ip addr | grep -q '10.10.10.2' \
&& echo '{"text":"Connected","class":"connected","percentage":100}' \
|| echo '{"text":"Disconnected","class":"disconnected","percentage":0}'

View File

@ -20,6 +20,7 @@ window#waybar.laptop {
#mode, #mode,
#disk, #disk,
#network, #network,
#custom-vpn,
#cpu, #cpu,
#memory, #memory,
#temperature, #temperature,
@ -59,6 +60,7 @@ window#waybar.laptop {
background: rgba(208, 135, 112, 0.7); background: rgba(208, 135, 112, 0.7);
} }
#custom-vpn.disconnected,
#network.disconnected { #network.disconnected {
background: rgba(191, 97, 106, 0.7); background: rgba(191, 97, 106, 0.7);
} }