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

treewide: reformat nixfmt-rfc-style

Reformat repository using new nixfmt-rfc-style.
This commit is contained in:
Austin Horstman 2025-04-07 16:11:29 -05:00
parent 5df48c4255
commit cba2f9ce95
1051 changed files with 37028 additions and 26594 deletions

View file

@ -10,7 +10,13 @@
\t \n \" "
'';
unsafeString = " \" \n ";
flatItems = [ 1 2 "asdf" true null ];
flatItems = [
1
2
"asdf"
true
null
];
bigFlatItems = [
23847590283751
1.239
@ -20,9 +26,23 @@
''
null
];
nested = [ [ 1 2 ] [ true false ] [ ] [ null ] ];
nested = [
[
1
2
]
[
true
false
]
[ ]
[ null ]
];
extraAttrs = {
_args = [ 2 true ];
_args = [
2
true
];
_props = {
arg1 = 1;
arg2 = false;
@ -38,10 +58,10 @@
{ b = true; }
{
c = null;
d = [{ e = "asdfadfasdfasdf"; }];
d = [ { e = "asdfadfasdfasdf"; } ];
}
];
list2 = [{ a = 8; }];
list2 = [ { a = 8; } ];
};
};

View file

@ -1,8 +1,7 @@
{ config, lib, ... }:
{
home.file."toscfg-err-dir-empty-name-result.txt".text =
lib.hm.generators.toSCFG { } { "" = [ ]; };
home.file."toscfg-err-dir-empty-name-result.txt".text = lib.hm.generators.toSCFG { } { "" = [ ]; };
nmt.script = ''
assertFileContent \

View file

@ -4,13 +4,28 @@
home.file."toscfg-example-result.txt".text = lib.hm.generators.toSCFG { } {
dir = {
blk1 = {
_params = [ "p1" ''"p2"'' ];
sub1 = [ "arg11" "arg12" ];
sub2 = [ "arg21" "arg22" ];
_params = [
"p1"
''"p2"''
];
sub1 = [
"arg11"
"arg12"
];
sub2 = [
"arg21"
"arg22"
];
sub3 = {
_params = [ "arg31" "arg32" ];
_params = [
"arg31"
"arg32"
];
sub-sub1 = [ ];
sub-sub2 = [ "arg321" "arg322" ];
sub-sub2 = [
"arg321"
"arg322"
];
};
};
};

View file

@ -1,28 +1,48 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
inherit (lib)
concatStringsSep hm mkIf mkMerge mkBefore mkAfter mkOption types;
concatStringsSep
hm
mkIf
mkMerge
mkBefore
mkAfter
mkOption
types
;
dag = lib.hm.dag;
result = let
sorted = dag.topoSort config.tested.dag;
data = map (e: "${e.name}:${e.data}") sorted.result;
in concatStringsSep "\n" data + "\n";
result =
let
sorted = dag.topoSort config.tested.dag;
data = map (e: "${e.name}:${e.data}") sorted.result;
in
concatStringsSep "\n" data + "\n";
in {
in
{
options.tested.dag = mkOption { type = hm.types.dagOf types.commas; };
config = {
tested.dag = mkMerge [
(mkIf false { never = "never"; })
{ never2 = mkIf false "never2"; }
{ after = mkMerge [ "after" (mkIf false "neither") ]; }
{
after = mkMerge [
"after"
(mkIf false "neither")
];
}
{ before = dag.entryBefore [ "after" ] (mkIf true "before"); }
{
between =
mkIf true (dag.entryBetween [ "after" ] [ "before" ] "between");
between = mkIf true (dag.entryBetween [ "after" ] [ "before" ] "between");
}
{ merged = dag.entryBefore [ "between" ] "middle"; }
{ merged = mkBefore "left"; }
@ -38,14 +58,20 @@ in {
"list-anywhere-2"
])
{ inside-list = dag.entryAfter [ "list-anywhere-1" ] "inside-list"; }
(dag.entriesBefore "list-before" [ "list-anywhere-1" ] [
"list-before-0"
"list-before-1"
])
(dag.entriesAfter "list-after" [ "list-before-0" ] [
"list-after-0"
"list-after-1"
])
(dag.entriesBefore "list-before"
[ "list-anywhere-1" ]
[
"list-before-0"
"list-before-1"
]
)
(dag.entriesAfter "list-after"
[ "list-before-0" ]
[
"list-after-0"
"list-after-1"
]
)
(dag.entriesAnywhere "list-empty" [ ])
{ "list-before-0" = mkAfter "sneaky-merge"; }
];

View file

@ -1,21 +1,39 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
inherit (lib) concatStringsSep hm mkOption types;
inherit (lib)
concatStringsSep
hm
mkOption
types
;
dag = lib.hm.dag;
result = let
sorted = dag.topoSort config.tested.dag;
data = map (e: "${e.name}:${e.data.name}") sorted.result;
in concatStringsSep "\n" data + "\n";
result =
let
sorted = dag.topoSort config.tested.dag;
data = map (e: "${e.name}:${e.data.name}") sorted.result;
in
concatStringsSep "\n" data + "\n";
in {
in
{
options.tested.dag = mkOption {
type = hm.types.dagOf (types.submodule ({ dagName, ... }: {
options.name = mkOption { type = types.str; };
config.name = "dn-${dagName}";
}));
type = hm.types.dagOf (
types.submodule (
{ dagName, ... }:
{
options.name = mkOption { type = types.str; };
config.name = "dn-${dagName}";
}
)
);
};
config = {
@ -30,13 +48,11 @@ in {
nmt.script = ''
assertFileContent \
home-files/result.txt \
${
pkgs.writeText "result.txt" ''
before:dn-before
between:dn-between
after:dn-after
''
}
${pkgs.writeText "result.txt" ''
before:dn-before
between:dn-between
after:dn-after
''}
'';
};
}

View file

@ -1,11 +1,26 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let inherit (lib) concatStringsSep hm mapAttrsToList mkMerge mkOption types;
in {
let
inherit (lib)
concatStringsSep
hm
mapAttrsToList
mkMerge
mkOption
types
;
in
{
options.examples = mkOption { type = types.attrsOf hm.types.gvariant; };
config = {
examples = with hm.gvariant;
examples =
with hm.gvariant;
mkMerge [
{ bool = true; }
{ bool = true; }
@ -46,7 +61,12 @@ in {
'';
}
{ tuple = mkTuple [ 1 [ "foo" ] ]; }
{
tuple = mkTuple [
1
[ "foo" ]
];
}
{ maybe1 = mkNothing type.string; }
{ maybe2 = mkJust (mkUint32 4); }
@ -54,41 +74,46 @@ in {
{ variant1 = mkVariant "foo"; }
{ variant2 = mkVariant 42; }
{ dictionaryEntry = mkDictionaryEntry [ 1 [ "foo" ] ]; }
{
dictionaryEntry = mkDictionaryEntry [
1
[ "foo" ]
];
}
];
home.file."result.txt".text = let
mkLine = n: v: "${n} = ${toString (hm.gvariant.mkValue v)}";
result = concatStringsSep "\n" (mapAttrsToList mkLine config.examples);
in result + "\n";
home.file."result.txt".text =
let
mkLine = n: v: "${n} = ${toString (hm.gvariant.mkValue v)}";
result = concatStringsSep "\n" (mapAttrsToList mkLine config.examples);
in
result + "\n";
nmt.script = ''
assertFileContent \
home-files/result.txt \
${
pkgs.writeText "expected.txt" ''
array1 = @as ['one','two']
array2 = @au [1,2]
bool = true
dictionaryEntry = @{ias} {1,@as ['foo']}
emptyArray1 = @as []
emptyArray2 = @au []
escapedString = '\'\\\n'
float = 3.140000
int = -42
int16 = @n -42
int64 = @x -42
maybe1 = @ms nothing
maybe2 = just @u 4
string = 'foo'
tuple = @(ias) (1,@as ['foo'])
uint16 = @q 42
uint32 = @u 42
uint64 = @t 42
variant1 = @v <'foo'>
variant2 = @v <42>
''
}
${pkgs.writeText "expected.txt" ''
array1 = @as ['one','two']
array2 = @au [1,2]
bool = true
dictionaryEntry = @{ias} {1,@as ['foo']}
emptyArray1 = @as []
emptyArray2 = @au []
escapedString = '\'\\\n'
float = 3.140000
int = -42
int16 = @n -42
int64 = @x -42
maybe1 = @ms nothing
maybe2 = just @u 4
string = 'foo'
tuple = @(ias) (1,@as ['foo'])
uint16 = @q 42
uint32 = @u 42
uint64 = @t 42
variant1 = @v <'foo'>
variant2 = @v <42>
''}
'';
};
}