Compare commits

...

5 commits

5 changed files with 14 additions and 9 deletions

View file

@ -5,17 +5,20 @@ let
mkUsersOption = programs: osConfig: mkOption { mkUsersOption = programs: osConfig: mkOption {
type = types.attrsOf (types.submodule ( type = types.attrsOf (types.submodule (
{ ... }: { { config, ... }: {
options = { options = {
inherit programs; inherit programs;
}; };
config = { config = {
programs = builtins.mapAttrs programs = lib.attrsets.concatMapAttrs
( (
name: config: { name: program:
enable = mkDefault config.enable; if (builtins.elem name (builtins.attrNames config.programs)) then {
} ${name} = {
enable = mkDefault program.enable;
};
} else { }
) )
osConfig.programs; osConfig.programs;
}; };

View file

@ -5,6 +5,8 @@ in {
config = { config = {
valhalla = { valhalla = {
boot.label = "Arch";
fileSystems = { fileSystems = {
diskSetup.devices = { diskSetup.devices = {
OS = { OS = {

View file

@ -5,8 +5,8 @@ begin
inherit "$dir/../../../Common/Software/systemd-networkd/main.fish" inherit "$dir/../../../Common/Software/systemd-networkd/main.fish"
function configureSW -V dir function configureSW -V dir
systemctl enable systemd-networkd sudo systemctl enable systemd-networkd
systemctl enable systemd-resolved sudo systemctl enable systemd-resolved
configureSWBase $argv configureSWBase $argv
end end

View file

@ -101,7 +101,7 @@ function runSetup
end end
end) \ end) \
(string escape $script) "&&")) \ (string escape $script) "&&")) \
"rm $tmp ||" "rm $tmp ||" \
"mv $tmp $profile" "mv $tmp $profile"
end | runChroot "$mountDir" tee "$profile" >/dev/null end | runChroot "$mountDir" tee "$profile" >/dev/null
end end

View file

@ -84,7 +84,7 @@ function runSetupUserAction -V dir
disposeAction disposeAction
rm "$sudoConfig" rm "$sudoConfig"
userdel -rf "$name" userdel -rf "$name"
success $success
end end
end end
end end