HOW DID I FUCK THIS UP???????

2026-09-04 16:43:09 -06:00
parent 4772a085ae
commit b06a8e58d7
1 changed files with 0 additions and 7 deletions
@@ -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 @@
    #    }
    #  ];
    #};
-  };
 }