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

Solve doc kernel issue

Browse source
This commit is contained in:
DashieTM 2024-08-28 00:59:01 +02:00
parent a5da4f286f
commit dfc4b5cf94
8 changed files with 31 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

25
modules/conf.nix
View file

@ -93,14 +93,15 @@
};
};
#kernel = lib.mkOption {
# default = pkgs.linuxPackages_latest;
# example = pkgs.linuxPackages_xanmod_latest;
# type = with lib.types; nullOr attrs;
# description = ''
# kernel to be used
# '';
#};
kernelOverride = lib.mkOption {
default = null;
type = with lib.types; nullOr package;
description = ''
kernel to be used
Has no examples as doc complains...
#example = pkgs.linuxPackages_xanmod_latest;
'';
};
hostname = lib.mkOption {
default = "nixos";
@ -202,12 +203,8 @@
};
config =
{
# conf.kernel = lib.mkIf (
# config.mods.gaming.enable && config.mods.gaming.kernel
# ) pkgs.linuxPackages_xanmod_latest;
}
// (lib.optionalAttrs (options ? system.stateVersion) {
(lib.optionalAttrs (options ? system.stateVersion) {
boot.kernelPackages = lib.mkIf (config.conf.kernelOverride != null) config.conf.kernel;
system.stateVersion = config.conf.systemStateVersion;
})
// (lib.optionalAttrs (options ? home.stateVersion) {

1
modules/programs/gaming.nix
View file

@ -60,6 +60,7 @@
config = lib.mkIf config.mods.gaming.enable (
lib.optionalAttrs (options ? environment.systemPackages) {
environment.systemPackages = config.mods.gaming.tools;
boot.kernelPackages = lib.mkForce pkgs.linuxPackages_xanmod_latest;
programs = {
steam.enable = config.mods.gaming.steam;

16
modules/programs/git.nix
View file

@ -22,12 +22,22 @@
ssh_config = lib.mkOption {
default = ''
Host github.com
${if (config ? sops.secrets ? hub.path) then "IdentityFile ${config.sops.secrets.hub.path}" else ""}
${
if (config ? sops.secrets && config.sops.secrets ? hub.path) then
"IdentityFile ${config.sops.secrets.hub.path}"
else
""
}
Host gitlab.com
${if (config ? sops.secrets ? lab.path) then "IdentityFile ${config.sops.secrets.lab.path}" else ""}
${
if (config ? sops.secrets && config.sops.secrets ? lab.path) then
"IdentityFile ${config.sops.secrets.lab.path}"
else
""
}
Host dashie.org
${
if (config ? sops.secrets ? dashie.path) then
if (config ? sops.secrets && config.sops.secrets ? dashie.path) then
"IdentityFile ${config.sops.secrets.dashie.path}"
else
""

2
modules/programs/teams.nix
View file

@ -29,7 +29,7 @@ in
}
// (lib.optionalAttrs (options ? boot.kernelModules) {
boot = {
extraModulePackages = [ pkgs.linuxKernel.packages.linux_xanmod_latest.v4l2loopback ];
extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
kernelModules = [ "v4l2loopback" ];
extraModprobeConfig = ''
options v4l2loopback exclusive_caps=1 card_label="Virtual Camera"