From 9b2e40d47ba4ffe7c62076dff4cfeba96d744562 Mon Sep 17 00:00:00 2001 From: Patrick Date: Fri, 3 Jan 2025 00:31:36 +0100 Subject: [PATCH] feat: unify interface naming --- config/services/netbird.nix | 2 +- flake.lock | 13 +++++++------ hosts/nucnix/guests.nix | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/config/services/netbird.nix b/config/services/netbird.nix index 255014a..83010fb 100644 --- a/config/services/netbird.nix +++ b/config/services/netbird.nix @@ -17,7 +17,7 @@ networking.nftables.chains.forward.from-netbird = { after = [ "conntrack" ]; rules = [ - "iifname nb-main oifname mv-lan accept" + "iifname nb-main oifname { lan-home, lan-services } accept" ]; }; diff --git a/flake.lock b/flake.lock index 90cbc41..ee694b0 100644 --- a/flake.lock +++ b/flake.lock @@ -1753,12 +1753,13 @@ "pre-commit-hooks": "pre-commit-hooks_5" }, "locked": { - "lastModified": 1734643696, - "narHash": "sha256-W5JSWhhThI9erzhZmpHy1gZGwSxEGPKYmOUBEXH/WGA=", - "owner": "oddlama", - "repo": "nixos-extra-modules", - "rev": "6a4736e0773a1852b0b6c5f71cbe96dd39c3caf1", - "type": "github" + "lastModified": 1735860340, + "narHash": "sha256-8bgRXOHpLmgUHmg6CKFnm6LJzIdInDzE6wO+OotedCI=", + "ref": "refs/heads/main", + "rev": "2502ff50abc8e29606824ac4e67d4a5279b1cb0d", + "revCount": 41, + "type": "git", + "url": "file:///home/patrick/repos/nix/nixos-extra-modules" }, "original": { "owner": "oddlama", diff --git a/hosts/nucnix/guests.nix b/hosts/nucnix/guests.nix index cc14e3a..6ad9c11 100644 --- a/hosts/nucnix/guests.nix +++ b/hosts/nucnix/guests.nix @@ -75,7 +75,7 @@ in backend = "microvm"; microvm = { system = "x86_64-linux"; - interfaces = listToAttrs (flip map vlans (x: (nameValuePair "lan-${x}" { }))); + interfaces = listToAttrs (flip map vlans (x: (nameValuePair "mv-${x}" { hostLink = "lan-${x}"; }))); baseMac = config.secrets.secrets.local.networking.interfaces.lan01.mac; }; extraSpecialArgs = {