commit 5241898a20e15031177759db454308929ee6c578 · pyrox.dev/nixpkgs

+10 -5

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

···

       12
       12
        
       let

     

       13
       13
        
         cfg = config.systemd.user;

     

       14
       14
        
       

     

       15
       15
       +
         hasTmpfiles =

     

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

     

       17
       17
       +
       

     

       15
       18
        
         systemd = config.systemd.package;

     

       16
       19
        
       

     

       17
       20
        
         inherit (systemdUtils.lib)

     
···

       210
       213
        
             // mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit v)) cfg.targets

     

       211
       214
        
             // mapAttrs' (n: v: nameValuePair "${n}.timer" (timerToUnit v)) cfg.timers;

     

       212
       215
        
       

     

       216
       216
       +
           systemd.user.timers = {

     

       217
       217
       +
             # enable systemd user tmpfiles

     

       218
       218
       +
             systemd-tmpfiles-clean.wantedBy = optional hasTmpfiles "timers.target";

     

       219
       219
       +
           }

     

       213
       220
        
           # Generate timer units for all services that have a ‘startAt’ value.

     

       214
       214
       -
           systemd.user.timers = mapAttrs (name: service: {

     

       221
       221
       +
           // (mapAttrs (name: service: {

     

       215
       222
        
             wantedBy = [ "timers.target" ];

     

       216
       223
        
             timerConfig.OnCalendar = service.startAt;

     

       217
       217
       -
           }) (filterAttrs (name: service: service.startAt != [ ]) cfg.services);

     

       224
       224
       +
           }) (filterAttrs (name: service: service.startAt != [ ]) cfg.services));

     

       218
       225
        
       

     

       219
       226
        
           # Provide the systemd-user PAM service, required to run systemd

     

       220
       227
        
           # user instances.

     
···

       233
       240
        
           systemd.services.systemd-user-sessions.restartIfChanged = false; # Restart kills all active sessions.

     

       234
       241
        
       

     

       235
       242
        
           # enable systemd user tmpfiles

     

       236
       236
       -
           systemd.user.services.systemd-tmpfiles-setup.wantedBy = optional (

     

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

     

       238
       238
       -
           ) "basic.target";

     

       243
       243
       +
           systemd.user.services.systemd-tmpfiles-setup.wantedBy = optional hasTmpfiles "basic.target";

     

       239
       244
        
       

     

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

     

       241
       246
        
           # write the tmpfiles.d rules for everyone there

+13

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

···

       21
       21
        
               users.alice.rules = [

     

       22
       22
        
                 "d %h/only_alice"

     

       23
       23
        
               ];

     

       24
       24
       +
               users.bob.rules = [

     

       25
       25
       +
                 "D %h/cleaned_up - - - 0"

     

       26
       26
       +
               ];

     

       27
       27
       +
             };

     

       28
       28
       +
       

     

       29
       29
       +
             # run every 10 seconds

     

       30
       30
       +
             systemd.user.timers.systemd-tmpfiles-clean.timerConfig = {

     

       31
       31
       +
               OnStartupSec = "10s";

     

       32
       32
       +
               OnUnitActiveSec = "10s";

     

       24
       33
        
             };

     

       25
       34
        
           };

     

       26
       35
        
       

     
···

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

     

       37
       46
        
             machine.succeed("[ -d ~bob/user_tmpfiles_created ]")

     

       38
       47
        
             machine.succeed("[ ! -e ~bob/only_alice ]")

     

       48
       48
       +
       

     

       49
       49
       +
             machine.succeed("systemctl --user --machine=bob@ is-active systemd-tmpfiles-clean.timer")

     

       50
       50
       +
             machine.succeed("runuser -u bob -- touch ~bob/cleaned_up/file")

     

       51
       51
       +
             machine.wait_until_fails("[ -e ~bob/cleaned_up/file ]")

     

       39
       52
        
           '';

     

       40
       53
        
       }