From da29250fef605b5e5eca0db672e7763c0e6b0e32 Mon Sep 17 00:00:00 2001 From: Mark Nipper Date: Wed, 23 Oct 2024 00:30:49 -0700 Subject: Add nVidia patches --- flake.nix | 9 +++++++-- hosts/arrakis/hardware-configuration.nix | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 7cd2744..2291ef9 100644 --- a/flake.nix +++ b/flake.nix @@ -23,6 +23,11 @@ nixpkgs-stable.url = "github:nixos/nixpkgs/release-24.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nvidia-patch = { + url = "github:icewind1991/nvidia-patch-nixos"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -30,14 +35,14 @@ }; - outputs = inputs@{ home-manager-stable, home-manager, nixos-hardware, nixpkgs-stable, nixpkgs, sops-nix, ... }: { + outputs = inputs@{ home-manager-stable, home-manager, nixos-hardware, nixpkgs-stable, nixpkgs, nvidia-patch, sops-nix }: { nixosConfigurations = { arrakis = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; - specialArgs = { + specialArgs = { inherit inputs nvidia-patch; pkgs = import nixpkgs { inherit system; config.allowUnfree = true; diff --git a/hosts/arrakis/hardware-configuration.nix b/hosts/arrakis/hardware-configuration.nix index ed9b51e..7d5c4bf 100644 --- a/hosts/arrakis/hardware-configuration.nix +++ b/hosts/arrakis/hardware-configuration.nix @@ -1,8 +1,11 @@ # 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, lib, pkgs, modulesPath, ... }: +{ config, inputs, lib, nvidia-patch, pkgs, modulesPath, ... }: +let + package = config.boot.kernelPackages.nvidiaPackages.beta; +in { imports = [ #(modulesPath + "/installer/scan/not-detected.nix") @@ -88,6 +91,8 @@ { device = "/dev/disk/by-label/swap2"; } ]; + nixpkgs.overlays = [ inputs.nvidia-patch.overlays.default ]; + hardware = { bluetooth.enable = true; graphics = { @@ -98,7 +103,7 @@ nvidia = { modesetting.enable = true; open = true; - package = config.boot.kernelPackages.nvidiaPackages.beta; + package = pkgs.nvidia-patch.patch-nvenc (pkgs.nvidia-patch.patch-fbc package); }; }; } -- cgit v1.2.3