Change to fully be flakes (for homebrew) and install netbird-tuiHEADmain

2 files changed, 10 insertions, 22 deletions

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";
-  };
-}