aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Nipper <nipsy@bitgnome.net>2024-10-15 22:40:06 -0700
committerMark Nipper <nipsy@bitgnome.net>2024-10-15 22:40:06 -0700
commitf02a20928ff32fb43f9a0abf0c801482348da324 (patch)
tree35427a8bad4daebe6b730557c6fa0e2fe1d39b40
parent2d1177d41bea495d021f7048ffd49eb31aab1fa1 (diff)
downloadnix-f02a20928ff32fb43f9a0abf0c801482348da324.tar
nix-f02a20928ff32fb43f9a0abf0c801482348da324.tar.gz
nix-f02a20928ff32fb43f9a0abf0c801482348da324.tar.bz2
nix-f02a20928ff32fb43f9a0abf0c801482348da324.tar.lz
nix-f02a20928ff32fb43f9a0abf0c801482348da324.tar.xz
nix-f02a20928ff32fb43f9a0abf0c801482348da324.tar.zst
nix-f02a20928ff32fb43f9a0abf0c801482348da324.zip
Revert nVidia patches
Diffstat (limited to '')
-rw-r--r--flake.nix9
-rw-r--r--hosts/arrakis/hardware-configuration.nix7
2 files changed, 6 insertions, 10 deletions
diff --git a/flake.nix b/flake.nix
index 97f8527..28781de 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,19 +22,13 @@
nixpkgs-stable.url = "github:nixos/nixpkgs/release-23.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
- nvidia-patch.url = "github:icewind1991/nvidia-patch-nixos";
- nvidia-patch.inputs.nixpkgs.follows = "nixpkgs-unstable";
-
sops-nix = {
url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
};
- outputs = inputs@{ home-manager-stable, home-manager-unstable, nixos-hardware, nixpkgs-stable, nixpkgs-unstable, nvidia-patch, sops-nix, ... }: rec {
-
- nixpkgs.overlays = [ inputs.nvidia-patch.overlays.default ];
-
+ outputs = inputs@{ home-manager-stable, home-manager-unstable, nixos-hardware, nixpkgs-stable, nixpkgs-unstable, sops-nix, ... }: rec {
nixosConfigurations = {
arrakis = nixpkgs-unstable.lib.nixosSystem {
pkgs = pkgs-unstable;
@@ -118,5 +112,4 @@
overlays = [(import ./pkgs)];
};
};
-
}
diff --git a/hosts/arrakis/hardware-configuration.nix b/hosts/arrakis/hardware-configuration.nix
index 8d87066..4e67e65 100644
--- a/hosts/arrakis/hardware-configuration.nix
+++ b/hosts/arrakis/hardware-configuration.nix
@@ -1,3 +1,6 @@
+# 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, ... }:
{
@@ -52,10 +55,10 @@
hardware = {
bluetooth.enable = true;
- nvidia = let package = config.boot.kernelPackages.nvidiaPackages.beta; 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;
};
};
}