From 1a168bc1b58cb8ef0b610a009e1cb27e891d29af Mon Sep 17 00:00:00 2001
From: NullBite <me@nullbite.com>
Date: Wed, 28 Feb 2024 10:52:42 -0500
Subject: [PATCH] Update flake.lock and remove mesa override

Nvidia Wayland stuff seems to be fixed with the latest Nvidia update
---
 flake.lock                      | 47 +++++++++++----------------------
 flake.nix                       |  2 --
 hosts/nullbox/configuration.nix |  6 -----
 3 files changed, 15 insertions(+), 40 deletions(-)

diff --git a/flake.lock b/flake.lock
index 520e8ea..1d5bc9e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -80,11 +80,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1708806879,
-        "narHash": "sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI=",
+        "lastModified": 1708988456,
+        "narHash": "sha256-RCz7Xe64tN2zgWk+MVHkzg224znwqknJ1RnB7rVqUWw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4ee704cb13a5a7645436f400b9acc89a67b9c08a",
+        "rev": "1d085ea4444d26aa52297758b333b449b2aa6fca",
         "type": "github"
       },
       "original": {
@@ -103,11 +103,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1708906756,
-        "narHash": "sha256-mKksRwLcI+j6cCG7eSkIf0JzsXumlUMpssZKZZHiXrE=",
+        "lastModified": 1709132440,
+        "narHash": "sha256-FJB10xJc7tlwhQJ0DA0XRdKuiMxbcBleqoEH+VHmdgU=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "dfcfb92ec611345848f3840d34d66b8501e6367c",
+        "rev": "4bc669f9331bb66ab30bd705d09f1239bc3e83ed",
         "type": "github"
       },
       "original": {
@@ -244,29 +244,13 @@
         "type": "github"
       }
     },
-    "nixpkgs-mesa-fix": {
-      "locked": {
-        "lastModified": 1708100828,
-        "narHash": "sha256-h6wKqrpRjuLY/lo4HqPti2UL8grxPKnKlcSpqdP9je8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "5c01128ec0a607423838f82106b4bd62abc6da9c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "5c01128ec0a607423838f82106b4bd62abc6da9c",
-        "type": "github"
-      }
-    },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1708847675,
-        "narHash": "sha256-RUZ7KEs/a4EzRELYDGnRB6i7M1Izii3JD/LyzH0c6Tg=",
+        "lastModified": 1709101946,
+        "narHash": "sha256-TsySgcWm/GlbYdL3AEva49ceeI2BdPQ7muwfYNr1fwo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2a34566b67bef34c551f204063faeecc444ae9da",
+        "rev": "d53c2037394da6fe98decca417fc8fda64bf2443",
         "type": "github"
       },
       "original": {
@@ -278,11 +262,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1708831307,
-        "narHash": "sha256-0iL/DuGjiUeck1zEaL+aIe2WvA3/cVhp/SlmTcOZXH4=",
+        "lastModified": 1708979614,
+        "narHash": "sha256-FWLWmYojIg6TeqxSnHkKpHu5SGnFP5um1uUjH+wRV6g=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5bf1cadb72ab4e77cb0b700dab76bcdaf88f706b",
+        "rev": "b7ee09cf5614b02d289cd86fcfa6f24d4e078c2a",
         "type": "github"
       },
       "original": {
@@ -317,7 +301,6 @@
         "nix-index-database": "nix-index-database",
         "nix-wsl": "nix-wsl",
         "nixpkgs": "nixpkgs_2",
-        "nixpkgs-mesa-fix": "nixpkgs-mesa-fix",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "pkg-android-tools": "pkg-android-tools",
         "rust-overlay": "rust-overlay",
@@ -332,11 +315,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1708913568,
-        "narHash": "sha256-76PGANC2ADf0h7fe0w2nWpfdGN+bemFs2rvW2EdU/ZY=",
+        "lastModified": 1709086241,
+        "narHash": "sha256-3QHK5zu/5XOa+ghBeKzvt+/BLdEPjw/xDNLcpDfbkmg=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "cbdf3e5bb205ff2ca165fe661fbd6d885cbd0106",
+        "rev": "5d56056fb905ff550ee61b6ebb6674d494f57a9e",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index ff008a2..003cf9f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,8 +6,6 @@
                  # ^^^^^^^^^^^^^ this part is optional
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
-    nixpkgs-mesa-fix.url = "github:NixOS/nixpkgs/5c01128ec0a607423838f82106b4bd62abc6da9c";
-
     # this seems to be a popular way to declare systems
     systems.url = "github:nix-systems/default";
 
diff --git a/hosts/nullbox/configuration.nix b/hosts/nullbox/configuration.nix
index 05534d5..52badde 100644
--- a/hosts/nullbox/configuration.nix
+++ b/hosts/nullbox/configuration.nix
@@ -29,12 +29,6 @@
       packageSets.gaming.enable = true;
     };
 
-    nixpkgs.overlays = [
-      (final: prev: {
-        mesa = inputs.nixpkgs-mesa-fix.legacyPackages.${pkgs.system}.mesa;
-      })
-    ];
-
     # cryptsetup
     boot.initrd.luks.devices = {
       lvmroot = {