From b509228290948e3c5d52a015f741ab8112f43f5f Mon Sep 17 00:00:00 2001
From: dmadisetti <dylan@madisetti.me>
Date: Mon, 24 Jun 2024 15:33:05 +0000
Subject: [PATCH] =?UTF-8?q?Deploying=20to=20template=20from=20@=20dmadiset?=
 =?UTF-8?q?ti/.dots@3cfefce2bbf5e25e0b63d9e3a631a56492675541=20?=
 =?UTF-8?q?=F0=9F=9A=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flake.lock          | 26 +++++++++++++-------------
 flake.nix           |  2 +-
 nix/display/x.nix   |  7 +++----
 nix/spoof/flake.nix |  2 +-
 4 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6689b20b..3ce3de1e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -78,11 +78,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718526747,
-        "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=",
+        "lastModified": 1719180626,
+        "narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0a7ffb28e5df5844d0e8039c9833d7075cdee792",
+        "rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb",
         "type": "github"
       },
       "original": {
@@ -257,11 +257,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1718548414,
-        "narHash": "sha256-1obyIuQPR/Kq1j5/i/5EuAfQrDwjYnjCDG8iLtXmBhQ=",
+        "lastModified": 1719145664,
+        "narHash": "sha256-+0bBlerLxsHUJcKPDWZM1wL3V9bzCFjz+VyRTG8fnUA=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "cde8f7e11f036160b0fd6a9e07dc4c8e4061cf06",
+        "rev": "c3e48cbd88414f583ff08804eb57b0da4c194f9e",
         "type": "github"
       },
       "original": {
@@ -281,11 +281,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718470009,
-        "narHash": "sha256-VBeDG3we0bkbFWMyZy+wjUkmeDN58pGFzw1dQCTeDV8=",
+        "lastModified": 1719220171,
+        "narHash": "sha256-xywM6JoGT8AwfoOFJBTv8GRlvNu8LYqqqMS/OQ6uCgE=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "e0a970cbb8c3af05c80ef48a336ad91efd9b2bf6",
+        "rev": "269411cfed6aab694e46f719277c972de96177bb",
         "type": "github"
       },
       "original": {
@@ -296,17 +296,17 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1718318537,
-        "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=",
+        "lastModified": 1719075281,
+        "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420",
+        "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420",
+        "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
index 9ae48f36..46f9f904 100644
--- a/flake.nix
+++ b/flake.nix
@@ -36,7 +36,7 @@
     # This ensures that we always use the official nix cache.
     # nixpkgs.url = "/home/user/src/nixpkgs-local?cache-bust=4";
     # TODO: Change to patch system NixOs/nix/issues#3920
-    nixpkgs.url = github:nixos/nixpkgs/e9ee548d90ff586a6471b4ae80ae9cfcbceb3420;
+    nixpkgs.url = github:nixos/nixpkgs/a71e967ef3694799d0c418c98332f7ff4cc5f6af;
     nixos-hardware.url = github:NixOS/nixos-hardware;
 
     # Really just to streamline deps.
diff --git a/nix/display/x.nix b/nix/display/x.nix
index 9f2ac9a0..69a591aa 100644
--- a/nix/display/x.nix
+++ b/nix/display/x.nix
@@ -3,18 +3,17 @@
   imports = [ ];
   environment.pathsToLink =
     [ "/libexec" ]; # links /libexec from derivations to /run/current-system/sw
-  hardware.opengl = {
+  hardware.graphics = {
     enable = true;
-    driSupport = true;
-    driSupport32Bit = true;
+    enable32Bit = true;
   };
 
   services.xserver = {
     enable = true;
-    libinput.enable = true;
     displayManager.startx.enable = true;
     desktopManager.xterm.enable = false;
   };
+  services.libinput.enable = true;
 
   # Enable sound.
   sound.enable = true;
diff --git a/nix/spoof/flake.nix b/nix/spoof/flake.nix
index f23f8bf1..dbc8d36f 100644
--- a/nix/spoof/flake.nix
+++ b/nix/spoof/flake.nix
@@ -50,7 +50,7 @@
       # Specific programs that are unfree
       # nvidia in here for testing purposes with my hardware.
       # Remove or change for your systems.
-      unfree = [ "nvidia-x11" "nvidia-settings" ];
+      unfree = [ "nvidia-x11" "libXNVCtrl" "nvidia-settings" ];
       # Allow all unfree programs
       sellout = false;