From bca81cb07418054053eb4cac68e5dc753bbcabb6 Mon Sep 17 00:00:00 2001
From: C4 Patino <c4patino@gmail.com>
Date: Wed, 10 Jun 2026 23:31:39 -0500
Subject: [PATCH] feat: add amd module and sync arisu and tsuki

---
 modules/home/desktop/env/hyprland/default.nix |  4 --
 modules/nixos/hardware/amd/default.nix        | 39 +++++++++++++++++++
 modules/nixos/hardware/nvidia/default.nix     | 35 ++++++++++-------
 systems/x86_64-linux/tsuki/default.nix        |  4 ++
 4 files changed, 65 insertions(+), 17 deletions(-)
 create mode 100644 modules/nixos/hardware/amd/default.nix

diff --git a/modules/home/desktop/env/hyprland/default.nix b/modules/home/desktop/env/hyprland/default.nix
index 0715063..bedbe6b 100755
--- a/modules/home/desktop/env/hyprland/default.nix
+++ b/modules/home/desktop/env/hyprland/default.nix
@@ -64,10 +64,6 @@ in {
           "SDLVIDEODRIVER" = "wayland";
           "CLUTTER_BACKEND" = "wayland";
 
-          "GBM_BACKEND" = "nvidia-drm";
-          "LIBVA_DRIVER_NAME" = "nvidia";
-          "__GLX_VENDOR_LIBRARY_NAME" = "nvidia";
-
           "XCURSOR_SIZE" = "24";
           "HYPRCURSOR_SIZE" = "24";
         };
diff --git a/modules/nixos/hardware/amd/default.nix b/modules/nixos/hardware/amd/default.nix
new file mode 100644
index 0000000..425c7d7
--- /dev/null
+++ b/modules/nixos/hardware/amd/default.nix
@@ -0,0 +1,39 @@
+{
+  config,
+  lib,
+  namespace,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
+  base = "${namespace}.hardware.amd";
+  cfg = getAttrByNamespace config base;
+in {
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "amd";
+  };
+
+  config = mkIf cfg.enable {
+    hardware.graphics = {
+      enable = true;
+      enable32Bit = true;
+
+      extraPackages = with pkgs; [
+        mesa
+        libva
+        libva-utils
+      ];
+
+      extraPackages32 = with pkgs.pkgsi686Linux; [
+        mesa
+      ];
+    };
+
+    services.xserver.videoDrivers = ["amdgpu"];
+
+    environment.sessionVariables = {
+      LIBVA_DRIVER_NAME = "radeonsi";
+    };
+  };
+}
diff --git a/modules/nixos/hardware/nvidia/default.nix b/modules/nixos/hardware/nvidia/default.nix
index ae6d14c..72f926c 100644
--- a/modules/nixos/hardware/nvidia/default.nix
+++ b/modules/nixos/hardware/nvidia/default.nix
@@ -14,23 +14,32 @@ in {
   };
 
   config = mkIf cfg.enable {
-    hardware.graphics = {
-      enable = true;
-      enable32Bit = true;
+    hardware = {
+      graphics = {
+        enable = true;
+        enable32Bit = true;
+      };
+
+      nvidia = {
+        open = false;
+        nvidiaSettings = true;
+        package = config.boot.kernelPackages.nvidiaPackages.stable;
+
+        modesetting.enable = true;
+
+        powerManagement = {
+          enable = false;
+          finegrained = false;
+        };
+      };
     };
 
     services.xserver.videoDrivers = ["nvidia"];
 
-    hardware.nvidia = {
-      modesetting.enable = true;
-      powerManagement.enable = false;
-      powerManagement.finegrained = false;
-
-      open = false;
-
-      nvidiaSettings = true;
-
-      package = config.boot.kernelPackages.nvidiaPackages.stable;
+    environment.sessionVariables = {
+      "GBM_BACKEND" = "nvidia-drm";
+      "LIBVA_DRIVER_NAME" = "nvidia";
+      "__GLX_VENDOR_LIBRARY_NAME" = "nvidia";
     };
   };
 }
diff --git a/systems/x86_64-linux/tsuki/default.nix b/systems/x86_64-linux/tsuki/default.nix
index 029a1c3..98f7202 100755
--- a/systems/x86_64-linux/tsuki/default.nix
+++ b/systems/x86_64-linux/tsuki/default.nix
@@ -18,6 +18,10 @@ in {
       common = enabled;
     };
 
+    hardware = {
+      amd = enabled;
+    };
+
     services = {
       ci = {
         gitea-runner = {