Xetibo/DashNix
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

basePackages use mkDashDefault

Browse source
This commit is contained in:
DashieTM 2025-05-09 22:17:21 +02:00
parent 1a518fa79a
commit a4f23bf459
5 changed files with 28 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

18
base/common_hardware.nix
View file

@ -50,14 +50,13 @@ in {
"sd_mod" "sd_mod"
]; ];
}; };
kernelParams = lib.mkDefault ( kernelParams =
[ [
''resume="PARTLABEL=SWAP"'' ''resume="PARTLABEL=SWAP"''
''quiet'' ''quiet''
''udev.log_level=3'' ''udev.log_level=3''
] ]
++ config.conf.bootParams ++ config.conf.bootParams;
);
}; };
networking = { networking = {
@ -102,7 +101,7 @@ in {
builders-use-substitutes = mkDashDefault true; builders-use-substitutes = mkDashDefault true;
substituters = lib.mkDefault [ substituters = [
"https://hyprland.cachix.org" "https://hyprland.cachix.org"
"https://anyrun.cachix.org" "https://anyrun.cachix.org"
"https://cache.garnix.io" "https://cache.garnix.io"
@ -116,7 +115,7 @@ in {
"https://chaotic-nyx.cachix.org/" "https://chaotic-nyx.cachix.org/"
]; ];
trusted-public-keys = lib.mkDefault [ trusted-public-keys = [
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
"anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s=" "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s="
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
@ -163,11 +162,10 @@ in {
"video" "video"
"audio" "audio"
]; ];
packages = with pkgs; packages = with pkgs; [
lib.mkDefault [ home-manager
home-manager xdg-desktop-portal-gtk
xdg-desktop-portal-gtk ];
];
# this password will only last for the first login # this password will only last for the first login
# e.g. login, then change to whatever else, this also ensures no public hash is available # e.g. login, then change to whatever else, this also ensures no public hash is available
password = mkDashDefault "firstlogin"; password = mkDashDefault "firstlogin";

4
home/common.nix
View file

@ -34,8 +34,8 @@ in {
}; };
nix = { nix = {
extraOptions = lib.mkDefault (lib.mkIf (config ? sops.secrets && config.sops.secrets ? access.path) '' extraOptions = lib.mkIf (config ? sops.secrets && config.sops.secrets ? access.path) ''
!include ${config.sops.secrets.access.path} !include ${config.sops.secrets.access.path}
''); '';
}; };
} }

2
home/default.nix
View file

@ -32,7 +32,7 @@
}; };
users.${config.conf.username} = { users.${config.conf.username} = {
disabledModules = lib.mkDefault ["programs/anyrun.nix"]; disabledModules = ["programs/anyrun.nix"];
imports = imports =
[ [
./common.nix ./common.nix

28
modules/programs/basePackages.nix
View file

@ -1,4 +1,5 @@
{ {
mkDashDefault,
config, config,
lib, lib,
options, options,
@ -84,14 +85,15 @@
if config.mods.basePackages.enable if config.mods.basePackages.enable
then then
{ {
upower.enable = true; preload.enable = mkDashDefault true;
upower.enable = mkDashDefault true;
dbus = { dbus = {
enable = true; enable = mkDashDefault true;
}; };
avahi = { avahi = {
enable = true; enable = mkDashDefault true;
nssmdns4 = true; nssmdns4 = mkDashDefault true;
openFirewall = true; openFirewall = mkDashDefault true;
}; };
} }
// config.mods.basePackages.specialServices // config.mods.basePackages.specialServices
@ -102,23 +104,23 @@
then then
{ {
nix-ld = { nix-ld = {
enable = true; enable = mkDashDefault true;
libraries = with pkgs; [ libraries = with pkgs; [
jdk jdk
zlib zlib
]; ];
}; };
direnv = { direnv = {
package = pkgs.direnv; package = mkDashDefault pkgs.direnv;
silent = false; silent = mkDashDefault false;
loadInNixShell = true; loadInNixShell = mkDashDefault true;
direnvrcExtra = ""; direnvrcExtra = mkDashDefault "";
nix-direnv = { nix-direnv = {
enable = true; enable = mkDashDefault true;
package = pkgs.nix-direnv; package = mkDashDefault pkgs.nix-direnv;
}; };
}; };
gnupg.agent.enable = true; gnupg.agent.enable = mkDashDefault true;
} }
// config.mods.basePackages.specialPrograms // config.mods.basePackages.specialPrograms
else config.mods.basePackages.specialPrograms; else config.mods.basePackages.specialPrograms;

3
modules/programs/hyprland/hyprland.nix
View file

@ -1,4 +1,5 @@
{ {
mkDashDefault,
config, config,
lib, lib,
options, options,
@ -297,7 +298,7 @@ in {
cursor = { cursor = {
enable_hyprcursor = true; enable_hyprcursor = true;
no_hardware_cursors = lib.mkDefault config.mods.gpu.nvidia.enable; no_hardware_cursors = mkDashDefault config.mods.gpu.nvidia.enable;
# done with nix, this would break the current setup otherwise # done with nix, this would break the current setup otherwise
sync_gsettings_theme = false; sync_gsettings_theme = false;
}; };