5 files changed, 83 insertions, 24 deletions

diff --git a/flake.lock b/flake.lock
index 64fbeb0..68e30b4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -90,6 +90,58 @@
         "type": "github"
       }
     },
+    "homebrew-felixkratz": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1780547371,
+        "narHash": "sha256-QGCVV5N1QC56GQK3ck2YJ6J6/S8SQ6rTElz69y58078=",
+        "owner": "FelixKratz",
+        "repo": "homebrew-formulae",
+        "rev": "70b2071488b61c14f773ce9e1bf6626ee851981a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "FelixKratz",
+        "repo": "homebrew-formulae",
+        "type": "github"
+      }
+    },
+    "homebrew-netbird": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1784299581,
+        "narHash": "sha256-gx50DPWWbLYRU/zn2JgEnlgU/nVsg3zXSY24+n0lvZ4=",
+        "owner": "netbirdio",
+        "repo": "homebrew-tap",
+        "rev": "f1a16c6dbb59951f87a5151d53245230f778e949",
+        "type": "github"
+      },
+      "original": {
+        "owner": "netbirdio",
+        "repo": "homebrew-tap",
+        "type": "github"
+      }
+    },
+    "netbird-tui": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1784513029,
+        "narHash": "sha256-m9sIguYjsuHz3IWwmNOlvuVTT0Cspe61Y9UyjM3pRVk=",
+        "ref": "refs/heads/main",
+        "rev": "efa74d02ad42ee7aeaf5c97240929063118c6252",
+        "revCount": 1,
+        "type": "git",
+        "url": "https://git.rschanz.org/netbird-tui-flake"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.rschanz.org/netbird-tui-flake"
+      }
+    },
     "nix-homebrew": {
       "inputs": {
         "brew-src": "brew-src"
@@ -146,6 +198,9 @@
         "home-manager": "home-manager",
         "homebrew-cask": "homebrew-cask",
         "homebrew-core": "homebrew-core",
+        "homebrew-felixkratz": "homebrew-felixkratz",
+        "homebrew-netbird": "homebrew-netbird",
+        "netbird-tui": "netbird-tui",
         "nix-homebrew": "nix-homebrew",
         "nixpkgs": "nixpkgs",
         "virby": "virby",
diff --git a/flake.nix b/flake.nix
index 5353cf8..023a368 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,7 +11,13 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    zen-browser = { # Used exclusively for HM module, Zen is installed via cask
+    # My packages
+    netbird-tui = {
+      url = "git+https://git.rschanz.org/netbird-tui-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    # End my packages
+    zen-browser = { # Used exclusively for HM module, Zen is installed via cask (on macos)
       url = "github:0xc000022070/zen-browser-flake";
       inputs = {
         nixpkgs.follows = "nixpkgs";
@@ -29,6 +35,14 @@
     };
     # Linux builder on macos
     virby.url = "github:quinneden/virby-nix-darwin";
+    homebrew-netbird = {
+      url = "github:netbirdio/homebrew-tap";
+      flake = false;
+    };
+    homebrew-felixkratz = {
+      url = "github:FelixKratz/homebrew-formulae";
+      flake = false;
+    };
   };
 
   outputs = { nixpkgs, home-manager, ... }@inputs: {
@@ -36,7 +50,8 @@
       system = "aarch64-darwin";
       specialArgs = { inherit inputs; };
       modules = [
-        { nixpkgs.config.allowUnfree = true; }
+        { nixpkgs.config.allowUnfree = true;
+          nixpkgs.overlays = [ inputs.netbird-tui.overlays.default ]; }
         inputs.virby.darwinModules.default
         ./hosts/RyanMac/configuration.nix
         home-manager.darwinModules.home-manager
diff --git a/hosts/RyanMac/configuration.nix b/hosts/RyanMac/configuration.nix
index 78f2cd4..e19490d 100644
--- a/hosts/RyanMac/configuration.nix
+++ b/hosts/RyanMac/configuration.nix
@@ -4,7 +4,10 @@ let
 
   defaultBrowser = "zen";
 
-  thirdPartyTaps = import ./taps.nix;
+  thirdPartyTaps = {
+    "netbirdio/homebrew-tap" = inputs.homebrew-netbird;
+    "FelixKratz/homebrew-formulae" = inputs.homebrew-felixkratz;
+  };
 
   pinnedNixpkgs = pkgs.writeText "flake-registry.json" (builtins.toJSON {
     version = 2;
@@ -164,7 +167,10 @@ in {
     enableRosetta = true;
     user = "${username}";
     mutableTaps = false;
-    taps = thirdPartyTaps;
+    taps = {
+        "homebrew/homebrew-core" = inputs.homebrew-core;
+        "homebrew/homebrew-cask" = inputs.homebrew-cask;
+    } // thirdPartyTaps;
     trust.taps = builtins.attrNames thirdPartyTaps;
   };
 
@@ -178,11 +184,9 @@ in {
 
     global.brewfile = true;
 
-    taps = builtins.attrNames thirdPartyTaps;
+    taps = builtins.attrNames config.nix-homebrew.taps;
 
-    brews = [
-    "mqttx-cli"
-    ];
+    brews = [ ];
 
     casks = [
       "utm"
diff --git a/hosts/RyanMac/taps.nix b/hosts/RyanMac/taps.nix
deleted file mode 100644
index 12235d8..0000000
--- a/hosts/RyanMac/taps.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "netbirdio/homebrew-tap" = builtins.fetchGit {
-      url = "https://github.com/netbirdio/homebrew-tap";
-      rev = "98a5d193c8d2c03b639aad03159004c64496c3e7";
-  };
-  
-  "FelixKratz/homebrew-formulae" = builtins.fetchGit {
-      url = "https://github.com/FelixKratz/homebrew-formulae";
-      rev = "70b2071488b61c14f773ce9e1bf6626ee851981a";
-  };
-  
-  "emqx/homebrew-mqttx" = builtins.fetchGit {
-      url = "https://github.com/emqx/homebrew-mqttx";
-      rev = "9889d741ba44940340d12dcad31fe867f62e7ea8";
-  };
-}
diff --git a/users/ryan/home.nix b/users/ryan/home.nix
index 2f1b138..6f17b18 100644
--- a/users/ryan/home.nix
+++ b/users/ryan/home.nix
@@ -148,6 +148,7 @@
     blender
     nerd-fonts.anonymice
     jujutsu
+    netbird-tui
   ];
 
   # Home Manager is pretty good at managing dotfiles. The primary way to manage