commit 44c7414cc634635bfeee3527fc8cc4ecf52c50c9 · pyrox.dev/nixpkgs

+9 -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
       -
       

     

       18
       15
        
         systemd = config.systemd.package;

     

       19
       16
        
       

     

       20
       17
        
         inherit (systemdUtils.lib)

     
···

       123
       120
        
           };

     

       124
       121
        
       

     

       125
       122
        
           systemd.user.tmpfiles = {

     

       123
       123
       +
             enable =

     

       124
       124
       +
               (mkEnableOption "systemd user units systemd-tmpfiles-setup.service and systemd-tmpfiles-clean.timer")

     

       125
       125
       +
               // {

     

       126
       126
       +
                 default = true;

     

       127
       127
       +
                 example = false;

     

       128
       128
       +
               };

     

       129
       129
       +
       

     

       126
       130
        
             rules = mkOption {

     

       127
       131
        
               type = types.listOf types.str;

     

       128
       132
        
               default = [ ];

     
···

       215
       219
        
       

     

       216
       220
        
           systemd.user.timers = {

     

       217
       221
        
             # enable systemd user tmpfiles

     

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

     

       222
       222
       +
             systemd-tmpfiles-clean.wantedBy = optional cfg.tmpfiles.enable "timers.target";

     

       219
       223
        
           }

     

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

     

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

     
···

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

     

       241
       245
        
       

     

       242
       246
        
           # enable systemd user tmpfiles

     

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

     

       247
       247
       +
           systemd.user.services.systemd-tmpfiles-setup.wantedBy = optional cfg.tmpfiles.enable "basic.target";

     

       244
       248
        
       

     

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

     

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

+14 -3

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

···

       6
       6
        
           maintainers = [ schnusch ];

     

       7
       7
        
         };

     

       8
       8
        
       

     

       9
       9
       -
         nodes.machine =

     

       10
       10
       -
           { ... }:

     

       11
       11
       -
           {

     

       9
       9
       +
         nodes = rec {

     

       10
       10
       +
           machine = {

     

       12
       11
        
             users.users = {

     

       13
       12
        
               alice.isNormalUser = true;

     

       14
       13
        
               bob.isNormalUser = true;

     
···

       32
       31
        
               OnUnitActiveSec = "10s";

     

       33
       32
        
             };

     

       34
       33
        
           };

     

       34
       34
       +
           disabled = {

     

       35
       35
       +
             imports = [ machine ];

     

       36
       36
       +
             systemd.user.tmpfiles.enable = false;

     

       37
       37
       +
           };

     

       38
       38
       +
         };

     

       35
       39
        
       

     

       36
       40
        
         testScript =

     

       37
       41
        
           { ... }:

     
···

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

     

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

     

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

     

       56
       56
       +
       

     

       57
       57
       +
             # disabled user tmpfiles

     

       58
       58
       +
             disabled.succeed("loginctl enable-linger alice bob")

     

       59
       59
       +
             for user in ("alice", "bob"):

     

       60
       60
       +
                 for verb in ("is-enabled", "is-active"):

     

       61
       61
       +
                     for unit in ("systemd-tmpfiles-setup.service", "systemd-tmpfiles-clean.timer"):

     

       62
       62
       +
                         disabled.fail(f"systemctl --user --machine={user}@ {verb} {unit}")

     

       52
       63
        
           '';

     

       53
       64
        
       }