diff --git a/flake.lock b/flake.lock index 9ba50c8..294f935 100644 --- a/flake.lock +++ b/flake.lock @@ -75,11 +75,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1655096306, - "narHash": "sha256-3B3zBaQVLL956deZgmucouvkZroObQ4JKHzbIfFS9/c=", + "lastModified": 1656754140, + "narHash": "sha256-8thJUtZWIimyBtkYQ0tdmmnH0yJvOaw1K5W3OgKc6/A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a119e218ad27bea32057a3463e3694a61c9e3802", + "rev": "09c32b0bda4db98d6454e910206188e85d5b04cc", "type": "github" }, "original": { @@ -105,11 +105,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1655043425, - "narHash": "sha256-A+oT+aQGhW5lXy8H0cqBLsYtgcnT5glmGOXWQDcGw6I=", + "lastModified": 1656753965, + "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "914ef51ffa88d9b386c71bdc88bffc5273c08ada", + "rev": "0ea7a8f1b939d74e5df8af9a8f7342097cdf69eb", "type": "github" }, "original": { diff --git a/systems/LoutreOS/configuration.nix b/systems/LoutreOS/configuration.nix index cf299f5..28e111c 100644 --- a/systems/LoutreOS/configuration.nix +++ b/systems/LoutreOS/configuration.nix @@ -32,7 +32,10 @@ services.zfs = { autoSnapshot.enable = true; - autoScrub.enable = true; + autoScrub = { + enable = true; + interval = "monthly"; + }; }; hardware.usbWwan.enable = true; diff --git a/systems/LoutreOS/medias.nix b/systems/LoutreOS/medias.nix index c0bf930..60193b4 100644 --- a/systems/LoutreOS/medias.nix +++ b/systems/LoutreOS/medias.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, inputs, ... }: { services = { @@ -22,7 +22,7 @@ jellyfin = { enable = true; - package = pkgs.jellyfin; + package = inputs.nixpkgs-unstable.legacyPackages.x86_64-linux.jellyfin; }; navidrome = { diff --git a/systems/LoutreOS/monitoring.nix b/systems/LoutreOS/monitoring.nix index 29915d2..a2120f0 100644 --- a/systems/LoutreOS/monitoring.nix +++ b/systems/LoutreOS/monitoring.nix @@ -7,7 +7,7 @@ in services = { smartd = { enable = true; - defaults.monitored = "-a -o on -s (S/../.././02|L/../../1/04)"; + defaults.monitored = "-a -o on -s (S/../.././02|L/../15/./02)"; notifications.mail = { enable = true; recipient = "paul@nyanlout.re"; diff --git a/systems/LoutreOS/services.nix b/systems/LoutreOS/services.nix index 71d4ca5..2411cb4 100644 --- a/systems/LoutreOS/services.nix +++ b/systems/LoutreOS/services.nix @@ -169,11 +169,6 @@ in readWritePaths = [ "/var/lib/postfix/queue/maildrop" ]; postHook = '' ${pkgs.zfs}/bin/zfs destroy loutrepool/var/postgresql@borgsnap - if [[ $exitStatus == 0 ]]; then - ${pkgs.rclone}/bin/rclone --config /mnt/secrets/rclone_loutre.conf sync -v $BORG_REPO BackupStorage:default - else - ${backup_mail_alert}/bin/mail.sh - fi ''; }; }; diff --git a/systems/LoutreOS/web.nix b/systems/LoutreOS/web.nix index 8055900..ce8599f 100644 --- a/systems/LoutreOS/web.nix +++ b/systems/LoutreOS/web.nix @@ -300,6 +300,7 @@ in postgresql = { enable = true; + package = pkgs.postgresql_14; settings = { full_page_writes = false; };