diff --git a/configurations/camelot/nextcloud.nix b/configurations/camelot/nextcloud.nix
index cfa8e59..37e5ba9 100644
--- a/configurations/camelot/nextcloud.nix
+++ b/configurations/camelot/nextcloud.nix
@@ -1,4 +1,9 @@
-{ config, extraInfo, pkgs, ... }:
+{
+  config,
+  extraInfo,
+  pkgs,
+  ...
+}:
 {
   services.nginx.virtualHosts.${extraInfo.nextcloudURI} = {
     enableACME = true;
diff --git a/modules/common/hardware.nix b/modules/common/hardware.nix
index 6f874e1..9219b77 100644
--- a/modules/common/hardware.nix
+++ b/modules/common/hardware.nix
@@ -31,11 +31,6 @@ with lib;
       extraPackages = with pkgs; [
         (mkIf (config.hwAccelerationGPU == "intel") intel-media-driver)
         (mkIf (config.hwAccelerationGPU == "intel") intel-compute-runtime)
-        (mkIf (config.hwAccelerationGPU == "nvidia") vulkan-validation-layers)
-        (mkIf (config.hwAccelerationGPU == "nvidia") vulkan-headers)
-        (mkIf (config.hwAccelerationGPU == "nvidia") vulkan-caps-viewer)
-        (mkIf (config.hwAccelerationGPU == "nvidia") vulkan-extension-layer)
-        (mkIf (config.hwAccelerationGPU == "nvidia") vulkan-tools)
       ];
     };
 
diff --git a/modules/workstation/home-manager/desktop/default.nix b/modules/workstation/home-manager/desktop/default.nix
index e5a549f..9553bed 100644
--- a/modules/workstation/home-manager/desktop/default.nix
+++ b/modules/workstation/home-manager/desktop/default.nix
@@ -2,27 +2,41 @@
   lib,
   config,
   pkgs,
+  nvidiaGPU,
   ...
 }:
 with lib;
 let
-  desktopPackages = with pkgs; [
-    xwayland
-    grim
-    slurp
-    wl-clipboard
-    clipman
-    wf-recorder
-    (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
-    qt5ct
-    libsForQt5.qtstyleplugin-kvantum
-    font-awesome
-    nordzy-cursor-theme
-    jetbrains-mono
-    xdg-utils
-    libnotify
-    gnome.adwaita-icon-theme
-  ];
+  desktopPackages =
+    with pkgs;
+    [
+      grim
+      slurp
+      wl-clipboard
+      clipman
+      wf-recorder
+      (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
+      qt5ct
+      libsForQt5.qtstyleplugin-kvantum
+      font-awesome
+      nordzy-cursor-theme
+      jetbrains-mono
+      xdg-utils
+      libnotify
+      gnome.adwaita-icon-theme
+    ]
+    ++ (
+      if nvidiaGPU then
+        [
+          vulkan-validation-layers
+          vulkan-headers
+          vulkan-caps-viewer
+          vulkan-extension-layer
+          vulkan-tools
+        ]
+      else
+        [ ]
+    );
 in
 {
   imports = [
diff --git a/modules/workstation/home-manager/desktop/sway.nix b/modules/workstation/home-manager/desktop/sway.nix
index e30e32f..66feef3 100644
--- a/modules/workstation/home-manager/desktop/sway.nix
+++ b/modules/workstation/home-manager/desktop/sway.nix
@@ -27,7 +27,6 @@ in
 
   config.wayland.windowManager.sway = mkIf config.desktop.enableSwayStack {
     enable = true;
-    package = null;
     systemd.enable = false;
     checkConfig = false;
 
@@ -233,6 +232,8 @@ in
       default_border pixel
     '';
 
+    xwayland = false;
+
     extraSessionCommands = ''
       export WLR_NO_HARDWARE_CURSORS=1
       export XDG_CURRENT_DESKTOP=sway
diff --git a/modules/workstation/home-manager/fish.nix b/modules/workstation/home-manager/fish.nix
index fba1224..e7660a3 100644
--- a/modules/workstation/home-manager/fish.nix
+++ b/modules/workstation/home-manager/fish.nix
@@ -31,7 +31,7 @@ with lib;
     shellInit = ''
       set -g theme_color_scheme nord
       if [ -z $DISPLAY ] && [ "$(tty)" = /dev/tty1 ]
-        exec ${pkgs.sway}/bin/.sway-wrapped ${unsupportedGPUFlag}
+        exec sway ${unsupportedGPUFlag}
       end
     '';
   };
diff --git a/modules/workstation/home-manager/helix.nix b/modules/workstation/home-manager/helix.nix
index e32fa68..40c5739 100644
--- a/modules/workstation/home-manager/helix.nix
+++ b/modules/workstation/home-manager/helix.nix
@@ -1,4 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
 with lib;
 {
   programs.helix.settings = mkIf config.programs.helix.enable { theme = "nord"; };
diff --git a/modules/workstation/home-manager/neovim/default.nix b/modules/workstation/home-manager/neovim/default.nix
index d574f08..f3c91ac 100644
--- a/modules/workstation/home-manager/neovim/default.nix
+++ b/modules/workstation/home-manager/neovim/default.nix
@@ -15,7 +15,6 @@ with lib;
     '';
   };
 
-
   config.programs.neovim = mkIf config.desktop.enableNeovim {
     enable = true;