treewide: use lib.mkDefault for "collateral" config
this allows the user to override settings without lib.mkForce, since that should only be needed for potentially unadvisable changes
This commit is contained in:
parent
a210bf53ec
commit
4c4e2ee737
5 changed files with 10 additions and 8 deletions
|
|
@ -56,7 +56,7 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
nixowos.${name} = {
|
nixowos.${name} = lib.mkDefault {
|
||||||
yt-dlp.enable = true;
|
yt-dlp.enable = true;
|
||||||
tmux.enable = true;
|
tmux.enable = true;
|
||||||
shell.enable = true;
|
shell.enable = true;
|
||||||
|
|
|
||||||
10
default.nix
10
default.nix
|
|
@ -22,9 +22,11 @@ in
|
||||||
config = {
|
config = {
|
||||||
_module.args.owoLib = pkgs.callPackage ./lib { };
|
_module.args.owoLib = pkgs.callPackage ./lib { };
|
||||||
|
|
||||||
nixowos = lib.mkIf cfg.enable {
|
nixowos = lib.mkIf cfg.enable (
|
||||||
cli.enable = true;
|
lib.mkDefault {
|
||||||
system.enable = true;
|
cli.enable = true;
|
||||||
};
|
system.enable = true;
|
||||||
|
}
|
||||||
|
);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
nixowos.${name} = {
|
nixowos.${name} = lib.mkDefault {
|
||||||
plasma.enable = config.services.desktopManager.plasma6.enable;
|
plasma.enable = config.services.desktopManager.plasma6.enable;
|
||||||
mpv.enable = true;
|
mpv.enable = true;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
nixowos.graphical.${name} = {
|
nixowos.graphical.${name} = lib.mkDefault {
|
||||||
mangohud.enable = true;
|
mangohud.enable = true;
|
||||||
steam.enable = true;
|
steam.enable = true;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
nixowos.${name} = {
|
nixowos.${name} = lib.mkDefault {
|
||||||
lix.enable = true;
|
lix.enable = true;
|
||||||
nix.enable = true;
|
nix.enable = true;
|
||||||
luks.enable = true;
|
luks.enable = true;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue