From 8c27b854f93f3c3e13b63d4597bc5755f4c4eb2f Mon Sep 17 00:00:00 2001 From: Mark Nipper Date: Mon, 21 Oct 2024 09:05:10 -0700 Subject: Remove nVidia patches --- flake.nix | 9 ++------- hosts/arrakis/hardware-configuration.nix | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/flake.nix b/flake.nix index fee0488..e263287 100644 --- a/flake.nix +++ b/flake.nix @@ -23,11 +23,6 @@ nixpkgs-stable.url = "github:nixos/nixpkgs/release-24.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - nvidia-patch = { - url = "github:icewind1991/nvidia-patch-nixos"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; - }; - sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs-unstable"; @@ -35,14 +30,14 @@ }; - outputs = inputs@{ home-manager-stable, home-manager-unstable, nixos-hardware, nixpkgs-stable, nixpkgs-unstable, nvidia-patch, sops-nix, ... }: { + outputs = inputs@{ home-manager-stable, home-manager-unstable, nixos-hardware, nixpkgs-stable, nixpkgs-unstable, sops-nix, ... }: { nixosConfigurations = { arrakis = nixpkgs-unstable.lib.nixosSystem rec { system = "x86_64-linux"; - specialArgs = { inherit inputs nvidia-patch; + specialArgs = { pkgs = import nixpkgs-unstable { inherit system; config.allowUnfree = true; diff --git a/hosts/arrakis/hardware-configuration.nix b/hosts/arrakis/hardware-configuration.nix index 7d5c4bf..ed9b51e 100644 --- a/hosts/arrakis/hardware-configuration.nix +++ b/hosts/arrakis/hardware-configuration.nix @@ -1,11 +1,8 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, inputs, lib, nvidia-patch, pkgs, modulesPath, ... }: +{ config, lib, pkgs, modulesPath, ... }: -let - package = config.boot.kernelPackages.nvidiaPackages.beta; -in { imports = [ #(modulesPath + "/installer/scan/not-detected.nix") @@ -91,8 +88,6 @@ in { device = "/dev/disk/by-label/swap2"; } ]; - nixpkgs.overlays = [ inputs.nvidia-patch.overlays.default ]; - hardware = { bluetooth.enable = true; graphics = { @@ -103,7 +98,7 @@ in nvidia = { modesetting.enable = true; open = true; - package = pkgs.nvidia-patch.patch-nvenc (pkgs.nvidia-patch.patch-fbc package); + package = config.boot.kernelPackages.nvidiaPackages.beta; }; }; } -- cgit v1.2.3