Solve doc kernel issue

base/common_hardware.nix

@@ -24,8 +24,7 @@ in
     plymouth = {
       enable = true;
     };
-    #kernelPackages = config.conf.kernel;
-    kernelPackages = pkgs.linuxPackages_latest;
+    kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
     initrd = {
       verbose = false;
       availableKernelModules = [

docs/default.nix

@@ -13,7 +13,8 @@ let
         option
         // {
           visible =
-            option.visible
+            builtins.elemAt option.loc 0 != "kernel"
+            && option.visible
             && (builtins.elemAt option.loc 0 == "conf" || builtins.elemAt option.loc 0 == "mods");
         };
     };

docs/src/README.md

@@ -116,7 +116,7 @@ Here is a minimal required configuration.nix (the TODOs mention a required chang
 
 After logging in the first time, your password will be set to "firstlogin", please change this to whatever you like.
 
-## Modules
+## Nixos and Home-manager Modules
 
 You can add additional modules or remove all of them by overriding parameters to the build_systems command:
 

modules/conf.nix

@@ -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) {

modules/programs/gaming.nix

@@ -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;

modules/programs/git.nix

@@ -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
               ""

modules/programs/teams.nix

@@ -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"

result

@@ -1 +1 @@
-/nix/store/0fpgnkzjnwbjykdvbk4p2h3c7isb9sz9-dashNix-book
+/nix/store/cp42vzpzj6jls43xf40m6hp7w07sg1xr-dashNix-book