add xwayland

This commit is contained in:
Noa Aarts 2024-11-20 14:31:47 +01:00
parent e502de408b
commit 000b3ff351
Signed by: noa
GPG key ID: 1850932741EFF672
2 changed files with 11 additions and 4 deletions

View file

@ -82,12 +82,15 @@ in
''; '';
}; };
preferXdgDirectories = true; preferXdgDirectories = true;
sessionVariables = sessionVariables = lib.mkMerge [
{ {
EDITOR = "nvim"; EDITOR = "nvim";
TERM = "kitty"; TERM = "kitty";
} }
// lib.mkIf enableGraphical { lib.mkIf
enableGraphical
{
DISPLAY = ":0";
GDK_BACKEND = "wayland,x11"; GDK_BACKEND = "wayland,x11";
QT_QPA_PLATFORM = "wayland;xcb"; QT_QPA_PLATFORM = "wayland;xcb";
CLUTTER_BACKEND = "wayland"; CLUTTER_BACKEND = "wayland";
@ -95,7 +98,8 @@ in
XDG_SESSION_TYPE = "wayland"; XDG_SESSION_TYPE = "wayland";
XDG_SESSION_DESKTOP = "niri"; XDG_SESSION_DESKTOP = "niri";
WLR_NO_HARDWARE_CURSORS = "1"; WLR_NO_HARDWARE_CURSORS = "1";
}; }
];
stateVersion = "23.11"; # Do not change :3 stateVersion = "23.11"; # Do not change :3
username = me.nickname; username = me.nickname;
}; };

View file

@ -170,7 +170,10 @@
appbar = "${pkgs.waybar}/bin/waybar"; appbar = "${pkgs.waybar}/bin/waybar";
extra = extra =
"spawn-at-startup \"" "spawn-at-startup \""
+ lib.strings.concatStringsSep "\nspawn-at-startup \"" [ "${pkgs.dunst}/bin/dunst\"" ]; + lib.strings.concatStringsSep "\nspawn-at-startup \"" [
"${pkgs.dunst}/bin/dunst\""
"${pkgs.xwayland-satellite}/bin/xwayland-satellite\""
];
}; };
}; };
}; };