From a5c1af785ca7624d577aa5b039f75a766679f0b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Numbus?= Date: Wed, 31 Dec 2025 16:53:33 +0100 Subject: [PATCH] Fixed spindown.nix and disko.nix --- deploy.sh | 8 ++++++-- templates/nix-config/disks/spindown.nix | 10 +++++++++- templates/nix-config/flake.nix | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/deploy.sh b/deploy.sh index 6f267c4..f176d84 100644 --- a/deploy.sh +++ b/deploy.sh @@ -515,7 +515,7 @@ EOF done echo -e "\n✅ Generated $CONTENT_DISK_NUMBER data disk configuration(s)." j=0 - for i in $(seq $PARITY_DISK_NUMBER $((${#DATA_DISKS_ID[@]} - 1))); do + for i in $(seq $CONTENT_DISK_NUMBER $((${#DATA_DISKS_ID[@]} - 1))); do export j=$((j + 1)) export PARITY_DISK_ID="${DATA_DISKS_ID[${i}]}" (envsubst < "templates/nix-config/disks/parity.nix") >> final-nix-config/etc/nixos/disks/disko.nix @@ -551,7 +551,11 @@ EOF done if [[ -n "${DISK_ID_LIST[@]}" ]]; then cp -avu templates/nix-config/disks/spindown.nix final-nix-config/etc/nixos/disks/ - sed -i "s|DISK_ID_LIST|${DISK_ID_LIST[*]}|" final-nix-config/etc/nixos/disks/spindown.nix + local FORMATTED_DISKS="" + for disk in "${DISK_ID_LIST[@]}"; do + FORMATTED_DISKS+=" \"$disk\"\n" + done + sed -i "s|DISK_ID_LIST|${FORMATTED_DISKS}|" final-nix-config/etc/nixos/disks/spindown.nix echo -e "\n✅ Disk spindown configuration created." fi fi diff --git a/templates/nix-config/disks/spindown.nix b/templates/nix-config/disks/spindown.nix index 5891797..e8b0e6f 100644 --- a/templates/nix-config/disks/spindown.nix +++ b/templates/nix-config/disks/spindown.nix @@ -1,5 +1,12 @@ { config, pkgs, lib, ... }: +let + hardDrives = [ + "DISK_LIST" + ]; +in + +{ ### --> Disk spindown systemd.services.hd-idle = { description = "External HD spin down daemon"; @@ -14,4 +21,5 @@ "${pkgs.hd-idle}/bin/hd-idle -i 0 ${hardDriveParameter}"; }; }; -### Disk spindown <-- \ No newline at end of file +### Disk spindown <-- +} \ No newline at end of file diff --git a/templates/nix-config/flake.nix b/templates/nix-config/flake.nix index afd20fd..b4404cd 100644 --- a/templates/nix-config/flake.nix +++ b/templates/nix-config/flake.nix @@ -9,7 +9,7 @@ sops-nix.url = "github:Mic92/sops-nix"; sops-nix.inputs.nixpkgs.follows = "nixpkgs"; # Power savings - autoaspm.url = "github:notthebee/AutoASPM"; + autoaspm.url = "git+https://git.notthebe.ee/notthebee/AutoASPM"; autoaspm.inputs.nixpkgs.follows = "nixpkgs"; };