diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2020-06-20 13:28:58 +0200 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2020-06-20 13:28:58 +0200 |
commit | 23578296fed1b8f45ba3a73a72d7705fdd95df45 (patch) | |
tree | f68ab42096b7a4b920f78847b82bc084f989a506 | |
parent | 0914d659e8ee36179047c9743dcf53355da171fb (diff) | |
download | nixos-23578296fed1b8f45ba3a73a72d7705fdd95df45.tar nixos-23578296fed1b8f45ba3a73a72d7705fdd95df45.tar.gz nixos-23578296fed1b8f45ba3a73a72d7705fdd95df45.tar.bz2 nixos-23578296fed1b8f45ba3a73a72d7705fdd95df45.tar.xz nixos-23578296fed1b8f45ba3a73a72d7705fdd95df45.zip |
Revert "..."
This reverts commit 0914d659e8ee36179047c9743dcf53355da171fb.
-rw-r--r-- | sif.nix | 26 | ||||
-rw-r--r-- | sif/boot.nix | 2 |
2 files changed, 16 insertions, 12 deletions
@@ -121,17 +121,21 @@ | |||
121 | }; | 121 | }; |
122 | }; | 122 | }; |
123 | 123 | ||
124 | boot.kernelPackages = pkgs.linuxPackages_latest.extend (self: super: { | 124 | nixpkgs.overlays = [ |
125 | nvidia_x11 = super.nvidia_x11.overrideAttrs (attrs: { | 125 | (self: super: { |
126 | patches = [ | 126 | linuxPackages_latest = super.linuxPackages_latest.extend (self: super: { |
127 | (pkgs.fetchpatch { | 127 | nvidia_x11 = super.nvidia_x11.overrideAttrs (attrs: { |
128 | name = "nvidia-kernel-5.7.patch"; | 128 | patches = [ |
129 | url = "https://gitlab.com/snippets/1965550/raw"; | 129 | (pkgs.fetchpatch { |
130 | sha256 = "03iwxhkajk65phc0h5j7v4gr4fjj6mhxdn04pa57am5qax8i2g9w"; | 130 | name = "nvidia-kernel-5.7.patch"; |
131 | }) | 131 | url = "https://gitlab.com/snippets/1965550/raw"; |
132 | ]; | 132 | sha256 = "03iwxhkajk65phc0h5j7v4gr4fjj6mhxdn04pa57am5qax8i2g9w"; |
133 | }); | 133 | }) |
134 | }); | 134 | ]; |
135 | }); | ||
136 | }); | ||
137 | }) | ||
138 | ]; | ||
135 | 139 | ||
136 | services = { | 140 | services = { |
137 | pcscd.enable = true; | 141 | 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 @@ | |||
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; |