From 8c1eadf4748fa4f425de3eeae36ab3c5dbabf52e Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 25 Mar 2026 09:33:32 +0100 Subject: [PATCH 1/3] feat(attic): update storage config and refine system settings - Switch disk device from `/dev/vda` to `/dev/sda` for compatibility. - Add S3 storage configuration with bucket, region, and endpoint. - Update system state version from `24.05` to `25.11`. - Remove unused imports and clean up redundant attributes. --- systems/x86_64-linux/{sgx-attic => attic}/atticd.nix | 7 +++++++ systems/x86_64-linux/{sgx-attic => attic}/default.nix | 7 ++----- systems/x86_64-linux/{sgx-attic => attic}/disko.nix | 0 .../{sgx-attic => attic}/hardware-configuration.nix | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) rename systems/x86_64-linux/{sgx-attic => attic}/atticd.nix (90%) rename systems/x86_64-linux/{sgx-attic => attic}/default.nix (78%) rename systems/x86_64-linux/{sgx-attic => attic}/disko.nix (100%) rename systems/x86_64-linux/{sgx-attic => attic}/hardware-configuration.nix (95%) diff --git a/systems/x86_64-linux/sgx-attic/atticd.nix b/systems/x86_64-linux/attic/atticd.nix similarity index 90% rename from systems/x86_64-linux/sgx-attic/atticd.nix rename to systems/x86_64-linux/attic/atticd.nix index 912189c..b24dd3b 100644 --- a/systems/x86_64-linux/sgx-attic/atticd.nix +++ b/systems/x86_64-linux/attic/atticd.nix @@ -31,6 +31,13 @@ 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/sgx-attic/default.nix b/systems/x86_64-linux/attic/default.nix similarity index 78% rename from systems/x86_64-linux/sgx-attic/default.nix rename to systems/x86_64-linux/attic/default.nix index 896c57c..e893adf 100644 --- a/systems/x86_64-linux/sgx-attic/default.nix +++ b/systems/x86_64-linux/attic/default.nix @@ -1,9 +1,6 @@ { - lib, ... }: -with lib; -with lib.metacfg; { imports = [ ./hardware-configuration.nix @@ -29,11 +26,11 @@ with lib.metacfg; security.tpm2.enable = false; security.tpm2.abrmd.enable = false; - networking.wireless.enable = false; # Enables wireless support via wpa_supplicant. + networking.wireless.enable = false; networking.firewall.allowedTCPPorts = [ 8080 ]; networking.firewall.allowPing = true; powerManagement.cpuFreqGovernor = "ondemand"; - system.stateVersion = "24.05"; + system.stateVersion = "25.11"; } diff --git a/systems/x86_64-linux/sgx-attic/disko.nix b/systems/x86_64-linux/attic/disko.nix similarity index 100% rename from systems/x86_64-linux/sgx-attic/disko.nix rename to systems/x86_64-linux/attic/disko.nix diff --git a/systems/x86_64-linux/sgx-attic/hardware-configuration.nix b/systems/x86_64-linux/attic/hardware-configuration.nix similarity index 95% rename from systems/x86_64-linux/sgx-attic/hardware-configuration.nix rename to systems/x86_64-linux/attic/hardware-configuration.nix index d76795a..056ac1b 100644 --- a/systems/x86_64-linux/sgx-attic/hardware-configuration.nix +++ b/systems/x86_64-linux/attic/hardware-configuration.nix @@ -14,7 +14,7 @@ ./disko.nix (modulesPath + "/profiles/qemu-guest.nix") ]; - disko.devices.disk.main.device = "/dev/vda"; + disko.devices.disk.main.device = "/dev/sda"; boot.initrd.availableKernelModules = [ "ahci" From f2cc00419200de09f0864604f7ad7369fd7eb552 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 25 Mar 2026 09:59:46 +0100 Subject: [PATCH 2/3] feat(attic): remove ESP partition and enable GRUB for legacy boot MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Remove the ESP partition configuration in `disko.nix` as it’s unnecessary for legacy BIOS setups. - Enable GRUB bootloader and disable EFI settings in `default.nix` for compatibility with Hetzner cloud instances. --- systems/x86_64-linux/attic/default.nix | 6 ++++++ systems/x86_64-linux/attic/disko.nix | 9 --------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/systems/x86_64-linux/attic/default.nix b/systems/x86_64-linux/attic/default.nix index e893adf..491f1c3 100644 --- a/systems/x86_64-linux/attic/default.nix +++ b/systems/x86_64-linux/attic/default.nix @@ -1,4 +1,5 @@ { + lib, ... }: { @@ -23,6 +24,11 @@ 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; diff --git a/systems/x86_64-linux/attic/disko.nix b/systems/x86_64-linux/attic/disko.nix index dfc16fa..35adb5f 100644 --- a/systems/x86_64-linux/attic/disko.nix +++ b/systems/x86_64-linux/attic/disko.nix @@ -16,15 +16,6 @@ size = "1M"; type = "EF02"; # for grub MBR }; - ESP = { - size = "1G"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - }; - }; root = { size = "100%"; content = { From 95bc8f3c705e3c2b4d66bdbd42956bb1fa7a8296 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 25 Mar 2026 10:04:11 +0100 Subject: [PATCH 3/3] feat(attic): enable IPv6 router solicitation via dhcpcd - Set `networking.dhcpcd.IPv6rs` to `true` in `default.nix` to support IPv6 router solicitation. - Ensures better compatibility with networks requiring IPv6 RA for configuration. --- systems/x86_64-linux/attic/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/systems/x86_64-linux/attic/default.nix b/systems/x86_64-linux/attic/default.nix index 491f1c3..a0d887c 100644 --- a/systems/x86_64-linux/attic/default.nix +++ b/systems/x86_64-linux/attic/default.nix @@ -33,6 +33,7 @@ security.tpm2.abrmd.enable = false; networking.wireless.enable = false; + networking.dhcpcd.IPv6rs = true; networking.firewall.allowedTCPPorts = [ 8080 ]; networking.firewall.allowPing = true;