Add lib.mkDefault for non configurable defaults (#15)

This commit is contained in:
Dashie 2025-05-09 23:27:37 +02:00 committed by GitHub
parent 207b5165a3
commit ccc6962897
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 82 additions and 70 deletions

View file

@ -1,4 +1,5 @@
{
mkDashDefault,
config,
lib,
...
@ -6,30 +7,30 @@
username = config.conf.username;
in {
manual = {
html.enable = false;
json.enable = false;
manpages.enable = false;
html.enable = mkDashDefault false;
json.enable = mkDashDefault false;
manpages.enable = mkDashDefault false;
};
fonts.fontconfig.enable = true;
fonts.fontconfig.enable = mkDashDefault true;
home = {
username = username;
homeDirectory = "/home/${username}";
username = mkDashDefault username;
homeDirectory = mkDashDefault "/home/${username}";
sessionPath = ["$HOME/.cargo/bin"];
enableNixpkgsReleaseCheck = false;
enableNixpkgsReleaseCheck = mkDashDefault false;
sessionVariables = {
GOROOT = "$HOME/.go";
QT_QPA_PLATFORMTHEME = "qt5ct";
GOROOT = mkDashDefault "$HOME/.go";
QT_QPA_PLATFORMTHEME = mkDashDefault "qt5ct";
};
keyboard = null;
keyboard = mkDashDefault null;
};
programs.nix-index = {
enable = true;
enableFishIntegration = true;
enable = mkDashDefault true;
enableFishIntegration = mkDashDefault true;
};
nix = {

View file

@ -1,4 +1,5 @@
{
mkDashDefault,
additionalHomeConfig,
additionalHomeMods,
additionalInputs,
@ -16,17 +17,18 @@
...
}: {
xdg = {
portal.config.common.default = "*";
portal.config.common.default = mkDashDefault "*";
portal = {
enable = true;
enable = mkDashDefault true;
extraPortals = [pkgs.xdg-desktop-portal-gtk];
};
};
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
useGlobalPkgs = mkDashDefault true;
useUserPackages = mkDashDefault true;
extraSpecialArgs = {
inherit inputs root additionalInputs alternativePkgs system stable unstable;
mkDashDefault = import ../lib/override.nix {inherit lib;};
};
users.${config.conf.username} = {