From 1b5769229dc016634ff4bf6318217cf132ba2177 Mon Sep 17 00:00:00 2001
From: John Mertz <git@john.me.tz>
Date: Wed, 2 Oct 2024 12:47:20 -0600
Subject: [PATCH] Remove idle_inhibitor, network and wireguard

use custom idle script instead with recent changes
use nm-applet instead
---
 waybar/config.template | 36 +++++-------------------------------
 1 file changed, 5 insertions(+), 31 deletions(-)

diff --git a/waybar/config.template b/waybar/config.template
index a9785b37a..f7b0f80d2 100644
--- a/waybar/config.template
+++ b/waybar/config.template
@@ -18,8 +18,7 @@
     // Choose the order of the modules
     "modules-left": ["sway/workspaces", "sway/window"],
     "modules-center": [],
-    //"modules-right": ["sway/mode", "custom/weather", "network", "network#wireguard", "backlight", "cpu", "memory", "custom/disk", "temperature", "custom/battery", "pulseaudio","tray", "custom/wallpaper", "custom/todo", "custom/osk", "custom/pkg", "custom/bar", "custom/gammastep", "idle_inhibitor", "custom/sleep_modes", "custom/clock", "custom/power"],
-    "modules-right": ["sway/mode", "custom/weather", "backlight", "cpu", "memory", "custom/disk", "temperature", "custom/battery", "pulseaudio", "network#wireguard", "tray", "custom/wallpaper", "custom/todo", "custom/osk", "custom/pkg", "custom/bar", "custom/gammastep", "idle_inhibitor", "custom/sleep_modes", "custom/clock", "custom/power"],
+    "modules-right": ["sway/mode", "custom/weather", "backlight", "cpu", "memory", "custom/disk", "temperature", "custom/battery", "pulseaudio", "tray", "custom/wallpaper", "custom/todo", "custom/osk", "custom/pkg", "custom/bar", "custom/gammastep", "custom/idle_mode", "custom/nc", "custom/clock", "custom/power"],
     // Modules configuration
     "sway/workspaces": {
         // "disable-scroll": true,
@@ -70,24 +69,6 @@
         "on-click": "${HOME}/scripts/waybar/waybar-weather.pl notify",
         "exec": "${HOME}/scripts/waybar/waybar-weather.pl bar"
     },
-    "network": {
-        // "interface": "wlp58s0", // (Optional) To force the use of this interface
-        "interval": 10,
-        "tooltip-format": "{essid} {ipaddr}",
-        "format-ethernet": "",
-        "format-wifi": " ",
-        "format-disconnected": "⛖ ",
-        "on-click": "${HOME}/scripts/rofi/rofi-wifi-menu.sh"
-    },
-    "network#wireguard": {
-    "interval": 10,
-        "interface": "wg0", // (Optional) To force the use of this interface
-        "tooltip-format": "{ifname} {ipaddr}",
-        "tooltip": "{ipaddr}",
-        "format": "⚿",
-        "format-disconnected": "⚿",
-        "on-click": "if [ $(sudo pgrep -xc rofi) -gt 0 ]; then pkill rofi; else ${HOME}/scripts/rofi/rofi-openvpn.sh; fi"
-    },
     "cpu": {
         "format": " {usage}%",
         "tooltip": true,
@@ -178,19 +159,12 @@
         "exec": "echo '\u200a\nLock bar\n'",
         "on-click": "${HOME}/scripts/waybar/toggle.sh"
     },
-    "idle_inhibitor": {
-        "format": "{icon}",
-        "format-icons": {
-            "activated": " ",
-            "deactivated": " "
-        },
-        "on-click": "echo {status} > ${HOME}/.local/state/idle_inhibitor"
-    },
-    "custom/sleep_modes": {
+    "custom/idle_mode": {
         "interval": 1,
         "return-type": "json",
-        "exec": "${HOME}/scripts/waybar/waybar-idle.sh bar",
-        "on-click": "${HOME}/scripts/waybar/waybar-idle.sh rotate"
+        "exec": "${HOME}/scripts/waybar/waybar-idle.sh",
+        "on-click": "${HOME}/scripts/sway/idle.sh mode",
+        "on-click-right": "${HOME}/scripts/sway/idle.sh toggle"
     },
     "custom/gammastep": {
         "interval": 1,