From 23578296fed1b8f45ba3a73a72d7705fdd95df45 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sat, 20 Jun 2020 13:28:58 +0200
Subject: Revert "..."

This reverts commit 0914d659e8ee36179047c9743dcf53355da171fb.
---
 sif.nix      | 26 +++++++++++++++-----------
 sif/boot.nix |  2 +-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/sif.nix b/sif.nix
index 64f0244b..2e82ee1f 100644
--- a/sif.nix
+++ b/sif.nix
@@ -121,17 +121,21 @@
     };
   };
 
-  boot.kernelPackages = pkgs.linuxPackages_latest.extend (self: super: {
-    nvidia_x11 = super.nvidia_x11.overrideAttrs (attrs: {
-      patches = [
-        (pkgs.fetchpatch {
-          name = "nvidia-kernel-5.7.patch";
-          url = "https://gitlab.com/snippets/1965550/raw";
-          sha256 = "03iwxhkajk65phc0h5j7v4gr4fjj6mhxdn04pa57am5qax8i2g9w";
-        })
-      ];
-    });
-  });
+  nixpkgs.overlays = [
+    (self: super: {
+      linuxPackages_latest = super.linuxPackages_latest.extend (self: super: {
+        nvidia_x11 = super.nvidia_x11.overrideAttrs (attrs: {
+          patches = [
+            (pkgs.fetchpatch {
+              name = "nvidia-kernel-5.7.patch";
+              url = "https://gitlab.com/snippets/1965550/raw";
+              sha256 = "03iwxhkajk65phc0h5j7v4gr4fjj6mhxdn04pa57am5qax8i2g9w";
+            })
+          ];
+        });
+      });
+    })
+  ];
 
   services = {
     pcscd.enable = true;
diff --git a/sif/boot.nix b/sif/boot.nix
index 29b4f4cd..fbfcf5cd 100644
--- a/sif/boot.nix
+++ b/sif/boot.nix
@@ -22,7 +22,7 @@
 
     plymouth.enable = true;
 
-    # kernelPackages = pkgs.linuxPackages_latest;
+    kernelPackages = pkgs.linuxPackages_latest;
     kernelParams = [ "i915.fastboot=1" "intel_pstate=no_hwp" "acpi_backlight=vendor" "thinkpad-acpi.brightness_enable=1" "quiet" ];
 
     tmpOnTmpfs = true;
-- 
cgit v1.2.3