From 4c4e2ee737bc5ce7dfd001f4aa3d3eed3ae67c32 Mon Sep 17 00:00:00 2001 From: Elec3137 Date: Mon, 16 Feb 2026 19:31:35 -0800 Subject: [PATCH] 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 --- cli/default.nix | 2 +- default.nix | 10 ++++++---- graphical/default.nix | 2 +- graphical/games/default.nix | 2 +- system/default.nix | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/cli/default.nix b/cli/default.nix index f957a90..6f92dee 100644 --- a/cli/default.nix +++ b/cli/default.nix @@ -56,7 +56,7 @@ in }; config = lib.mkIf cfg.enable { - nixowos.${name} = { + nixowos.${name} = lib.mkDefault { yt-dlp.enable = true; tmux.enable = true; shell.enable = true; diff --git a/default.nix b/default.nix index c106f3c..4a1be51 100644 --- a/default.nix +++ b/default.nix @@ -22,9 +22,11 @@ in config = { _module.args.owoLib = pkgs.callPackage ./lib { }; - nixowos = lib.mkIf cfg.enable { - cli.enable = true; - system.enable = true; - }; + nixowos = lib.mkIf cfg.enable ( + lib.mkDefault { + cli.enable = true; + system.enable = true; + } + ); }; } diff --git a/graphical/default.nix b/graphical/default.nix index af9b42d..abd40b5 100644 --- a/graphical/default.nix +++ b/graphical/default.nix @@ -23,7 +23,7 @@ in }; config = lib.mkIf cfg.enable { - nixowos.${name} = { + nixowos.${name} = lib.mkDefault { plasma.enable = config.services.desktopManager.plasma6.enable; mpv.enable = true; }; diff --git a/graphical/games/default.nix b/graphical/games/default.nix index 7799696..e572ba5 100644 --- a/graphical/games/default.nix +++ b/graphical/games/default.nix @@ -19,7 +19,7 @@ in }; config = lib.mkIf cfg.enable { - nixowos.graphical.${name} = { + nixowos.graphical.${name} = lib.mkDefault { mangohud.enable = true; steam.enable = true; }; diff --git a/system/default.nix b/system/default.nix index 76f3ba6..fa7b2c5 100644 --- a/system/default.nix +++ b/system/default.nix @@ -28,7 +28,7 @@ in }; config = lib.mkIf cfg.enable { - nixowos.${name} = { + nixowos.${name} = lib.mkDefault { lix.enable = true; nix.enable = true; luks.enable = true;