Sway: remove XWayland

This commit is contained in:
Victor Mignot 2024-04-23 12:49:11 +02:00
parent c25ab8f4de
commit e5c3db56d4
Signed by: dala
GPG key ID: 5E7F2CE1BEAFED3D
7 changed files with 46 additions and 27 deletions

View file

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

View file

@ -31,11 +31,6 @@ with lib;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
(mkIf (config.hwAccelerationGPU == "intel") intel-media-driver) (mkIf (config.hwAccelerationGPU == "intel") intel-media-driver)
(mkIf (config.hwAccelerationGPU == "intel") intel-compute-runtime) (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)
]; ];
}; };

View file

@ -2,27 +2,41 @@
lib, lib,
config, config,
pkgs, pkgs,
nvidiaGPU,
... ...
}: }:
with lib; with lib;
let let
desktopPackages = with pkgs; [ desktopPackages =
xwayland with pkgs;
grim [
slurp grim
wl-clipboard slurp
clipman wl-clipboard
wf-recorder clipman
(nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) wf-recorder
qt5ct (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
libsForQt5.qtstyleplugin-kvantum qt5ct
font-awesome libsForQt5.qtstyleplugin-kvantum
nordzy-cursor-theme font-awesome
jetbrains-mono nordzy-cursor-theme
xdg-utils jetbrains-mono
libnotify xdg-utils
gnome.adwaita-icon-theme libnotify
]; gnome.adwaita-icon-theme
]
++ (
if nvidiaGPU then
[
vulkan-validation-layers
vulkan-headers
vulkan-caps-viewer
vulkan-extension-layer
vulkan-tools
]
else
[ ]
);
in in
{ {
imports = [ imports = [

View file

@ -27,7 +27,6 @@ in
config.wayland.windowManager.sway = mkIf config.desktop.enableSwayStack { config.wayland.windowManager.sway = mkIf config.desktop.enableSwayStack {
enable = true; enable = true;
package = null;
systemd.enable = false; systemd.enable = false;
checkConfig = false; checkConfig = false;
@ -233,6 +232,8 @@ in
default_border pixel default_border pixel
''; '';
xwayland = false;
extraSessionCommands = '' extraSessionCommands = ''
export WLR_NO_HARDWARE_CURSORS=1 export WLR_NO_HARDWARE_CURSORS=1
export XDG_CURRENT_DESKTOP=sway export XDG_CURRENT_DESKTOP=sway

View file

@ -31,7 +31,7 @@ with lib;
shellInit = '' shellInit = ''
set -g theme_color_scheme nord set -g theme_color_scheme nord
if [ -z $DISPLAY ] && [ "$(tty)" = /dev/tty1 ] if [ -z $DISPLAY ] && [ "$(tty)" = /dev/tty1 ]
exec ${pkgs.sway}/bin/.sway-wrapped ${unsupportedGPUFlag} exec sway ${unsupportedGPUFlag}
end end
''; '';
}; };

View file

@ -1,4 +1,9 @@
{ lib, config, pkgs, ... }: {
lib,
config,
pkgs,
...
}:
with lib; with lib;
{ {
programs.helix.settings = mkIf config.programs.helix.enable { theme = "nord"; }; programs.helix.settings = mkIf config.programs.helix.enable { theme = "nord"; };

View file

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