summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2020-06-20 13:27:14 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2020-06-20 13:27:14 +0200
commit0914d659e8ee36179047c9743dcf53355da171fb (patch)
treefc44e5fadabdaa1f9f058e995e5ac583b5a85d03
parent105a4e8b92ce20c256a18cc1bb9369c661247d92 (diff)
downloadnixos-0914d659e8ee36179047c9743dcf53355da171fb.tar
nixos-0914d659e8ee36179047c9743dcf53355da171fb.tar.gz
nixos-0914d659e8ee36179047c9743dcf53355da171fb.tar.bz2
nixos-0914d659e8ee36179047c9743dcf53355da171fb.tar.xz
nixos-0914d659e8ee36179047c9743dcf53355da171fb.zip
...
-rw-r--r--sif.nix26
-rw-r--r--sif/boot.nix2
2 files changed, 12 insertions, 16 deletions
diff --git a/sif.nix b/sif.nix
index 2e82ee1f..64f0244b 100644
--- a/sif.nix
+++ b/sif.nix
@@ -121,21 +121,17 @@
121 }; 121 };
122 }; 122 };
123 123
124 nixpkgs.overlays = [ 124 boot.kernelPackages = pkgs.linuxPackages_latest.extend (self: super: {
125 (self: super: { 125 nvidia_x11 = super.nvidia_x11.overrideAttrs (attrs: {
126 linuxPackages_latest = super.linuxPackages_latest.extend (self: super: { 126 patches = [
127 nvidia_x11 = super.nvidia_x11.overrideAttrs (attrs: { 127 (pkgs.fetchpatch {
128 patches = [ 128 name = "nvidia-kernel-5.7.patch";
129 (pkgs.fetchpatch { 129 url = "https://gitlab.com/snippets/1965550/raw";
130 name = "nvidia-kernel-5.7.patch"; 130 sha256 = "03iwxhkajk65phc0h5j7v4gr4fjj6mhxdn04pa57am5qax8i2g9w";
131 url = "https://gitlab.com/snippets/1965550/raw"; 131 })
132 sha256 = "03iwxhkajk65phc0h5j7v4gr4fjj6mhxdn04pa57am5qax8i2g9w"; 132 ];
133 }) 133 });
134 ]; 134 });
135 });
136 });
137 })
138 ];
139 135
140 services = { 136 services = {
141 pcscd.enable = true; 137 pcscd.enable = true;
diff --git a/sif/boot.nix b/sif/boot.nix
index fbfcf5cd..29b4f4cd 100644
--- a/sif/boot.nix
+++ b/sif/boot.nix
@@ -22,7 +22,7 @@
22 22
23 plymouth.enable = true; 23 plymouth.enable = true;
24 24
25 kernelPackages = pkgs.linuxPackages_latest; 25 # kernelPackages = pkgs.linuxPackages_latest;
26 kernelParams = [ "i915.fastboot=1" "intel_pstate=no_hwp" "acpi_backlight=vendor" "thinkpad-acpi.brightness_enable=1" "quiet" ]; 26 kernelParams = [ "i915.fastboot=1" "intel_pstate=no_hwp" "acpi_backlight=vendor" "thinkpad-acpi.brightness_enable=1" "quiet" ];
27 27
28 tmpOnTmpfs = true; 28 tmpOnTmpfs = true;