From 0de89d26ea59907d0bdf84dc6216c480880bf2a3 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 27 Aug 2024 20:43:26 +0200
Subject: [PATCH] nixos/services.udisks2: remove `with lib;`

---
 nixos/modules/services/hardware/udisks2.nix | 30 ++++++++++-----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/nixos/modules/services/hardware/udisks2.nix b/nixos/modules/services/hardware/udisks2.nix
index 46a72b961501..e52aa5a58df2 100644
--- a/nixos/modules/services/hardware/udisks2.nix
+++ b/nixos/modules/services/hardware/udisks2.nix
@@ -1,13 +1,11 @@
 # Udisks daemon.
 { config, lib, pkgs, ... }:
-with lib;
-
 let
   cfg = config.services.udisks2;
   settingsFormat = pkgs.formats.ini {
-    listToValue = concatMapStringsSep "," (generators.mkValueStringDefault {});
+    listToValue = lib.concatMapStringsSep "," (lib.generators.mkValueStringDefault {});
   };
-  configFiles = mapAttrs (name: value: (settingsFormat.generate name value)) (mapAttrs' (name: value: nameValuePair name value ) config.services.udisks2.settings);
+  configFiles = lib.mapAttrs (name: value: (settingsFormat.generate name value)) (lib.mapAttrs' (name: value: lib.nameValuePair name value ) config.services.udisks2.settings);
 in
 
 {
@@ -18,10 +16,10 @@ in
 
     services.udisks2 = {
 
-      enable = mkEnableOption "udisks2, a DBus service that allows applications to query and manipulate storage devices";
+      enable = lib.mkEnableOption "udisks2, a DBus service that allows applications to query and manipulate storage devices";
 
-      mountOnMedia = mkOption {
-        type = types.bool;
+      mountOnMedia = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = ''
           When enabled, instructs udisks2 to mount removable drives under `/media/` directory, instead of the
@@ -30,9 +28,9 @@ in
         '';
       };
 
-      settings = mkOption rec {
-        type = types.attrsOf settingsFormat.type;
-        apply = recursiveUpdate default;
+      settings = lib.mkOption rec {
+        type = lib.types.attrsOf settingsFormat.type;
+        apply = lib.recursiveUpdate default;
         default = {
           "udisks2.conf" = {
             udisks2 = {
@@ -44,7 +42,7 @@ in
             };
           };
         };
-        example = literalExpression ''
+        example = lib.literalExpression ''
         {
           "WDC-WD10EZEX-60M2NA0-WD-WCC3F3SJ0698.conf" = {
             ATA = {
@@ -67,14 +65,14 @@ in
 
   ###### implementation
 
-  config = mkIf config.services.udisks2.enable {
+  config = lib.mkIf config.services.udisks2.enable {
 
     environment.systemPackages = [ pkgs.udisks2 ];
 
-    environment.etc = (mapAttrs' (name: value: nameValuePair "udisks2/${name}" { source = value; } ) configFiles) // (
+    environment.etc = (lib.mapAttrs' (name: value: lib.nameValuePair "udisks2/${name}" { source = value; } ) configFiles) // (
     let
       libblockdev = pkgs.udisks2.libblockdev;
-      majorVer = versions.major libblockdev.version;
+      majorVer = lib.versions.major libblockdev.version;
     in {
       # We need to make sure /etc/libblockdev/@major_ver@/conf.d is populated to avoid
       # warnings
@@ -87,11 +85,11 @@ in
     services.dbus.packages = [ pkgs.udisks2 ];
 
     systemd.tmpfiles.rules = [ "d /var/lib/udisks2 0755 root root -" ]
-      ++ optional cfg.mountOnMedia "D! /media 0755 root root -";
+      ++ lib.optional cfg.mountOnMedia "D! /media 0755 root root -";
 
     services.udev.packages = [ pkgs.udisks2 ];
 
-    services.udev.extraRules = optionalString cfg.mountOnMedia ''
+    services.udev.extraRules = lib.optionalString cfg.mountOnMedia ''
       ENV{ID_FS_USAGE}=="filesystem", ENV{UDISKS_FILESYSTEM_SHARED}="1"
     '';