fix: use lib.recursiveUpdate where it is necessary

hosts/redshift/backups.nix

@@ -1,5 +1,6 @@
 {
   config,
+  lib,
   inputs,
   secretsDir,
   ...
@@ -65,7 +66,7 @@
           };
         };
       };
-      vps-prune = cfg.vps-backup // {
+      vps-prune = lib.recursiveUpdate cfg.vps-backup {
         backup = false;
         prune = true;
         createWrapper = false;

modules/home/persist/default.nix

@@ -4,7 +4,12 @@
   ...
 }:
 let
-  inherit (lib) mkOption mkEnableOption mkIf;
+  inherit (lib)
+    mkEnableOption
+    mkIf
+    mkOption
+    recursiveUpdate
+    ;
   inherit (lib.types) listOf path str;
   cfg = config.persist;
 in
@@ -31,11 +36,11 @@ in
         };
         # Stuff that matters
         # TODO backups
-        state = {
+        state = recursiveUpdate {
           # backup = {...};
-        } // common;
+        } common;
         # Stuff that's just there to speed up the system
-        cache = {
+        cache = recursiveUpdate {
           clean = {
             enable = mkEnableOption "cleaning the cache files and directories";
             dates = mkOption {
@@ -44,7 +49,7 @@ in
               description = "A systemd.time calendar description of when to clean the cache files";
             };
           };
-        } // common;
+        } common;
       };
     };
 

modules/nixos/persist/default.nix

@@ -16,6 +16,7 @@ let
     mkOption
     nameValuePair
     optionalAttrs
+    recursiveUpdate
     ;
   inherit (lib.types) listOf path str;
   inherit (builtins) concatMap;
@@ -46,11 +47,11 @@ in
         };
         # Stuff that matters
         # TODO backups
-        state = {
+        state = recursiveUpdate {
           # backup = {...};
-        } // common;
+        } common;
         # Stuff that's just there to speed up the system
-        cache = {
+        cache = recursiveUpdate {
           clean = {
             enable = mkEnableOption "cleaning the cache files and directories";
             dates = mkOption {
@@ -59,7 +60,7 @@ in
               description = "A systemd.time calendar description of when to clean the cache files";
             };
           };
-        } // common;
+        } common;
       };
     };