From b06a8e58d7f3c518d15a5d8a4c055042b3cd636e Mon Sep 17 00:00:00 2001
From: k3t <k3t@k3t.dev>
Date: Fri, 4 Sep 2026 16:43:09 -0600
Subject: [PATCH] HOW DID I FUCK THIS UP???????

---
 flake.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/flake.nix b/flake.nix
index 6bb9637..07895d2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -79,15 +79,9 @@
 
         ./modules/sys/hw/boot.nix
         ./modules/sys/hw/libinput.nix
-<<<<<<< HEAD
-        ./modules/sys/hw/cpu/amd64.nix
-        ./modules/sys/hw/gpu/nvidia.nix
-        ./modules/sys/hw/gpu/vmware.nix
-=======
         ./modules/sys/hw/cpu/intel.nix
         ./modules/sys/hw/gpu/nvidia.nix
 
->>>>>>> 29fc11b (whole lotta changes, check individual files)
         ./modules/sys/hw/input/keyboard.nix
         ./modules/sys/hw/input/tablet.nix
         ./modules/sys/hw/input/xbox.nix
@@ -352,5 +346,4 @@
     #    }
     #  ];
     #};
-  };
 }