Odin: move kernel settings to common configuration

This commit is contained in:
Filippo Berto 2023-02-22 16:43:58 +01:00
parent 0f8a8ffcca
commit 7e1316832f
No known key found for this signature in database
GPG key ID: FE98AE5EC52B1056
3 changed files with 2 additions and 7 deletions

View file

@ -5,6 +5,7 @@ with lib; {
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.initrd.checkJournalingFS = true; boot.initrd.checkJournalingFS = true;
boot.kernelPackages = pkgs.linuxPackages_latest;
boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
# # Cross-build arm # # Cross-build arm

View file

@ -2,12 +2,9 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help). # and in the NixOS manual (accessible by running nixos-help).
{ pkgs, ... }:
{ {
boot = { boot = {
initrd.kernelModules = [ "i915" ]; initrd.kernelModules = [ "i915" ];
kernelPackages = pkgs.linuxPackages_latest;
blacklistedKernelModules = [ "nouveau" "nvidia" ]; blacklistedKernelModules = [ "nouveau" "nvidia" ];
}; };

View file

@ -3,10 +3,7 @@
# and in the NixOS manual (accessible by running nixos-help). # and in the NixOS manual (accessible by running nixos-help).
{ pkgs, ... }: { { pkgs, ... }: {
boot = { boot = { initrd.kernelModules = [ "i915" ]; };
initrd.kernelModules = [ "i915" ];
kernelPackages = pkgs.linuxPackages_latest;
};
hardware.nvidia = { hardware.nvidia = {
# modesetting.enable = true; # modesetting.enable = true;