From a2e269bc377a1c24fbadf86eebc9b079d9029dc9 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sat, 24 Aug 2024 22:05:39 +0200
Subject: [PATCH] nixos/services.bees: remove `with lib;`

---
 nixos/modules/services/misc/bees.nix | 37 +++++++++++++---------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/nixos/modules/services/misc/bees.nix b/nixos/modules/services/misc/bees.nix
index a0fd3cd43d62..170f92253c63 100644
--- a/nixos/modules/services/misc/bees.nix
+++ b/nixos/modules/services/misc/bees.nix
@@ -1,15 +1,12 @@
 { config, lib, pkgs, ... }:
-
-with lib;
-
 let
 
   cfg = config.services.beesd;
 
   logLevels = { emerg = 0; alert = 1; crit = 2; err = 3; warning = 4; notice = 5; info = 6; debug = 7; };
 
-  fsOptions = with types; {
-    options.spec = mkOption {
+  fsOptions = with lib.types; {
+    options.spec = lib.mkOption {
       type = str;
       description = ''
         Description of how to identify the filesystem to be duplicated by this
@@ -25,8 +22,8 @@ let
       '';
       example = "LABEL=MyBulkDataDrive";
     };
-    options.hashTableSizeMB = mkOption {
-      type = types.addCheck types.int (n: mod n 16 == 0);
+    options.hashTableSizeMB = lib.mkOption {
+      type = lib.types.addCheck lib.types.int (n: mod n 16 == 0);
       default = 1024; # 1GB; default from upstream beesd script
       description = ''
         Hash table size in MB; must be a multiple of 16.
@@ -40,13 +37,13 @@ let
         will recognize only aligned duplicate blocks of 16KB.
       '';
     };
-    options.verbosity = mkOption {
-      type = types.enum (attrNames logLevels ++ attrValues logLevels);
-      apply = v: if isString v then logLevels.${v} else v;
+    options.verbosity = lib.mkOption {
+      type = lib.types.enum (lib.attrNames logLevels ++ lib.attrValues logLevels);
+      apply = v: if lib.isString v then logLevels.${v} else v;
       default = "info";
       description = "Log verbosity (syslog keyword/level).";
     };
-    options.workDir = mkOption {
+    options.workDir = lib.mkOption {
       type = str;
       default = ".beeshome";
       description = ''
@@ -54,13 +51,13 @@ let
         the hash table will be stored.
       '';
     };
-    options.extraOptions = mkOption {
+    options.extraOptions = lib.mkOption {
       type = listOf str;
       default = [ ];
       description = ''
         Extra command-line options passed to the daemon. See upstream bees documentation.
       '';
-      example = literalExpression ''
+      example = lib.literalExpression ''
         [ "--thread-count" "4" ]
       '';
     };
@@ -70,11 +67,11 @@ in
 {
 
   options.services.beesd = {
-    filesystems = mkOption {
-      type = with types; attrsOf (submodule fsOptions);
+    filesystems = lib.mkOption {
+      type = with lib.types; attrsOf (submodule fsOptions);
       description = "BTRFS filesystems to run block-level deduplication on.";
       default = { };
-      example = literalExpression ''
+      example = lib.literalExpression ''
         {
           root = {
             spec = "LABEL=root";
@@ -87,8 +84,8 @@ in
     };
   };
   config = {
-    systemd.services = mapAttrs'
-      (name: fs: nameValuePair "beesd@${name}" {
+    systemd.services = lib.mapAttrs'
+      (name: fs: lib.nameValuePair "beesd@${name}" {
         description = "Block-level BTRFS deduplication for %i";
         after = [ "sysinit.target" ];
 
@@ -100,11 +97,11 @@ in
               "idxSizeMB=${toString fs.hashTableSizeMB}"
               "workDir=${fs.workDir}"
             ];
-            configOptsStr = escapeShellArgs configOpts;
+            configOptsStr = lib.escapeShellArgs configOpts;
           in
           {
             # Values from https://github.com/Zygo/bees/blob/v0.6.5/scripts/beesd@.service.in
-            ExecStart = "${pkgs.bees}/bin/bees-service-wrapper run ${configOptsStr} -- --no-timestamps ${escapeShellArgs fs.extraOptions}";
+            ExecStart = "${pkgs.bees}/bin/bees-service-wrapper run ${configOptsStr} -- --no-timestamps ${lib.escapeShellArgs fs.extraOptions}";
             ExecStopPost = "${pkgs.bees}/bin/bees-service-wrapper cleanup ${configOptsStr}";
             CPUAccounting = true;
             CPUSchedulingPolicy = "batch";