commit a44b2cdd3a8531c6566bbe441a68ea27bb873f34 · pyrox.dev/nixpkgs

+1 -2

nixos/modules/services/networking/kresd.nix

···

       134
       134
        
             CacheDirectoryMode = "0750";

     

       135
       135
        
           };

     

       136
       136
        
       

     

       137
       137
       -
           environment.etc."tmpfiles.d/knot-resolver.conf".source =

     

       138
       138
       -
             "${package}/lib/tmpfiles.d/knot-resolver.conf";

     

       137
       137
       +
           systemd.tmpfiles.packages = [ package ];

     

       139
       138
        
       

     

       140
       139
        
           # Try cleaning up the previously default location of cache file.

     

       141
       140
        
           # Note that /var/cache/* should always be safe to remove.

+1 -1

nixos/modules/services/x11/colord.nix

···

       26
       26
        
       

     

       27
       27
        
           systemd.packages = [ pkgs.colord ];

     

       28
       28
        
       

     

       29
       29
       -
           environment.etc."tmpfiles.d/colord.conf".source = "${pkgs.colord}/lib/tmpfiles.d/colord.conf";

     

       29
       29
       +
           systemd.tmpfiles.packages = [ pkgs.colord ];

     

       30
       30
        
       

     

       31
       31
        
           users.users.colord = {

     

       32
       32
        
             isSystemUser = true;

+61 -18

nixos/modules/system/boot/systemd.nix

···

       749
       749
        
             '';

     

       750
       750
        
           };

     

       751
       751
        
       

     

       752
       752
       +
           systemd.tmpfiles.packages = mkOption {

     

       753
       753
       +
             type = types.listOf types.package;

     

       754
       754
       +
             default = [];

     

       755
       755
       +
             example = literalExample "[ pkgs.lvm2 ]";

     

       756
       756
       +
             apply = map getLib;

     

       757
       757
       +
             description = ''

     

       758
       758
       +
               List of packages containing <command>systemd-tmpfiles</command> rules.

     

       759
       759
       +
       

     

       760
       760
       +
               All files ending in .conf found in

     

       761
       761
       +
               <filename><replaceable>pkg</replaceable>/lib/tmpfiles.d</filename>

     

       762
       762
       +
               will be included.

     

       763
       763
       +
               If this folder does not exist or does not contain any files an error will be returned instead.

     

       764
       764
       +
       

     

       765
       765
       +
               If a <filename>lib</filename> output is available, rules are searched there and only there.

     

       766
       766
       +
               If there is no <filename>lib</filename> output it will fall back to <filename>out</filename>

     

       767
       767
       +
               and if that does not exist either, the default output will be used.

     

       768
       768
       +
             '';

     

       769
       769
       +
           };

     

       770
       770
       +
       

     

       752
       771
        
           systemd.user.units = mkOption {

     

       753
       772
        
             description = "Definition of systemd per-user units.";

     

       754
       773
        
             default = {};

     
···

       992
       1011
        
             "sysctl.d/50-coredump.conf".source = "${systemd}/example/sysctl.d/50-coredump.conf";

     

       993
       1012
        
             "sysctl.d/50-default.conf".source = "${systemd}/example/sysctl.d/50-default.conf";

     

       994
       1013
        
       

     

       995
       995
       -
             "tmpfiles.d/00-nixos.conf".text = ''

     

       996
       996
       -
               # This file is created automatically and should not be modified.

     

       997
       997
       -
               # Please change the option ‘systemd.tmpfiles.rules’ instead.

     

       998
       998
       -
       

     

       999
       999
       -
               ${concatStringsSep "\n" cfg.tmpfiles.rules}

     

       1000
       1000
       -
             '';

     

       1001
       1001
       -
       

     

       1002
       1002
       -
             "tmpfiles.d/home.conf".source = "${systemd}/example/tmpfiles.d/home.conf";

     

       1003
       1003
       -
             "tmpfiles.d/journal-nocow.conf".source = "${systemd}/example/tmpfiles.d/journal-nocow.conf";

     

       1004
       1004
       -
             "tmpfiles.d/portables.conf".source = "${systemd}/example/tmpfiles.d/portables.conf";

     

       1005
       1005
       -
             "tmpfiles.d/static-nodes-permissions.conf".source = "${systemd}/example/tmpfiles.d/static-nodes-permissions.conf";

     

       1006
       1006
       -
             "tmpfiles.d/systemd.conf".source = "${systemd}/example/tmpfiles.d/systemd.conf";

     

       1007
       1007
       -
             "tmpfiles.d/systemd-nologin.conf".source = "${systemd}/example/tmpfiles.d/systemd-nologin.conf";

     

       1008
       1008
       -
             "tmpfiles.d/systemd-nspawn.conf".source = "${systemd}/example/tmpfiles.d/systemd-nspawn.conf";

     

       1009
       1009
       -
             "tmpfiles.d/systemd-tmp.conf".source = "${systemd}/example/tmpfiles.d/systemd-tmp.conf";

     

       1010
       1010
       -
             "tmpfiles.d/tmp.conf".source = "${systemd}/example/tmpfiles.d/tmp.conf";

     

       1011
       1011
       -
             "tmpfiles.d/var.conf".source = "${systemd}/example/tmpfiles.d/var.conf";

     

       1012
       1012
       -
             "tmpfiles.d/x11.conf".source = "${systemd}/example/tmpfiles.d/x11.conf";

     

       1014
       1014
       +
             "tmpfiles.d".source = (pkgs.symlinkJoin {

     

       1015
       1015
       +
               name = "tmpfiles.d";

     

       1016
       1016
       +
               paths = cfg.tmpfiles.packages;

     

       1017
       1017
       +
               postBuild = ''

     

       1018
       1018
       +
                 for i in $(cat $pathsPath); do

     

       1019
       1019
       +
                   (test -d $i/lib/tmpfiles.d && test $(ls $i/lib/tmpfiles.d/*.conf | wc -l) -ge 1) || (

     

       1020
       1020
       +
                     echo "ERROR: The path $i was passed to systemd.tmpfiles.packages but either does not contain the folder lib/tmpfiles.d or if it contains that folder, there are no files ending in .conf in it."

     

       1021
       1021
       +
                     exit 1

     

       1022
       1022
       +
                   )

     

       1023
       1023
       +
                 done

     

       1024
       1024
       +
               '';

     

       1025
       1025
       +
             }) + "/lib/tmpfiles.d";

     

       1013
       1026
        
       

     

       1014
       1027
        
             "systemd/system-generators" = { source = hooks "generators" cfg.generators; };

     

       1015
       1028
        
             "systemd/system-shutdown" = { source = hooks "shutdown" cfg.shutdown; };

     
···

       1029
       1042
        
             { description = "Security Keys";

     

       1030
       1043
        
               unitConfig.X-StopOnReconfiguration = true;

     

       1031
       1044
        
             };

     

       1045
       1045
       +
       

     

       1046
       1046
       +
           systemd.tmpfiles.packages = [

     

       1047
       1047
       +
             # Default tmpfiles rules provided by systemd

     

       1048
       1048
       +
             (pkgs.runCommand "systemd-default-tmpfiles" {} ''

     

       1049
       1049
       +
               mkdir -p $out/lib/tmpfiles.d

     

       1050
       1050
       +
               cd $out/lib/tmpfiles.d

     

       1051
       1051
       +
       

     

       1052
       1052
       +
               ln -s "${systemd}/example/tmpfiles.d/home.conf"

     

       1053
       1053
       +
               ln -s "${systemd}/example/tmpfiles.d/journal-nocow.conf"

     

       1054
       1054
       +
               ln -s "${systemd}/example/tmpfiles.d/static-nodes-permissions.conf"

     

       1055
       1055
       +
               ln -s "${systemd}/example/tmpfiles.d/systemd.conf"

     

       1056
       1056
       +
               ln -s "${systemd}/example/tmpfiles.d/systemd-nologin.conf"

     

       1057
       1057
       +
               ln -s "${systemd}/example/tmpfiles.d/systemd-nspawn.conf"

     

       1058
       1058
       +
               ln -s "${systemd}/example/tmpfiles.d/systemd-tmp.conf"

     

       1059
       1059
       +
               ln -s "${systemd}/example/tmpfiles.d/tmp.conf"

     

       1060
       1060
       +
               ln -s "${systemd}/example/tmpfiles.d/var.conf"

     

       1061
       1061
       +
               ln -s "${systemd}/example/tmpfiles.d/x11.conf"

     

       1062
       1062
       +
             '')

     

       1063
       1063
       +
             # User-specified tmpfiles rules

     

       1064
       1064
       +
             (pkgs.writeTextFile {

     

       1065
       1065
       +
               name = "nixos-tmpfiles.d";

     

       1066
       1066
       +
               destination = "/lib/tmpfiles.d/00-nixos.conf";

     

       1067
       1067
       +
               text = ''

     

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

     

       1069
       1069
       +
                 # Please change the option ‘systemd.tmpfiles.rules’ instead.

     

       1070
       1070
       +
       

     

       1071
       1071
       +
                 ${concatStringsSep "\n" cfg.tmpfiles.rules}

     

       1072
       1072
       +
               '';

     

       1073
       1073
       +
             })

     

       1074
       1074
       +
           ];

     

       1032
       1075
        
       

     

       1033
       1076
        
           systemd.units =

     

       1034
       1077
        
                mapAttrs' (n: v: nameValuePair "${n}.path"    (pathToUnit    n v)) cfg.paths