commit 61219651fe0cdc5f3d06b98de41feaca8acf325c · pyrox.dev/nixpkgs

+19 -5
nixos/modules/services/hardware/udisks2.nix
···

       1
       1
        
       # Udisks daemon.

     

       2
       2
       -
       

     

       3
       2
        
       { config, lib, pkgs, ... }:

     

       4
       4
       -
       

     

       5
       3
        
       with lib;

     

       6
       4
        
       

     

       7
       5
        
       let

     

       6
       6
       +
         cfg = config.services.udisks2;

     

       8
       7
        
         settingsFormat = pkgs.formats.ini {

     

       9
       8
        
           listToValue = concatMapStringsSep "," (generators.mkValueStringDefault {});

     

       10
       9
        
         };

     
···

       19
       18
        
       

     

       20
       19
        
           services.udisks2 = {

     

       21
       20
        
       

     

       22
       22
       -
             enable = mkEnableOption (lib.mdDoc "udisks2, a DBus service that allows applications to query and manipulate storage devices");

     

       21
       21
       +
             enable = mkEnableOption (mdDoc "udisks2, a DBus service that allows applications to query and manipulate storage devices");

     

       22
       22
       +
       

     

       23
       23
       +
             mountOnMedia = mkOption {

     

       24
       24
       +
               type = types.bool;

     

       25
       25
       +
               default = false;

     

       26
       26
       +
               description = mdDoc ''

     

       27
       27
       +
                 When enabled, instructs udisks2 to mount removable drives under `/media/` directory, instead of the

     

       28
       28
       +
                 default, ACL-controlled `/run/media/$USER/`. Since `/media/` is not mounted as tmpfs by default, it

     

       29
       29
       +
                 requires cleanup to get rid of stale mountpoints; enabling this option will take care of this at boot.

     

       30
       30
       +
               '';

     

       31
       31
       +
             };

     

       23
       32
        
       

     

       24
       33
        
             settings = mkOption rec {

     

       25
       34
        
               type = types.attrsOf settingsFormat.type;

     
···

       44
       53
        
                 };

     

       45
       54
        
               };

     

       46
       55
        
               '';

     

       47
       47
       -
               description = lib.mdDoc ''

     

       56
       56
       +
               description = mdDoc ''

     

       48
       57
        
                 Options passed to udisksd.

     

       49
       58
        
                 See [here](http://manpages.ubuntu.com/manpages/latest/en/man5/udisks2.conf.5.html) and

     

       50
       59
        
                 drive configuration in [here](http://manpages.ubuntu.com/manpages/latest/en/man8/udisks.8.html) for supported options.

     
···

       73
       82
        
       

     

       74
       83
        
           services.dbus.packages = [ pkgs.udisks2 ];

     

       75
       84
        
       

     

       76
       76
       -
           systemd.tmpfiles.rules = [ "d /var/lib/udisks2 0755 root root -" ];

     

       85
       85
       +
           systemd.tmpfiles.rules = [ "d /var/lib/udisks2 0755 root root -" ]

     

       86
       86
       +
             ++ optional cfg.mountOnMedia "D! /media 0755 root root -";

     

       77
       87
        
       

     

       78
       88
        
           services.udev.packages = [ pkgs.udisks2 ];

     

       89
       89
       +
       

     

       90
       90
       +
           services.udev.extraRules = optionalString cfg.mountOnMedia ''

     

       91
       91
       +
             ENV{ID_FS_USAGE}=="filesystem", ENV{UDISKS_FILESYSTEM_SHARED}="1"

     

       92
       92
       +
           '';

     

       79
       93
        
       

     

       80
       94
        
           systemd.packages = [ pkgs.udisks2 ];

     

       81
       95
        
         };