From df59d8c69829f65398e4bb2f1250746f44fddd6b Mon Sep 17 00:00:00 2001
From: Victor Mignot <dala@dalaran.fr>
Date: Thu, 11 Apr 2024 08:48:54 +0200
Subject: [PATCH] london: switch to AMD gpu

---
 configurations/london/default.nix         | 2 +-
 modules/common/hardware.nix               | 6 +++---
 modules/workstation/home-manager/fish.nix | 4 +---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/configurations/london/default.nix b/configurations/london/default.nix
index f65b3df..3eac100 100644
--- a/configurations/london/default.nix
+++ b/configurations/london/default.nix
@@ -61,7 +61,7 @@
   allowUnfreePackages = true;
 
   /* Hardware acceleration */
-  hwAccelerationGPU = "nvidia";
+  hwAccelerationGPU = "amd";
 
   keymap = "fr";
 
diff --git a/modules/common/hardware.nix b/modules/common/hardware.nix
index 16a4108..93a3ec0 100644
--- a/modules/common/hardware.nix
+++ b/modules/common/hardware.nix
@@ -2,7 +2,7 @@
 with lib;
 {
   options.hwAccelerationGPU = mkOption {
-    type = types.nullOr (types.enum [ "nvidia" "intel" ]);
+    type = types.nullOr (types.enum [ "nvidia" "intel" "amd" ]);
     default = null;
     example = "nvidia";
     description = ''
@@ -30,8 +30,8 @@ with lib;
       ];
     };
 
-    services.xserver.videoDrivers = [
-      (mkIf (config.hwAccelerationGPU == "nvidia") "nouveau")
+    services.xserver.videoDrivers = mkIf (config.hwAccelerationGPU == "nvidia") [
+      "nouveau"
     ];
   };
 }
diff --git a/modules/workstation/home-manager/fish.nix b/modules/workstation/home-manager/fish.nix
index 5faaea1..2a32b0b 100644
--- a/modules/workstation/home-manager/fish.nix
+++ b/modules/workstation/home-manager/fish.nix
@@ -24,9 +24,7 @@ with lib;
     shellInit = ''
       set -g theme_color_scheme nord
       if [ -z $DISPLAY ] && [ "$(tty)" = /dev/tty1 ]
-        # To be used when Mesa 24.1 is out
-        # exec ${pkgs.sway}/bin/.sway-wrapped
-        exec ${pkgs.sway}/bin/sway
+        exec ${pkgs.sway}/bin/.sway-wrapped
       end
     '';
   };