diff --git a/flake.lock b/flake.lock index 2389220..e5cb1d9 100644 --- a/flake.lock +++ b/flake.lock @@ -815,11 +815,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1730919458, - "narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=", + "lastModified": 1731332224, + "narHash": "sha256-0ctfVp27ingWtY7dbP5+QpSQ98HaOZleU0teyHQUAw0=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "e1cc1f6483393634aee94514186d21a4871e78d7", + "rev": "184687ae1a3139faa4746168baf071f60d0310c8", "type": "github" }, "original": { @@ -977,11 +977,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1731281996, - "narHash": "sha256-xdNFY/wcs8i9qluVbTAVh5JLlhI/r4JJfXb0yfEj1Ks=", + "lastModified": 1731356813, + "narHash": "sha256-w0TJwJwZd9so/chWYFFEtOQdnXTCvmNXIHs1FWJDlMM=", "owner": "nix-community", "repo": "nixvim", - "rev": "57068f532d5d42601fd74e2b531204fe1cd3a8f2", + "rev": "c892aa20732f982d4cc2b3ef2e2276a2a9a4d45b", "type": "github" }, "original": { @@ -1059,11 +1059,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1731213149, - "narHash": "sha256-jR8i6nFLmSmm0cIoeRQ8Q4EBARa3oGaAtEER/OMMxus=", + "lastModified": 1731364708, + "narHash": "sha256-HC0anOL+KmUQ2hdRl0AtunbAckasxrkn4VLmxbW/WaA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f1675e3b0e1e663a4af49be67ecbc9e749f85eb7", + "rev": "4c91d52db103e757fc25b58998b0576ae702d659", "type": "github" }, "original": { diff --git a/modules/restic/default.nix b/modules/restic/default.nix index fa6640c..6b7d1f5 100644 --- a/modules/restic/default.nix +++ b/modules/restic/default.nix @@ -56,6 +56,11 @@ in { initialize = true; repository = "sftp:${cfg.remoteUser}@${cfg.remote}:${cfg.repo}"; passwordFile = config.sops.secrets."restic/${cfg.remoteUser}/password".path; + extraBackupArgs = [ + "--compression=max" + "--pack-size=128" + "--read-concurrency=8" + ]; extraOptions = let knownHost = pkgs.writeText "${cfg.remote}-known-host" (builtins.readFile ./${cfg.remote}/ssh_host_ed25519_key.pub); sshKey = config.sops.secrets."restic/${cfg.remoteUser}/id_ed25519".path; diff --git a/pkgs/update-nixfiles/update-nixfiles.sh b/pkgs/update-nixfiles/update-nixfiles.sh index d9f04cd..02e6fbb 100644 --- a/pkgs/update-nixfiles/update-nixfiles.sh +++ b/pkgs/update-nixfiles/update-nixfiles.sh @@ -59,15 +59,17 @@ wait_for_hydra () { local counter counter=0 git_rev="$(git -C "${1}/nixfiles" rev-parse update-inputs)" - while true; do + while [[ $counter -lt 180 ]]; do + counter=$((counter +1)) hydra_rev="$(curl -s -L -H "Accept: application/json" "${2}/evals" | jq -r '.evals | max_by(.id) | .flake' | sed -E "s/.+&rev=(.*)/\1/g")" if [[ "${git_rev}" == "${hydra_rev}" ]]; then echo "Hydra got new commit" break fi - sleep 30 + sleep 5 done - if [[ $counter -ge 30 ]]; then + + if [[ $counter -ge 180 ]]; then echo "Hydra no workey" exit 1 fi