From 763ee4a89ba07daa6a9b09880de932ac1a72b2c7 Mon Sep 17 00:00:00 2001 From: Jermeiah S Date: Sat, 14 Jun 2025 06:30:36 -0400 Subject: [PATCH 1/3] hostplatform now set defaul --- modules/nixos/common/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/common/default.nix b/modules/nixos/common/default.nix index 5f2a314..349e378 100644 --- a/modules/nixos/common/default.nix +++ b/modules/nixos/common/default.nix @@ -6,7 +6,7 @@ ++ [ flake.inputs.disko.nixosModules.default ]; - + nixpkgs.hostPlatform = "x86_64-linux"; nixpkgs.overlays = [ flake.inputs.self.overlays.default ]; services.tailscale = { enable = true; From c900742f4497564c4b8f4affa8cc023b0f073170 Mon Sep 17 00:00:00 2001 From: Jermeiah S Date: Sat, 14 Jun 2025 06:30:53 -0400 Subject: [PATCH 2/3] minor config cleanup --- configurations/nixos/tofu/configuration.nix | 23 ++++++++++----------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/configurations/nixos/tofu/configuration.nix b/configurations/nixos/tofu/configuration.nix index 07354af..9cffaf7 100644 --- a/configurations/nixos/tofu/configuration.nix +++ b/configurations/nixos/tofu/configuration.nix @@ -1,19 +1,18 @@ { config, pkgs, ... }: { - - services.tty-ips.enable = true; - networking.yggdrasil = { - enable = true; - AllowedPublicKeys = [ - "d0e265fcf663451ae9bc048dc1297749819ce9d48042a986f2866c15a779a074" - ]; + services = { + tty-ips.enable = true; + }; + networking = { + yggdrasil = { + enable = true; + AllowedPublicKeys = [ + "d0e265fcf663451ae9bc048dc1297749819ce9d48042a986f2866c15a779a074" + ]; + }; + hostName = "smultiboi"; }; - nixpkgs.hostPlatform = "x86_64-linux"; - networking.hostName = "smultiboi"; environment.systemPackages = [ - # pkgs.otf ]; - # Used for backwards compatibility, please read the changelog before changing. - # $ darwin-rebuild changelog system.stateVersion = "25.05"; } From 09ed8c124416f1ad9f63cfa13bb17745b3c5ac7a Mon Sep 17 00:00:00 2001 From: Jermeiah S Date: Sat, 14 Jun 2025 06:32:00 -0400 Subject: [PATCH 3/3] removed need for configuration.nix keeps things simple --- configurations/nixos/tofu/configuration.nix | 18 ------------------ configurations/nixos/tofu/default.nix | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 18 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..ba256fa 100644 --- a/configurations/nixos/tofu/default.nix +++ b/configurations/nixos/tofu/default.nix @@ -12,4 +12,19 @@ in "${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"; }