Sway: remove XWayland

configurations/camelot/nextcloud.nix

@@ -1,4 +1,9 @@
-{ config, extraInfo, pkgs, ... }:
+{
+  config,
+  extraInfo,
+  pkgs,
+  ...
+}:
 {
   services.nginx.virtualHosts.${extraInfo.nextcloudURI} = {
     enableACME = true;

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)
       ];
     };
 

modules/workstation/home-manager/desktop/default.nix

@@ -2,12 +2,14 @@
   lib,
   config,
   pkgs,
+  nvidiaGPU,
   ...
 }:
 with lib;
 let
-  desktopPackages = with pkgs; [
+  desktopPackages =
-    xwayland
+    with pkgs;
+    [
       grim
       slurp
       wl-clipboard
@@ -22,7 +24,19 @@ let
       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 = [

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

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
     '';
   };

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"; };

modules/workstation/home-manager/neovim/default.nix

@@ -15,7 +15,6 @@ with lib;
     '';
   };
 
-
   config.programs.neovim = mkIf config.desktop.enableNeovim {
     enable = true;