nix-community/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-11-08 11:36:05 +01:00
Code Activity

Revert "tmpfiles: migrate to an RFC42-style option"

Browse source 
This reverts commit 090aa14e5d.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
This commit is contained in:
Austin Horstman 2025-11-05 12:19:54 -06:00
parent 06aeeed62f
commit af119feb17
9 changed files with 31 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tests/default.nix
View file

@ -203,7 +203,6 @@ import nmtSrc {
./modules/misc/numlock
./modules/misc/pam
./modules/misc/qt
./modules/misc/tmpfiles
./modules/misc/xdg/linux.nix
./modules/misc/xsession
./modules/systemd

9
tests/integration/standalone/rclone/sops-nix.nix
View file

@ -28,12 +28,9 @@ in
uid = 1000;
};
systemd.tmpfiles.settings.age."/home/alice/age-key".f = {
mode = "400";
user = "alice";
group = "users";
argument = ageKey;
};
systemd.tmpfiles.rules = [
"f /home/alice/age-key 400 alice users - ${ageKey}"
];
home-manager.users.alice =
{ config, ... }:

24
tests/modules/misc/tmpfiles/basic-rules.nix
View file

@ -1,24 +0,0 @@
{
imports = [ ./common-stubs.nix ];
systemd.user.tmpfiles.settings = {
cache."%C".d.age = "4 weeks";
myTool."%h/.config/myTool.conf"."f+" = {
mode = "0644";
user = "alice";
group = "users";
argument = "my unescaped config";
};
};
nmt.script = ''
cacheRulesFile=home-files/.config/user-tmpfiles.d/home-manager-cache.conf
assertFileExists $cacheRulesFile
assertFileRegex $cacheRulesFile "^'d' '%C' '-' '-' '-' '4 weeks' $"
myToolRulesFile=home-files/.config/user-tmpfiles.d/home-manager-myTool.conf
assertFileExists $myToolRulesFile
assertFileRegex $myToolRulesFile \
"^'f+' '%h/.config/myTool.conf' '0644' 'alice' 'users' '-' my\\\\x20unescaped\\\\x20config$"
'';
}

3
tests/modules/misc/tmpfiles/common-stubs.nix
View file

@ -1,3 +0,0 @@
{
test.stubs.systemd.outPath = null;
}

6
tests/modules/misc/tmpfiles/default.nix
View file

@ -1,6 +0,0 @@
{
tmpfiles-no-rules = ./no-rules.nix;
tmpfiles-basic-rules = ./basic-rules.nix;
tmpfiles-escaped-argument-warning = ./escaped-argument-warning.nix;
}

14
tests/modules/misc/tmpfiles/escaped-argument-warning.nix
View file

@ -1,14 +0,0 @@
{
imports = [ ./common-stubs.nix ];
systemd.user.tmpfiles.settings.foo.path.f.argument = "my\\x20unescaped\\x20config";
test.asserts.warnings.expected = [
''
The 'systemd.user.tmpfiles.settings.foo.path.f.argument' option
appears to contain escape sequences, which will be escaped again.
Unescape them if this is not intended. The assigned string is:
"my\x20unescaped\x20config"
''
];
}

9
tests/modules/misc/tmpfiles/no-rules.nix
View file

@ -1,9 +0,0 @@
{
imports = [ ./common-stubs.nix ];
systemd.user.tmpfiles.settings = { };
nmt.script = ''
assertPathNotExists home-files/.config/user-tmpfiles.d/
'';
}