From 7e1316832f52b7e21f2872cf2b79b01e874eaf76 Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Wed, 22 Feb 2023 16:43:58 +0100
Subject: [PATCH] Odin: move kernel settings to common configuration

---
 odin/common_configuration.nix | 1 +
 odin/configuration-intel.nix  | 3 ---
 odin/configuration-nvidia.nix | 5 +----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/odin/common_configuration.nix b/odin/common_configuration.nix
index a9fc79f..0c1bb3a 100644
--- a/odin/common_configuration.nix
+++ b/odin/common_configuration.nix
@@ -5,6 +5,7 @@ with lib; {
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
   boot.initrd.checkJournalingFS = true;
+  boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
 
   # # Cross-build arm
diff --git a/odin/configuration-intel.nix b/odin/configuration-intel.nix
index 4b7b99d..0c00ee4 100644
--- a/odin/configuration-intel.nix
+++ b/odin/configuration-intel.nix
@@ -2,12 +2,9 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ pkgs, ... }:
-
 {
   boot = {
     initrd.kernelModules = [ "i915" ];
-    kernelPackages = pkgs.linuxPackages_latest;
     blacklistedKernelModules = [ "nouveau" "nvidia" ];
   };
 
diff --git a/odin/configuration-nvidia.nix b/odin/configuration-nvidia.nix
index be6ec57..ec147b0 100644
--- a/odin/configuration-nvidia.nix
+++ b/odin/configuration-nvidia.nix
@@ -3,10 +3,7 @@
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 { pkgs, ... }: {
 
-  boot = {
-    initrd.kernelModules = [ "i915" ];
-    kernelPackages = pkgs.linuxPackages_latest;
-  };
+  boot = { initrd.kernelModules = [ "i915" ]; };
 
   hardware.nvidia = {
     # modesetting.enable = true;