From 468c95b98d6e11b91ae4e64ead8c821a46285b63 Mon Sep 17 00:00:00 2001
From: Micke Nordin <mik@elnord.in>
Date: Tue, 22 Dec 2020 15:02:14 +0100
Subject: [PATCH] More applets

---
 dotfiles/.config/sway/config   |  2 +-
 dotfiles/.config/waybar/config | 19 ++++++++-----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/dotfiles/.config/sway/config b/dotfiles/.config/sway/config
index 7d146b2..c33564c 100644
--- a/dotfiles/.config/sway/config
+++ b/dotfiles/.config/sway/config
@@ -210,6 +210,7 @@ for_window [window_type="dialog"] floating enable
 for_window [title="~nwggrid"] floating enable
 for_window [title="~nwgbar"] floating enable
 for_window [title="~nmtui"] floating enable
+for_window [title="~khal"] floating enable
 
 #
 # Scratchpad:
@@ -297,7 +298,6 @@ mode $power_mode {
 # Manual autostart non graphical
 exec --no-startup-id autotiling
 exec --no-startup-id appimagelauncherd
-exec --no-startup-id nm-tray
 exec --no-startup-id nextcloud
 exec --no-startup-id foot -s
 exec --no-startup-id /usr/lib/x86_64-linux-gnu/ukui-polkit/polkit-ukui-authentication-agent-1
diff --git a/dotfiles/.config/waybar/config b/dotfiles/.config/waybar/config
index 6f122d7..2925f2f 100644
--- a/dotfiles/.config/waybar/config
+++ b/dotfiles/.config/waybar/config
@@ -2,29 +2,26 @@
      "layer": "top",
      "modules-left": ["sway/workspaces", "sway/mode"],
      "modules-center": ["custom/date","custom/clock"],
-     "modules-right": ["network","battery","custom/nmtui","tray"],
+     "modules-right": ["network","battery","tray"],
      "sway/window": {
           "max-length": 50
      },
      "network": {
           // "interface": "wlp2*", // (Optional) To force the use of this interface
-          "format-wifi": "{essid} ({signalStrength}%) ",
+          "format-wifi": "{essid}: {ipaddr} ({signalStrength}%) ",
           "format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
           "format-linked": "{ifname} (No IP) ",
           "format-disconnected": "Disconnected ⚠",
-          "format-alt": "{ifname}: {ipaddr}/{cidr}"
+          "on-click": "foot --title ~nmtui nmtui"
     },
-     "custom/nmtui": {
-         "format": "  ",
-         "tooltip": "NetworkManager",
-         "on-click": "foot --title ~nmtui nmtui"
-     },
      "custom/clock": {
-         "interval": 1,
-         "exec": "date \"+%Y-%m-%d %H:%M:%S\""
+          "interval": 1,
+          "on-click": "foot --title ~khal khal interactive",
+          "exec": "date \"+%Y-%m-%d %H:%M:%S\""
      },
      "battery": {
           "format": "{capacity}% {icon}",
-          "format-icons": ["", "", "", "", ""]
+          "format-icons": ["", "", "", "", ""],
+          "on-click": "tlpui"
      }
 }