DGNum/liminix
12
0
Fork 2
Code Issues 16 Pull requests 11 Projects Releases Packages Wiki Activity Actions

feat(networking): Add wlan mac personalisation #38

Open
mdebray wants to merge 2 commits from mdebray/mac-personalisation into main
pull from: mdebray/mac-personalisation
merge into: DGNum:main
Conversation 0 Commits 2 Files changed 8 +4 -4
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 31d31260b8 - Show all commits

2
modules/outputs/initramfs.nix
View file

@ -75,7 +75,7 @@ in
mv out $out mv out $out
''; '';
systemConfiguration = systemConfiguration =
pkgs.systemconfig config.filesystem.contents; pkgs.systemconfig config.filesystem.contents config.hostname;
}; };
}; };
} }

2
pkgs/levitate/default.nix
View file

@ -74,7 +74,7 @@ let
../../modules/s6 ../../modules/s6
]; ];
}; };
in systemconfig eval.config.filesystem.contents; in systemconfig eval.config.filesystem.contents eval.config.hostname;
in writeScriptBin "levitate" '' in writeScriptBin "levitate" ''
#!/bin/sh #!/bin/sh
destdir=${newRoot} destdir=${newRoot}

4
pkgs/systemconfig/default.nix
View file

@ -62,10 +62,10 @@ let
${(builtins.concatStringsSep "\n" (visit "." attrset))} ${(builtins.concatStringsSep "\n" (visit "." attrset))}
} }
''; '';
in attrset: in attrset: hostname:
let makedevs = activateScript attrset; let makedevs = activateScript attrset;
in stdenv.mkDerivation { in stdenv.mkDerivation {
name="make-stuff"; name="${hostname}-system-configuration";
src = ./.; src = ./.;
CFLAGS = "-Os"; CFLAGS = "-Os";