From 9aa4b23b03bc3f58f9e5b85215ff68dedc876099 Mon Sep 17 00:00:00 2001 From: Jermeiah S Date: Sat, 14 Jun 2025 06:32:00 -0400 Subject: [PATCH 1/3] removed need for configuration.nix keeps things simple --- configurations/nixos/tofu/configuration.nix | 18 ------------------ configurations/nixos/tofu/default.nix | 16 +++++++++++++++- 2 files changed, 15 insertions(+), 19 deletions(-) delete mode 100644 configurations/nixos/tofu/configuration.nix diff --git a/configurations/nixos/tofu/configuration.nix b/configurations/nixos/tofu/configuration.nix deleted file mode 100644 index 9cffaf7..0000000 --- a/configurations/nixos/tofu/configuration.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config, pkgs, ... }: -{ - services = { - tty-ips.enable = true; - }; - networking = { - yggdrasil = { - enable = true; - AllowedPublicKeys = [ - "d0e265fcf663451ae9bc048dc1297749819ce9d48042a986f2866c15a779a074" - ]; - }; - hostName = "smultiboi"; - }; - environment.systemPackages = [ - ]; - system.stateVersion = "25.05"; -} diff --git a/configurations/nixos/tofu/default.nix b/configurations/nixos/tofu/default.nix index 0364f49..261b5e3 100644 --- a/configurations/nixos/tofu/default.nix +++ b/configurations/nixos/tofu/default.nix @@ -10,6 +10,20 @@ in imports = [ self.nixosModules.default "${modulesPath}/virtualisation/lxc-container.nix" - ./configuration.nix ]; + services = { + tty-ips.enable = true; + }; + networking = { + yggdrasil = { + enable = true; + AllowedPublicKeys = [ + "d0e265fcf663451ae9bc048dc1297749819ce9d48042a986f2866c15a779a074" + ]; + }; + hostName = "smultiboi"; + }; + environment.systemPackages = [ + ]; + system.stateVersion = "25.05"; } From 40fac75e36e22bcd4e90928f04df5046946a5d9f Mon Sep 17 00:00:00 2001 From: Jermeiah S Date: Sat, 14 Jun 2025 06:39:55 -0400 Subject: [PATCH 2/3] change hostname to match --- configurations/nixos/tofu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configurations/nixos/tofu/default.nix b/configurations/nixos/tofu/default.nix index 261b5e3..7d34c45 100644 --- a/configurations/nixos/tofu/default.nix +++ b/configurations/nixos/tofu/default.nix @@ -21,7 +21,7 @@ in "d0e265fcf663451ae9bc048dc1297749819ce9d48042a986f2866c15a779a074" ]; }; - hostName = "smultiboi"; + hostName = "tofu"; }; environment.systemPackages = [ ]; From a038b7c80c81c082ad835b76d90de732c5df302f Mon Sep 17 00:00:00 2001 From: Jermeiah S Date: Sat, 14 Jun 2025 06:40:14 -0400 Subject: [PATCH 3/3] add lxc specific configuration for incus --- modules/nixos/common/incus.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 modules/nixos/common/incus.nix diff --git a/modules/nixos/common/incus.nix b/modules/nixos/common/incus.nix new file mode 100644 index 0000000..00d4741 --- /dev/null +++ b/modules/nixos/common/incus.nix @@ -0,0 +1,21 @@ +{ + + systemd.network = { + enable = true; + networks."50-eth0" = { + + matchConfig.Name = "eth0"; + networkConfig = { + DHCP = "ipv4"; + IPv6AcceptRA = true; + }; + linkConfig.RequiredForOnline = "routable"; + }; + }; + + networking = { + dhcpcd.enable = false; + useDHCP = false; + useHostResolvConf = false; + }; +}