From 09c7f7d498cfa214c822a8f16eb6a7de35fb3f3b Mon Sep 17 00:00:00 2001 From: seth Date: Sun, 5 Mar 2023 15:29:43 -0500 Subject: unpin kernel/nvidia package --- flake.nix | 1 - hosts/common/hardware/nvidia.nix | 4 ++-- hosts/glados/boot.nix | 10 ++-------- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/flake.nix b/flake.nix index a2ccd2b..ee0ee66 100644 --- a/flake.nix +++ b/flake.nix @@ -54,7 +54,6 @@ name = "glados"; specialArgs = { desktop = "gnome"; - nixpkgsStable = nixpkgs; standalone = false; wsl = false; }; diff --git a/hosts/common/hardware/nvidia.nix b/hosts/common/hardware/nvidia.nix index 6a4b177..99f7d6e 100644 --- a/hosts/common/hardware/nvidia.nix +++ b/hosts/common/hardware/nvidia.nix @@ -7,8 +7,8 @@ nvidia = { package = config.boot.kernelPackages.nvidiaPackages.stable; modesetting.enable = true; - nvidiaPersistenced = true; - powerManagement.enable = true; + # nvidiaPersistenced = true; + # powerManagement.enable = true; }; opengl = { enable = true; diff --git a/hosts/glados/boot.nix b/hosts/glados/boot.nix index 34dcc14..deb843b 100644 --- a/hosts/glados/boot.nix +++ b/hosts/glados/boot.nix @@ -1,14 +1,8 @@ { lib, pkgs, - nixpkgsStable, ... -}: let - pinned-kernel = import nixpkgsStable { - system = "x86_64-linux"; - config.allowUnfree = true; - }; -in { +}: { environment.systemPackages = with pkgs; [ sbctl tpm2-tss @@ -16,7 +10,7 @@ in { boot = { initrd.systemd.enable = true; - kernelPackages = pinned-kernel.pkgs.linuxPackages_6_1; + kernelPackages = pkgs.linuxPackages_6_1; kernel.sysctl = { "vm.swappiness" = 100; -- cgit v1.2.3