diff --git a/systems/x86_64-linux/attic/atticd.nix b/systems/x86_64-linux/sgx-attic/atticd.nix similarity index 90% rename from systems/x86_64-linux/attic/atticd.nix rename to systems/x86_64-linux/sgx-attic/atticd.nix index b24dd3b..912189c 100644 --- a/systems/x86_64-linux/attic/atticd.nix +++ b/systems/x86_64-linux/sgx-attic/atticd.nix @@ -31,13 +31,6 @@ listen = "[::]:8080"; - storage = { - type = "s3"; - bucket = "attic"; - region = "hel1"; - endpoint = "https://hel1.your-objectstorage.com"; - }; - # Data chunking # # Warning: If you change any of the values here, it will be diff --git a/systems/x86_64-linux/attic/default.nix b/systems/x86_64-linux/sgx-attic/default.nix similarity index 64% rename from systems/x86_64-linux/attic/default.nix rename to systems/x86_64-linux/sgx-attic/default.nix index a0d887c..896c57c 100644 --- a/systems/x86_64-linux/attic/default.nix +++ b/systems/x86_64-linux/sgx-attic/default.nix @@ -2,6 +2,8 @@ lib, ... }: +with lib; +with lib.metacfg; { imports = [ ./hardware-configuration.nix @@ -24,20 +26,14 @@ podman.dockerCompat = false; }; - # Legacy BIOS boot (Hetzner cloud instance) - boot.loader.systemd-boot.enable = lib.mkForce false; - boot.loader.efi.canTouchEfiVariables = lib.mkForce false; - boot.loader.grub.enable = true; - security.tpm2.enable = false; security.tpm2.abrmd.enable = false; - networking.wireless.enable = false; - networking.dhcpcd.IPv6rs = true; + networking.wireless.enable = false; # Enables wireless support via wpa_supplicant. networking.firewall.allowedTCPPorts = [ 8080 ]; networking.firewall.allowPing = true; powerManagement.cpuFreqGovernor = "ondemand"; - system.stateVersion = "25.11"; + system.stateVersion = "24.05"; } diff --git a/systems/x86_64-linux/attic/disko.nix b/systems/x86_64-linux/sgx-attic/disko.nix similarity index 73% rename from systems/x86_64-linux/attic/disko.nix rename to systems/x86_64-linux/sgx-attic/disko.nix index 35adb5f..dfc16fa 100644 --- a/systems/x86_64-linux/attic/disko.nix +++ b/systems/x86_64-linux/sgx-attic/disko.nix @@ -16,6 +16,15 @@ size = "1M"; type = "EF02"; # for grub MBR }; + ESP = { + size = "1G"; + type = "EF00"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + }; + }; root = { size = "100%"; content = { diff --git a/systems/x86_64-linux/attic/hardware-configuration.nix b/systems/x86_64-linux/sgx-attic/hardware-configuration.nix similarity index 95% rename from systems/x86_64-linux/attic/hardware-configuration.nix rename to systems/x86_64-linux/sgx-attic/hardware-configuration.nix index 056ac1b..d76795a 100644 --- a/systems/x86_64-linux/attic/hardware-configuration.nix +++ b/systems/x86_64-linux/sgx-attic/hardware-configuration.nix @@ -14,7 +14,7 @@ ./disko.nix (modulesPath + "/profiles/qemu-guest.nix") ]; - disko.devices.disk.main.device = "/dev/sda"; + disko.devices.disk.main.device = "/dev/vda"; boot.initrd.availableKernelModules = [ "ahci"