commit 24b4189619a99bbf3e55529f0f32ca844e44f5a2 · pyrox.dev/nixpkgs

+75

nixos/modules/system/boot/systemd/user.nix

···

       39
       39
        
           "timers.target"

     

       40
       40
        
           "xdg-desktop-autostart.target"

     

       41
       41
        
         ] ++ config.systemd.additionalUpstreamUserUnits;

     

       42
       42
       +
       

     

       43
       43
       +
         writeTmpfiles = { rules, user ? null }:

     

       44
       44
       +
           let

     

       45
       45
       +
             suffix = if user == null then "" else "-${user}";

     

       46
       46
       +
           in

     

       47
       47
       +
           pkgs.writeTextFile {

     

       48
       48
       +
             name = "nixos-user-tmpfiles.d${suffix}";

     

       49
       49
       +
             destination = "/etc/xdg/user-tmpfiles.d/00-nixos${suffix}.conf";

     

       50
       50
       +
             text = ''

     

       51
       51
       +
               # This file is created automatically and should not be modified.

     

       52
       52
       +
               # Please change the options ‘systemd.user.tmpfiles’ instead.

     

       53
       53
       +
               ${concatStringsSep "\n" rules}

     

       54
       54
       +
             '';

     

       55
       55
       +
           };

     

       42
       56
        
       in {

     

       43
       57
        
         options = {

     

       44
       58
        
           systemd.user.extraConfig = mkOption {

     
···

       93
       107
        
             description = lib.mdDoc "Definition of systemd per-user timer units.";

     

       94
       108
        
           };

     

       95
       109
        
       

     

       110
       110
       +
           systemd.user.tmpfiles = {

     

       111
       111
       +
             rules = mkOption {

     

       112
       112
       +
               type = types.listOf types.str;

     

       113
       113
       +
               default = [];

     

       114
       114
       +
               example = [ "D %C - - - 7d" ];

     

       115
       115
       +
               description = lib.mdDoc ''

     

       116
       116
       +
                 Global user rules for creation, deletion and cleaning of volatile and

     

       117
       117
       +
                 temporary files automatically. See

     

       118
       118
       +
                 {manpage}`tmpfiles.d(5)`

     

       119
       119
       +
                 for the exact format.

     

       120
       120
       +
               '';

     

       121
       121
       +
             };

     

       122
       122
       +
       

     

       123
       123
       +
             users = mkOption {

     

       124
       124
       +
               description = mdDoc ''

     

       125
       125
       +
                 Per-user rules for creation, deletion and cleaning of volatile and

     

       126
       126
       +
                 temporary files automatically.

     

       127
       127
       +
               '';

     

       128
       128
       +
               type = types.attrsOf (types.submodule {

     

       129
       129
       +
                 options = {

     

       130
       130
       +
                   rules = mkOption {

     

       131
       131
       +
                     type = types.listOf types.str;

     

       132
       132
       +
                     default = [];

     

       133
       133
       +
                     example = [ "D %C - - - 7d" ];

     

       134
       134
       +
                     description = mdDoc ''

     

       135
       135
       +
                       Per-user rules for creation, deletion and cleaning of volatile and

     

       136
       136
       +
                       temporary files automatically. See

     

       137
       137
       +
                       {manpage}`tmpfiles.d(5)`

     

       138
       138
       +
                       for the exact format.

     

       139
       139
       +
                     '';

     

       140
       140
       +
                   };

     

       141
       141
       +
                 };

     

       142
       142
       +
               });

     

       143
       143
       +
             };

     

       144
       144
       +
           };

     

       145
       145
       +
       

     

       96
       146
        
           systemd.additionalUpstreamUserUnits = mkOption {

     

       97
       147
        
             default = [];

     

       98
       148
        
             type = types.listOf types.str;

     
···

       154
       204
        
           # Some overrides to upstream units.

     

       155
       205
        
           systemd.services."user@".restartIfChanged = false;

     

       156
       206
        
           systemd.services.systemd-user-sessions.restartIfChanged = false; # Restart kills all active sessions.

     

       207
       207
       +
       

     

       208
       208
       +
           # enable systemd user tmpfiles

     

       209
       209
       +
           systemd.user.services.systemd-tmpfiles-setup.wantedBy =

     

       210
       210
       +
             optional

     

       211
       211
       +
               (cfg.tmpfiles.rules != [] || any (cfg': cfg'.rules != []) (attrValues cfg.tmpfiles.users))

     

       212
       212
       +
               "basic.target";

     

       213
       213
       +
       

     

       214
       214
       +
           # /run/current-system/sw/etc/xdg is in systemd's $XDG_CONFIG_DIRS so we can

     

       215
       215
       +
           # write the tmpfiles.d rules for everyone there

     

       216
       216
       +
           environment.systemPackages =

     

       217
       217
       +
             optional

     

       218
       218
       +
               (cfg.tmpfiles.rules != [])

     

       219
       219
       +
               (writeTmpfiles { inherit (cfg.tmpfiles) rules; });

     

       220
       220
       +
       

     

       221
       221
       +
           # /etc/profiles/per-user/$USER/etc/xdg is in systemd's $XDG_CONFIG_DIRS so

     

       222
       222
       +
           # we can write a single user's tmpfiles.d rules there

     

       223
       223
       +
           users.users =

     

       224
       224
       +
             mapAttrs

     

       225
       225
       +
               (user: cfg': {

     

       226
       226
       +
                 packages = optional (cfg'.rules != []) (writeTmpfiles {

     

       227
       227
       +
                   inherit (cfg') rules;

     

       228
       228
       +
                   inherit user;

     

       229
       229
       +
                 });

     

       230
       230
       +
               })

     

       231
       231
       +
               cfg.tmpfiles.users;

     

       157
       232
        
         };

     

       158
       233
        
       }

nixos/tests/all-tests.nix

···

       658
       658
        
         systemd-portabled = handleTest ./systemd-portabled.nix {};

     

       659
       659
        
         systemd-shutdown = handleTest ./systemd-shutdown.nix {};

     

       660
       660
        
         systemd-timesyncd = handleTest ./systemd-timesyncd.nix {};

     

       661
       661
       +
         systemd-user-tmpfiles-rules = handleTest ./systemd-user-tmpfiles-rules.nix {};

     

       661
       662
        
         systemd-misc = handleTest ./systemd-misc.nix {};

     

       662
       663
        
         systemd-userdbd = handleTest ./systemd-userdbd.nix {};

     

       663
       664
        
         systemd-homed = handleTest ./systemd-homed.nix {};

+35

nixos/tests/systemd-user-tmpfiles-rules.nix

···

       1
       1
       +
       import ./make-test-python.nix ({ lib, ... }: {

     

       2
       2
       +
         name = "systemd-user-tmpfiles-rules";

     

       3
       3
       +
       

     

       4
       4
       +
         meta = with lib.maintainers; {

     

       5
       5
       +
           maintainers = [ schnusch ];

     

       6
       6
       +
         };

     

       7
       7
       +
       

     

       8
       8
       +
         nodes.machine = { ... }: {

     

       9
       9
       +
           users.users = {

     

       10
       10
       +
             alice.isNormalUser = true;

     

       11
       11
       +
             bob.isNormalUser = true;

     

       12
       12
       +
           };

     

       13
       13
       +
       

     

       14
       14
       +
           systemd.user.tmpfiles = {

     

       15
       15
       +
             rules = [

     

       16
       16
       +
               "d %h/user_tmpfiles_created"

     

       17
       17
       +
             ];

     

       18
       18
       +
             users.alice.rules = [

     

       19
       19
       +
               "d %h/only_alice"

     

       20
       20
       +
             ];

     

       21
       21
       +
           };

     

       22
       22
       +
         };

     

       23
       23
       +
       

     

       24
       24
       +
         testScript = { ... }: ''

     

       25
       25
       +
           machine.succeed("loginctl enable-linger alice bob")

     

       26
       26
       +
       

     

       27
       27
       +
           machine.wait_until_succeeds("systemctl --user --machine=alice@ is-active systemd-tmpfiles-setup.service")

     

       28
       28
       +
           machine.succeed("[ -d ~alice/user_tmpfiles_created ]")

     

       29
       29
       +
           machine.succeed("[ -d ~alice/only_alice ]")

     

       30
       30
       +
       

     

       31
       31
       +
           machine.wait_until_succeeds("systemctl --user --machine=bob@ is-active systemd-tmpfiles-setup.service")

     

       32
       32
       +
           machine.succeed("[ -d ~bob/user_tmpfiles_created ]")

     

       33
       33
       +
           machine.succeed("[ ! -e ~bob/only_alice ]")

     

       34
       34
       +
         '';

     

       35
       35
       +
       })