From beb429d72d8813199c654bb28a8fef6ddb60aa57 Mon Sep 17 00:00:00 2001 From: Amanda Graven Date: Wed, 8 Jan 2025 19:45:36 +0100 Subject: [PATCH] Upgrade to nixos-24.11 --- config/hosts/rudiger/services/nextcloud.nix | 2 +- config/hosts/wind/services/vaultwarden.nix | 2 +- config/sources/nix/sources.json | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/config/hosts/rudiger/services/nextcloud.nix b/config/hosts/rudiger/services/nextcloud.nix index 940166a..9dcccc2 100644 --- a/config/hosts/rudiger/services/nextcloud.nix +++ b/config/hosts/rudiger/services/nextcloud.nix @@ -4,7 +4,7 @@ enable = true; hostName = "cloud.graven.dev"; https = true; - package = pkgs.nextcloud29; + package = pkgs.nextcloud30; autoUpdateApps.enable = true; maxUploadSize = "10G"; webfinger = true; diff --git a/config/hosts/wind/services/vaultwarden.nix b/config/hosts/wind/services/vaultwarden.nix index bf6c7d3..987466a 100644 --- a/config/hosts/wind/services/vaultwarden.nix +++ b/config/hosts/wind/services/vaultwarden.nix @@ -3,7 +3,7 @@ services.vaultwarden = { enable = true; environmentFile = config.secrets.files.vaultwarden_env.file; - backupDir = "/var/lib/bitwarden_rs/backup"; + backupDir = "/var/backup/vaultwarden"; config = { domain = "https://vault.graven.dev"; signupsAllowed = false; diff --git a/config/sources/nix/sources.json b/config/sources/nix/sources.json index 94d3284..3295cd2 100644 --- a/config/sources/nix/sources.json +++ b/config/sources/nix/sources.json @@ -17,22 +17,22 @@ "homepage": "", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e563803af3526852b6b1d77107a81908c66a9fcf", - "sha256": "12z4iq20kwrv1150k81pqiwijx008kwfmkvzhw957m8dmv2xnb91", + "rev": "4f339f6be2b61662f957c2ee9eda0fa597d8a6d6", + "sha256": "0hyq5q31asx6f48p88yzqc47mi1cj0v64qcmrdnh65xi6xylav84", "type": "tarball", - "url": "https://github.com/NixOS/nixos-hardware/archive/e563803af3526852b6b1d77107a81908c66a9fcf.tar.gz", + "url": "https://github.com/NixOS/nixos-hardware/archive/4f339f6be2b61662f957c2ee9eda0fa597d8a6d6.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { - "branch": "nixos-24.05", + "branch": "nixos-24.11", "description": "Nix Packages collection", "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7109b680d161993918b0a126f38bc39763e5a709", - "sha256": "16rv6mbq4bd0xlpm4fshx5mnx6rk01s19hby3ijjc4w5rngvnlkn", + "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", + "sha256": "10i7fllqjzq171afzhdf2d9r1pk9irvmq5n55h92rc47vlaabvr4", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/7109b680d161993918b0a126f38bc39763e5a709.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/3f0a8ac25fb674611b98089ca3a5dd6480175751.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixus": { @@ -41,10 +41,10 @@ "homepage": "", "owner": "Infinisil", "repo": "nixus", - "rev": "0aa59229988b741006743de6a64952bda85a3905", - "sha256": "129pvwr38vadwnd70mzp2lyavr7h1yh8jjk347lqqchsl4107zjb", + "rev": "f3010b72d15520cd9a9e87cc0e7a1f1f2727a5cf", + "sha256": "0cydhq2zh3bxnlj1cp18wnlhniz8z3nnjjjnwdm6936al4a9jy3b", "type": "tarball", - "url": "https://github.com/Infinisil/nixus/archive/0aa59229988b741006743de6a64952bda85a3905.tar.gz", + "url": "https://github.com/Infinisil/nixus/archive/f3010b72d15520cd9a9e87cc0e7a1f1f2727a5cf.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } }