From 8c1eadf4748fa4f425de3eeae36ab3c5dbabf52e Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 25 Mar 2026 09:33:32 +0100 Subject: [PATCH] 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"