From dfb290a6c6a8e41acd57939b0135d3ea753aaa91 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Wed, 28 Aug 2024 21:18:54 +0200
Subject: [PATCH] nixos/services.rsnapshot: remove `with lib;`

---
 nixos/modules/services/backup/rsnapshot.nix | 23 +++++++++------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/services/backup/rsnapshot.nix b/nixos/modules/services/backup/rsnapshot.nix
index 6635a51ec2c6..aedb8acd60ac 100644
--- a/nixos/modules/services/backup/rsnapshot.nix
+++ b/nixos/modules/services/backup/rsnapshot.nix
@@ -1,7 +1,4 @@
 { config, lib, pkgs, ... }:
-
-with lib;
-
 let
   cfg = config.services.rsnapshot;
   cfgfile = pkgs.writeText "rsnapshot.conf" ''
@@ -22,21 +19,21 @@ in
 {
   options = {
     services.rsnapshot = {
-      enable = mkEnableOption "rsnapshot backups";
-      enableManualRsnapshot = mkOption {
+      enable = lib.mkEnableOption "rsnapshot backups";
+      enableManualRsnapshot = lib.mkOption {
         description = "Whether to enable manual usage of the rsnapshot command with this module.";
         default = true;
-        type = types.bool;
+        type = lib.types.bool;
       };
 
-      extraConfig = mkOption {
+      extraConfig = lib.mkOption {
         default = "";
         example = ''
           retains	hourly	24
           retain	daily	365
           backup	/home/	localhost/
         '';
-        type = types.lines;
+        type = lib.types.lines;
         description = ''
           rsnapshot configuration option in addition to the defaults from
           rsnapshot and this module.
@@ -49,10 +46,10 @@ in
         '';
       };
 
-      cronIntervals = mkOption {
+      cronIntervals = lib.mkOption {
         default = {};
         example = { hourly = "0 * * * *"; daily = "50 21 * * *"; };
-        type = types.attrsOf types.str;
+        type = lib.types.attrsOf lib.types.str;
         description = ''
           Periodicity at which intervals should be run by cron.
           Note that the intervals also have to exist in configuration
@@ -62,12 +59,12 @@ in
     };
   };
 
-  config = mkIf cfg.enable (mkMerge [
+  config = lib.mkIf cfg.enable (lib.mkMerge [
     {
       services.cron.systemCronJobs =
-        mapAttrsToList (interval: time: "${time} root ${pkgs.rsnapshot}/bin/rsnapshot -c ${cfgfile} ${interval}") cfg.cronIntervals;
+        lib.mapAttrsToList (interval: time: "${time} root ${pkgs.rsnapshot}/bin/rsnapshot -c ${cfgfile} ${interval}") cfg.cronIntervals;
     }
-    (mkIf cfg.enableManualRsnapshot {
+    (lib.mkIf cfg.enableManualRsnapshot {
       environment.systemPackages = [ pkgs.rsnapshot ];
       environment.etc."rsnapshot.conf".source = cfgfile;
     })