gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/services.udisks2: remove with lib;

Browse Source
This commit is contained in:
Felix Buehler
2024-08-30 00:30:53 +02:00
parent b00fba5c63
commit 0de89d26ea
1 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/hardware/udisks2.nix
+14 -16
View File
@@ -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"
'';