diff --git a/nix/hosts/eterna/base.nix b/nix/hosts/eterna/base.nix index b5f3cf89..be45ebae 100644 --- a/nix/hosts/eterna/base.nix +++ b/nix/hosts/eterna/base.nix @@ -26,7 +26,6 @@ k3s.enable = false; localeEnUs.enable = true; swap.enable = true; - vps.enable = true; wireguardK3s.enable = true; }; program = { diff --git a/nix/hosts/jubilife/base.nix b/nix/hosts/jubilife/base.nix index 9bd4bb7c..dfaa1b36 100644 --- a/nix/hosts/jubilife/base.nix +++ b/nix/hosts/jubilife/base.nix @@ -27,7 +27,6 @@ k3s.enable = true; localeEnUs.enable = true; swap.enable = true; - vps.enable = true; wireguardK3s.enable = true; }; program = { diff --git a/nix/hosts/pastoria/configuration.nix b/nix/hosts/pastoria/configuration.nix index 2f0362ce..08b48949 100644 --- a/nix/hosts/pastoria/configuration.nix +++ b/nix/hosts/pastoria/configuration.nix @@ -18,7 +18,6 @@ k3s.enable = true; localeEnUs.enable = true; swap.enable = true; - vps.enable = true; wireguardK3s.enable = true; }; @@ -37,13 +36,7 @@ inputs.disko.nixosModules.disko inputs.sops-nix.nixosModules.sops - ({ - modulesPath, - pkgs, - ... - }: { - imports = ["${modulesPath}/profiles/qemu-guest.nix"]; - + ({pkgs, ...}: { boot.loader.grub = { efiSupport = true; efiInstallAsRemovable = true; @@ -54,7 +47,6 @@ hostName = "pastoria"; }; - nixpkgs.hostPlatform = "x86_64-linux"; system = { stateVersion = "26.05"; autoUpgrade.dates = "01:45"; diff --git a/nix/hosts/snowpoint/configuration.nix b/nix/hosts/snowpoint/configuration.nix index b5478532..39f1c58e 100644 --- a/nix/hosts/snowpoint/configuration.nix +++ b/nix/hosts/snowpoint/configuration.nix @@ -21,7 +21,6 @@ mediaShare.enable = true; observability.enable = true; swap.enable = true; - vps.enable = true; wireguardK3s.enable = true; }; service = { @@ -40,21 +39,16 @@ inputs.disko.nixosModules.disko inputs.sops-nix.nixosModules.sops ({ - modulesPath, config, self, ... }: { - imports = ["${modulesPath}/profiles/qemu-guest.nix"]; - boot.loader.grub = { efiSupport = true; efiInstallAsRemovable = true; }; - fileSystems = {}; networking.hostName = "snowpoint"; - nixpkgs.hostPlatform = "x86_64-linux"; system = { stateVersion = "25.11"; autoUpgrade.dates = "03:30"; diff --git a/nix/nixos/base/default.nix b/nix/nixos/base/default.nix index 9ea7366d..58836030 100644 --- a/nix/nixos/base/default.nix +++ b/nix/nixos/base/default.nix @@ -7,6 +7,11 @@ options.myNixOs.profile.base.enable = lib.mkEnableOption "base system configuration"; config = lib.mkIf config.myNixOs.profile.base.enable { + documentation = { + enable = false; + nixos.enable = false; + }; + environment.etc."nixos".source = self; hardware.enableAllFirmware = true; @@ -15,6 +20,15 @@ services = { fstrim.enable = true; + + journald = { + storage = "persistent"; + extraConfig = '' + SystemMaxUse=500M + MaxRetentionSec=1week + ''; + }; + timesyncd.enable = true; }; diff --git a/nix/nixos/profiles/vps.nix b/nix/nixos/profiles/vps.nix deleted file mode 100644 index 4a4fe1fa..00000000 --- a/nix/nixos/profiles/vps.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - config, - lib, - ... -}: { - options.myNixOs.profile.vps.enable = lib.mkEnableOption "VPS defaults"; - - config = lib.mkIf config.myNixOs.profile.vps.enable { - documentation = { - enable = false; - nixos.enable = false; - }; - - services.journald = { - storage = "persistent"; - - extraConfig = '' - SystemMaxUse=500M - MaxRetentionSec=1week - ''; - }; - }; -}