From 0b47ad3ed64abf74baf58fb7a22fbf2901fc3cf1 Mon Sep 17 00:00:00 2001
From: Matt Nish-Lapidus <matt@emenel.ca>
Date: Tue, 29 Apr 2025 17:35:06 -0400
Subject: [PATCH] impala and iwd

---
 flake.lock                    | 33 +++++++++++++++++++++++++++------
 flake.nix                     |  5 +++++
 hosts/eddie/configuration.nix |  9 +++++++--
 modules/home/shell-conf.nix   |  3 +++
 modules/home/waybar.nix       | 13 ++++++-------
 5 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/flake.lock b/flake.lock
index ef3f69e..8592455 100644
--- a/flake.lock
+++ b/flake.lock
@@ -653,6 +653,26 @@
         "type": "github"
       }
     },
+    "impala": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1739828115,
+        "narHash": "sha256-a7IgIGkXcWX81nFcoQ3Q/lbBdBpoD60EMxwuTj/JqJU=",
+        "owner": "pythops",
+        "repo": "impala",
+        "rev": "008b36f6b650a694f08f0d83fc8a109c33395533",
+        "type": "github"
+      },
+      "original": {
+        "owner": "pythops",
+        "repo": "impala",
+        "type": "github"
+      }
+    },
     "isd": {
       "inputs": {
         "nix-appimage": "nix-appimage",
@@ -910,11 +930,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1745907084,
-        "narHash": "sha256-Q8SpDbTI95vtKXgNcVl1VdSUhhDOORE8R77wWS2rmg8=",
+        "lastModified": 1745955289,
+        "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "f1e52a018166e1a324f832de913e12c0e55792d0",
+        "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b",
         "type": "github"
       },
       "original": {
@@ -1173,6 +1193,7 @@
         "home-manager": "home-manager",
         "hypridle": "hypridle",
         "hyprlock": "hyprlock",
+        "impala": "impala",
         "isd": "isd",
         "musnix": "musnix",
         "nh": "nh",
@@ -1587,11 +1608,11 @@
         "rust-overlay": "rust-overlay_3"
       },
       "locked": {
-        "lastModified": 1745943869,
-        "narHash": "sha256-hpeirSrnaUXAH6Pmaafz+acBkAf38q8DOkhOG3m4alc=",
+        "lastModified": 1745949878,
+        "narHash": "sha256-onlrbPFAwo/xm5hSE3lq6q9USkGsJ+xLi+Z2QncAA8c=",
         "owner": "sxyazi",
         "repo": "yazi",
-        "rev": "fbf8345d90502ef4fa4bee099c0e8fd1ec6ea859",
+        "rev": "9d92cdbf79de530de11e66a2fabd0537e8249eb9",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 3de762f..c80ceb2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -98,6 +98,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    impala = {
+      url = "github:pythops/impala";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     # emenel-templates.url = "git+ssh://git@gt.emenel.ca/emenel/nix-flake-templates";
     # nix-way-templates.url = "github:the-nix-way/dev-templates";
 
diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix
index 5651ace..85ec07f 100644
--- a/hosts/eddie/configuration.nix
+++ b/hosts/eddie/configuration.nix
@@ -141,7 +141,6 @@
     ddcutil
     greetd.tuigreet
     bluez-tools
-    bluetuith
     qemu
     quickemu
     borgbackup
@@ -371,9 +370,15 @@
       "2620:fe::fe"
       "2620:fe::9"
     ];
+    wireless.iwd = {
+      enable = true;
+    };
     networkmanager = {
       enable = true;
-      wifi.powersave = true;
+      wifi = {
+        powersave = true;
+        backend = "iwd";
+      };
     };
   };
 
diff --git a/modules/home/shell-conf.nix b/modules/home/shell-conf.nix
index c9f8289..9294b2f 100644
--- a/modules/home/shell-conf.nix
+++ b/modules/home/shell-conf.nix
@@ -4,6 +4,8 @@
   home.packages = with pkgs; [
     inputs.isd.packages.x86_64-linux.default
 
+    inputs.impala.packages.x86_64-linux.default
+
     cmake
     cmake-format
 
@@ -56,6 +58,7 @@
     rink
 
     dua
+    bluetui
 
     tree
     emoji-picker
diff --git a/modules/home/waybar.nix b/modules/home/waybar.nix
index e7dd403..2525f0c 100644
--- a/modules/home/waybar.nix
+++ b/modules/home/waybar.nix
@@ -38,7 +38,7 @@ in {
           "format" = "";
           "format-off" = "";
           "format-disabled" = "!";
-          "on-click" = "$HOME/.local/bin/wezapp bluetuith";
+          "on-click" = "$HOME/.local/bin/wezapp bluetui";
           "tooltip-format" = "{status}";
         };
 
@@ -105,7 +105,7 @@ in {
           "format-disconnected" = "󰱟";
           "tooltip-format" = "{essid} {ifname}";
           "max-length" = 50;
-          "on-click" = "$HOME/.local/bin/wezlauncher nmtui";
+          "on-click" = "$HOME/.local/bin/wezapp impala";
         };
 
         "tray" = {
@@ -131,10 +131,6 @@ in {
         };
 
         "mpris" = {
-          # "dynamic-order" = ["title"
-          #                    "artist"
-          #                    "album"
-          #                    "length"];
           "interval" = 1;
           "format" = "{player_icon} {dynamic}";
           "format-paused" = "{status_icon} <i>{dynamic}</i>";
@@ -231,7 +227,6 @@ window#waybar {
 #pulseaudio,
 #wireplumber,
 #disk,
-#memory,
 #taskbar
 #cpu,
 #temperature,
@@ -248,6 +243,10 @@ window#waybar {
   padding: 0 20px;
 }
 
+#memory {
+  padding: 0 20px 0 10px;
+}
+
 #battery {
   padding-right: 0;
 }