From 284c730809df28bda6c9724f1672c18a0e65f15a Mon Sep 17 00:00:00 2001 From: TheWanderingCrow Date: Fri, 13 Feb 2026 15:45:37 -0500 Subject: [PATCH] add netbird to mesh --- flake.lock | 62 ++++++++++----------- home/crow/common/optional/deferred-apps.nix | 1 + modules/services/mesh/client.nix | 32 +++++++++-- out | 0 4 files changed, 60 insertions(+), 35 deletions(-) delete mode 100644 out diff --git a/flake.lock b/flake.lock index 1cf2a39..54b0995 100644 --- a/flake.lock +++ b/flake.lock @@ -173,11 +173,11 @@ }, "hardware": { "locked": { - "lastModified": 1769302137, - "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=", + "lastModified": 1770882871, + "narHash": "sha256-nw5g+xl3veea+maxJ2/81tMEA/rPq9aF1H5XF35X+OE=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8", + "rev": "af04cb78aa85b2a4d1c15fc7270347e0d0eda97b", "type": "github" }, "original": { @@ -193,11 +193,11 @@ ] }, "locked": { - "lastModified": 1769580047, - "narHash": "sha256-tNqCP/+2+peAXXQ2V8RwsBkenlfWMERb+Uy6xmevyhM=", + "lastModified": 1770260404, + "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=", "owner": "nix-community", "repo": "home-manager", - "rev": "366d78c2856de6ab3411c15c1cb4fb4c2bf5c826", + "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b", "type": "github" }, "original": { @@ -290,11 +290,11 @@ ] }, "locked": { - "lastModified": 1768764703, - "narHash": "sha256-5ulSDyOG1U+1sJhkJHYsUOWEsmtLl97O0NTVMvgIVyc=", + "lastModified": 1770922915, + "narHash": "sha256-6J/JoK9iL7sHvKJcGW2KId2agaKv1OGypsa7kN+ZBD4=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "0fc4e7ac670a0ed874abacf73c4b072a6a58064b", + "rev": "6c5a56295d2a24e43bcd8af838def1b9a95746b2", "type": "github" }, "original": { @@ -311,11 +311,11 @@ ] }, "locked": { - "lastModified": 1770837448, - "narHash": "sha256-P+ZF6MeG7bs0vw+B9BjBbPHgZONakHnpM37dK8XG6LE=", + "lastModified": 1771177007, + "narHash": "sha256-0P1phXIPhugZHInG67fxrYTdcAFcHR0/MzdJchAIilQ=", "ref": "refs/heads/prod", - "rev": "6f6f33495aa2aeff3ce30cb79343c6d6dffc63fa", - "revCount": 193, + "rev": "b5ee6c5fca294ea42e833ef612657f72bd31d1d2", + "revCount": 194, "type": "git", "url": "ssh://git@github.com/TheWanderingCrow/nix-secrets" }, @@ -342,11 +342,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1769964605, - "narHash": "sha256-A+4YrtwtV9SH/qAvNeyVK6f8OEzCnm4loN37799g37I=", + "lastModified": 1770746255, + "narHash": "sha256-ZzMQ1deN/Ca0GapjGtvlCXPop/ZzFtolpb37KrDTgWo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "42932799ee7944f19932a69b34725978c767df6d", + "rev": "78d26d24b115f5df93835994696a30b20bb38c83", "type": "github" }, "original": { @@ -388,11 +388,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1769900590, - "narHash": "sha256-I7Lmgj3owOTBGuauy9FL6qdpeK2umDoe07lM4V+PnyA=", + "lastModified": 1770770419, + "narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "41e216c0ca66c83b12ab7a98cc326b5db01db646", + "rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a", "type": "github" }, "original": { @@ -404,11 +404,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1769789167, - "narHash": "sha256-kKB3bqYJU5nzYeIROI82Ef9VtTbu4uA3YydSk/Bioa8=", + "lastModified": 1770841267, + "narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62c8382960464ceb98ea593cb8321a2cf8f9e3e5", + "rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae", "type": "github" }, "original": { @@ -484,11 +484,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1769900590, - "narHash": "sha256-I7Lmgj3owOTBGuauy9FL6qdpeK2umDoe07lM4V+PnyA=", + "lastModified": 1770770419, + "narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "41e216c0ca66c83b12ab7a98cc326b5db01db646", + "rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a", "type": "github" }, "original": { @@ -573,11 +573,11 @@ }, "quadlet-nix": { "locked": { - "lastModified": 1769966843, - "narHash": "sha256-enKACLREiXH8VhFwENIk++gWfjmvNi5Gy5ZS3JTT9B4=", + "lastModified": 1770606362, + "narHash": "sha256-6pOOPOQr4rtgShBtkLkSDTql5rRqcUgTRz8O+axK2eM=", "owner": "SEIAROTg", "repo": "quadlet-nix", - "rev": "50f2317ae3ed8b72fa3011091f88965bfec42c6c", + "rev": "f4ae60350ea6015b6560cbd0e1f11f7e195c993d", "type": "github" }, "original": { @@ -654,11 +654,11 @@ ] }, "locked": { - "lastModified": 1769921679, - "narHash": "sha256-twBMKGQvaztZQxFxbZnkg7y/50BW9yjtCBWwdjtOZew=", + "lastModified": 1770683991, + "narHash": "sha256-xVfPvXDf9QN3Eh9dV+Lw6IkWG42KSuQ1u2260HKvpnc=", "owner": "mic92", "repo": "sops-nix", - "rev": "1e89149dcfc229e7e2ae24a8030f124a31e4f24f", + "rev": "8b89f44c2cc4581e402111d928869fe7ba9f7033", "type": "github" }, "original": { diff --git a/home/crow/common/optional/deferred-apps.nix b/home/crow/common/optional/deferred-apps.nix index 057ec43..c59af46 100644 --- a/home/crow/common/optional/deferred-apps.nix +++ b/home/crow/common/optional/deferred-apps.nix @@ -20,6 +20,7 @@ meshlab openscad freecad + blender # Local AI lmstudio # Dev diff --git a/modules/services/mesh/client.nix b/modules/services/mesh/client.nix index 980fad4..eccb3fc 100644 --- a/modules/services/mesh/client.nix +++ b/modules/services/mesh/client.nix @@ -3,15 +3,39 @@ inputs, pkgs, ... -}: let +}: +let sopsFolder = builtins.toString inputs.nix-secrets + "/sops"; -in { - sops.secrets."tailscale-key" = { - sopsFile = "${sopsFolder}/shared.yaml"; +in +{ + sops.secrets = { + "tailscale-key" = { + sopsFile = "${sopsFolder}/shared.yaml"; + }; + "netbird-key" = { + sopsFile = "${sopsFolder}/shared.yaml"; + owner = "netbird-blackbridge"; + group = "netbird-blackbridge"; + }; }; + services.tailscale = { enable = true; package = pkgs.unstable.tailscale; authKeyFile = config.sops.secrets."tailscale-key".path; }; + + services.netbird = { + package = pkgs.unstable.netbird; + + clients.blackbridge = { + login = { + enable = true; + setupKeyFile = config.sops.secrets."netbird-key".path; + }; + port = 51820; + openFirewall = true; + openInternalFirewall = true; + }; + }; } diff --git a/out b/out deleted file mode 100644 index e69de29..0000000