From f80f3a8bdd188b8939a4c2ab1d4ec3b9a7b5652f Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Tue, 9 Jul 2024 07:18:52 +0100
Subject: [PATCH] Enable networkmanager-applet, add to on-click for waybar
 module

---
 home/desktop/waybar/default.nix | 40 ++++++++++++++++-----------------
 system/desktop.nix              |  1 +
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/home/desktop/waybar/default.nix b/home/desktop/waybar/default.nix
index ed3ed568..54166499 100644
--- a/home/desktop/waybar/default.nix
+++ b/home/desktop/waybar/default.nix
@@ -145,9 +145,10 @@
         format-icons = ["󰤟 " "󰤢 " "󰤥 " "󰤨 "];
         format-wifi = "{icon}";
         format-ethernet = "󰈁 ";
-        tooltip-format = "{essid} ({signalStrength}%)";
         format-linked = "󰈂 ";
         format-disconnected = "󰈂 ";
+        tooltip-format = "{essid} ({signalStrength}%)";
+        on-click = "${pkgs.networkmanagerapplet}/bin/nm-connection-editor";
       };
       bluetooth = {
         format = "󰂯";
@@ -156,8 +157,7 @@
         format-on = "󰂯";
         format-connected = "󰂱";
         tooltip-format = "{status} | {device_alias}";
-        on-click = "${pkgs.bluez}/bin/bluetoothctl power on";
-        on-click-right = "${pkgs.bluez}/bin/bluetoothctl power off";
+        on-click = "${pkgs.blueman}/bin/blueman-manager";
       };
       "clock#calendar" = {
         format = "󰃭 {:%Y-%m-%d}";
@@ -202,24 +202,24 @@
       "custom/notification" = let
         swaync = pkgs.swaynotificationcenter;
       in {
-        "tooltip" = false;
-        "format" = "{icon}{}";
-        "format-icons" = {
-          "notification" = "󱅫 ";
-          "none" = "󰂚 ";
-          "dnd-notification" = "󰅸 ";
-          "dnd-none" = "󰂜 ";
-          "inhibited-notification" = "󰅸 ";
-          "inhibited-none" = "󰂜 ";
-          "dnd-inhibited-notification" = "󰅸 ";
-          "dnd-inhibited-none" = "󰂜 ";
+        tooltip = false;
+        format = "{icon}{}";
+        format-icons = {
+          notification = "󱅫 ";
+          none = "󰂚 ";
+          dnd-notification = "󰅸 ";
+          dnd-none = "󰂜 ";
+          inhibited-notification = "󰅸 ";
+          inhibited-none = "󰂜 ";
+          dnd-inhibited-notification = "󰅸 ";
+          dnd-inhibited-none = "󰂜 ";
         };
-        "return-type" = "json";
-        "exec-if" = "which ${swaync}/bin/swaync-client";
-        "exec" = "${swaync}/bin/swaync-client -swb";
-        "on-click" = "${swaync}/bin/swaync-client -t -sw";
-        "on-click-right" = "${swaync}/bin/swaync-client -d -sw";
-        "escape" = true;
+        return-type = "json";
+        exec-if = "which ${swaync}/bin/swaync-client";
+        exec = "${swaync}/bin/swaync-client -swb";
+        on-click = "${swaync}/bin/swaync-client -t -sw";
+        on-click-right = "${swaync}/bin/swaync-client -d -sw";
+        escape = true;
       };
       "custom/weather" = let
         date-format = "%Y-%m-%d";
diff --git a/system/desktop.nix b/system/desktop.nix
index 75f7d468..ef59d3a6 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -48,6 +48,7 @@
   programs = {
     dconf.enable = true;
     light.enable = true;
+    nm-applet.enable = true;
     noisetorch.enable = true;
     kdeconnect.enable = true;
     file-roller.enable = true;