From 1588876ac8f77e989d7b610f7370e7c2bbcd23bc Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Fri, 10 Mar 2023 02:49:49 +0100
Subject: [PATCH] feat: goodbye nvidia, A770 time

---
 machines/common/hyprland.nix   |  8 +-------
 machines/futomaki/default.nix  |  6 ++----
 machines/futomaki/hardware.nix | 16 +++++++++-------
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/machines/common/hyprland.nix b/machines/common/hyprland.nix
index 1e12f12..dfb3713 100644
--- a/machines/common/hyprland.nix
+++ b/machines/common/hyprland.nix
@@ -1,16 +1,10 @@
-let
-  nvidiaPrefix = "GDM_BACKEND=nvidia-drm LIBVA_DRIVER_NAME=nvidia __GLX_VENDOR_LIBRARY_NAME=nvidia WLR_NO_HARDWARE_CURSORS=1";
-in {
-  environment.shellAliases = {
-    nvidia = "${nvidiaPrefix} Hyprland";
-  };
+{
   programs.hyprland = {
     enable = true;
     xwayland = {
       enable = true;
       hidpi = true;
     };
-    nvidiaPatches = true;
   };
   xdg.portal.enable = true;
   xdg.portal.wlr.enable = true;
diff --git a/machines/futomaki/default.nix b/machines/futomaki/default.nix
index fec4251..cf5c02b 100644
--- a/machines/futomaki/default.nix
+++ b/machines/futomaki/default.nix
@@ -12,10 +12,8 @@ in {
   ];
 
   boot = {
-    kernelPackages = pkgs.linuxPackages_6_1;
-    # for nvidia
-    loader.systemd-boot.consoleMode = "0";
-    kernelParams = ["quiet" "splash" "vt.global_cursor_default=0"];
+    kernelPackages = pkgs.linuxPackages_6_2;
+    kernelParams = ["quiet" "splash"];
   };
 
   hardware = {
diff --git a/machines/futomaki/hardware.nix b/machines/futomaki/hardware.nix
index f6aec67..bdf5578 100644
--- a/machines/futomaki/hardware.nix
+++ b/machines/futomaki/hardware.nix
@@ -63,11 +63,13 @@
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   # high-resolution display
   hardware.video.hidpi.enable = lib.mkDefault true;
-
-  # fuck you, nvidia
-  services.xserver.videoDrivers = ["nvidia"];
-  hardware.opengl.enable = true;
-  hardware.nvidia.modesetting.enable = true;
-  # Optionally, you may need to select the appropriate driver version for your specific GPU.
-  hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.latest;
+  hardware.opengl = {
+    enable = true;
+    extraPackages = with pkgs; [
+      intel-media-driver
+      vaapiIntel
+      vaapiVdpau
+      libvdpau-va-gl
+    ];
+  };
 }