nixos/netbird: switch to NixOS/nixpkgs#287236

Signed-off-by: Krzysztof Nazarewski <[email protected]>
nazarewk-iac · Feb 9, 2024 · eaba33c · eaba33c
1 parent f2c4413
commit eaba33c
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 231 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -44,10 +44,7 @@
     treefmt-nix.url = "github:numtide/treefmt-nix";
     ulauncher.inputs.flake-parts.follows = "flake-parts";
     ulauncher.inputs.nixpkgs.follows = "nixpkgs";
-    #ulauncher.url = "github:Ulauncher/Ulauncher/v6";
-    # TODO: fix errors in latest v6/mypy
-    ulauncher.url = "github:Ulauncher/Ulauncher/b5766869291816067397ca96b3f88f6fa4f24bf9";
-    # ulauncher.url = "github:nazarewk/Ulauncher/fix-nix-build";
+    ulauncher.url = "github:Ulauncher/Ulauncher/v6";
   };
 
   outputs =

diff --git a/modules/networking/netbird/default.nix b/modules/networking/netbird/default.nix
diff --git a/modules/profile/host/krul/default.nix b/modules/profile/host/krul/default.nix
@@ -96,8 +96,6 @@ in
       # 12G was not enough for large rebuild
       boot.tmp.tmpfsSize = "20%";
 
-      kdn.networking.netbird.instances.sc.firewall.tcp = [ 7080 ];
-
       # legacy mountpoints
       fileSystems = lib.mkMerge [
         (mkNixOSMount "/root" { at = "/"; })

diff --git a/modules/profile/machine/baseline/default.nix b/modules/profile/machine/baseline/default.nix
@@ -107,9 +107,7 @@ in
         "xhci_pci"
       ];
 
-      kdn.networking.netbird.instances.priv.port = 51819;
-      kdn.networking.netbird.instances.priv.autoStart = true;
-      kdn.networking.netbird.instances.priv.logLevel = "trace";
+      services.netbird.clients.priv.port = 51819;
 
       services.devmon.enable = false; # disable auto-mounting service devmon, it interferes with disko