From 0c7cafdc17ecd7a42427115998d5f0b9ff4f03cb Mon Sep 17 00:00:00 2001 From: Nathan Date: Tue, 21 Apr 2026 22:16:02 -0500 Subject: [PATCH] netbird unstable --- flake.lock | 6 +++--- profiles/homebox/default.nix | 4 ++++ profiles/iso/default.nix | 15 --------------- system/services/netbird/default.nix | 21 +++++++++++++++------ 4 files changed, 22 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index b62bfb8..147809c 100644 --- a/flake.lock +++ b/flake.lock @@ -663,11 +663,11 @@ }, "nixpkgs-us": { "locked": { - "lastModified": 1775710090, - "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", + "lastModified": 1776548001, + "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4c1018dae018162ec878d42fec712642d214fdfa", + "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", "type": "github" }, "original": { diff --git a/profiles/homebox/default.nix b/profiles/homebox/default.nix index 17a1967..8991c47 100644 --- a/profiles/homebox/default.nix +++ b/profiles/homebox/default.nix @@ -49,6 +49,10 @@ }; }; + services.netbird.clients.default.environment = { + NB_EXTRA_DNS_LABELS = "server"; + }; + sysconfig = { remoteBuildHost = true; graphical = false; diff --git a/profiles/iso/default.nix b/profiles/iso/default.nix index 60e7aae..fd7eedc 100644 --- a/profiles/iso/default.nix +++ b/profiles/iso/default.nix @@ -86,24 +86,9 @@ programs = { #steam.enable = true; - hyprpanel.enable = true; hyprland.enable = true; }; - - - virtualization = { - - wyoming = { - enable = false; - }; - - homeassistant = { - enable = false; - }; - }; }; - - }; }; } diff --git a/system/services/netbird/default.nix b/system/services/netbird/default.nix index 198dc32..547d361 100644 --- a/system/services/netbird/default.nix +++ b/system/services/netbird/default.nix @@ -17,13 +17,22 @@ in lib.mkIf config.sysconfig.services.netbird.enable { services.netbird = { - enable = config.sysconfig.services.netbird.enable; - ui = { - enable = true; - #package = pkgs-us.netbird-ui; - #package = pkgs.netbird-ui; + enable = lib.mkDefault config.sysconfig.services.netbird.enable; + + clients.default = { + port = 51820; + name = "netbird"; + interface = "wt0"; + hardened = false; + + ui = { + enable = lib.mkDefault config.sysconfig.graphical; + #package = pkgs-us.netbird-ui; + #package = pkgs.netbird-ui; + }; }; - package = pkgs-us.netbird; + + package = pkgs-us.netbird; #package = pkgs.netbird; }; };