From 3e33ab3a31976a52cb6ed24dab6a6a3c21d8e786 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Mon, 10 Jul 2023 10:14:24 +0100
Subject: [PATCH] Add networkmanagerapplet and click action to open from waybar

---
 home/desktop/config/waybar/modules.json | 6 ++++--
 home/desktop/hyprland.nix               | 2 ++
 home/desktop/waybar.nix                 | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/home/desktop/config/waybar/modules.json b/home/desktop/config/waybar/modules.json
index 9fb570db..eaacc389 100644
--- a/home/desktop/config/waybar/modules.json
+++ b/home/desktop/config/waybar/modules.json
@@ -99,14 +99,16 @@
         "tooltip-format": "{ifname}",
         "format-linked": "{ifname} (No IP) 󰈁",
         "format-disconnected": "Disconnected 󰈂",
-        "format-alt": "{ifname}: {ipaddr}/{cidr}"
+        "format-alt": "{ifname}: {ipaddr}/{cidr}",
+        "on-click": "nm-connection-editor"
     },
     "network#compact": {
         "format-wifi": "({signalStrength}%) 󰖩",
         "format-ethernet": "󰈁",
         "tooltip-format": "{essid}",
         "format-linked": "(No IP) 󰈁",
-        "format-disconnected": "󰈂"
+        "format-disconnected": "󰈂",
+        "on-click": "nm-connection-editor"
     },
     "bluetooth": {
         "format": "󰂯 {status}",
diff --git a/home/desktop/hyprland.nix b/home/desktop/hyprland.nix
index 24054163..0766c604 100644
--- a/home/desktop/hyprland.nix
+++ b/home/desktop/hyprland.nix
@@ -175,12 +175,14 @@ in {
       windowrule = float, ^(foot)$
       windowrule = float, ^(pavucontrol)$
       windowrule = float, ^(.blueman-manager-wrapped)$
+      windowrule = float, ^(nm-connection-editor)$
       windowrule = float, ^(otpclient)$
       windowrule = float, ^(thunar)$
 
       windowrule = center, ^(foot)$
       windowrule = center, ^(pavucontrol)$
       windowrule = center, ^(.blueman-manager-wrapped)$
+      windowrule = center, ^(nm-connection-editor)$
       windowrule = move 2% 6%, ^(otpclient)$
 
       windowrule = workspace 2, neovide
diff --git a/home/desktop/waybar.nix b/home/desktop/waybar.nix
index 93b840b2..89523fc7 100644
--- a/home/desktop/waybar.nix
+++ b/home/desktop/waybar.nix
@@ -5,6 +5,7 @@
 }: {
   home.packages = with pkgs; [
     (nerdfonts.override {fonts = ["FiraCode"];})
+    networkmanagerapplet
     bluez
   ];
   xdg.configFile."waybar" = {