From 876d01a5d85e1c15449f207207b53ae295db08b3 Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Mon, 26 May 2025 16:26:27 +0200 Subject: [PATCH 1/2] generalize nspawn network config --- .../modules/virtualisation/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/hosts/thinkpad/modules/virtualisation/default.nix b/hosts/thinkpad/modules/virtualisation/default.nix index 4ea4724..e7b022e 100644 --- a/hosts/thinkpad/modules/virtualisation/default.nix +++ b/hosts/thinkpad/modules/virtualisation/default.nix @@ -27,20 +27,26 @@ virt-viewer podman-compose ]; - systemd.nspawn = { - n1 = { + systemd.nspawn = + let networkConfig = { Private = true; VirtualEthernet = true; Bridge = "br0"; }; - }; - n2 = { - networkConfig = { - Private = true; - VirtualEthernet = true; - Bridge = "br0"; + in + { + n1 = { + inherit networkConfig; + }; + n2 = { + inherit networkConfig; + }; + evpn1 = { + inherit networkConfig; + }; + evpn2 = { + inherit networkConfig; }; }; - }; } From 92b0c1fc43aa0ec841a757c85a10dcfc187c713b Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Wed, 21 May 2025 23:51:34 +0200 Subject: [PATCH 2/2] minor updates --- flake.lock | 12 ++++++------ shared/zsh.nix | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 09ba139..9468685 100644 --- a/flake.lock +++ b/flake.lock @@ -299,11 +299,11 @@ ] }, "locked": { - "lastModified": 1747565775, - "narHash": "sha256-B6jmKHUEX1jxxcdoYHl7RVaeohtAVup8o3nuVkzkloA=", + "lastModified": 1747978958, + "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "97118a310eb8e13bc1b9b12d67267e55b7bee6c8", + "rev": "7419250703fd5eb50e99bdfb07a86671939103ea", "type": "github" }, "original": { @@ -502,11 +502,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1747542820, - "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "github" }, "original": { diff --git a/shared/zsh.nix b/shared/zsh.nix index ee4a158..66b3a00 100644 --- a/shared/zsh.nix +++ b/shared/zsh.nix @@ -30,6 +30,7 @@ in atuin nmap killall + magic-wormhole ]; users.defaultUserShell = pkgs.zsh; programs.fzf = {