sway: enable xwayland (but not for sxmo)

This commit is contained in:
2023-09-06 07:55:03 +00:00
parent 743f669b8c
commit 1076289490
3 changed files with 15 additions and 7 deletions

View File

@@ -39,6 +39,9 @@ in
bindsym --locked XF86AudioLowerVolume exec $volume_down bindsym --locked XF86AudioLowerVolume exec $volume_down
''; '';
}; };
background = mkOption {
type = types.path;
};
font = mkOption { font = mkOption {
type = types.string; type = types.string;
default = "pango:monospace 11"; default = "pango:monospace 11";
@@ -46,9 +49,6 @@ in
default font (for e.g. window titles) default font (for e.g. window titles)
''; '';
}; };
background = mkOption {
type = types.path;
};
mod = mkOption { mod = mkOption {
type = types.string; type = types.string;
default = "Mod4"; default = "Mod4";
@@ -68,6 +68,14 @@ in
- etc - etc
''; '';
}; };
xwayland = mkOption {
type = types.bool;
default = true;
description = ''
whether or not to enable xwayland (allows running X11 apps on sway).
some electron apps (e.g. element-desktop) require xwayland.
'';
};
# TODO: split these into their own option scope # TODO: split these into their own option scope
brightness_down_cmd = mkOption { brightness_down_cmd = mkOption {

View File

@@ -20,8 +20,6 @@ let
''; '';
# TODO: splatmoji release > 1.2.0 should allow `-s none` to disable skin tones # TODO: splatmoji release > 1.2.0 should allow `-s none` to disable skin tones
emoji_cmd = "${pkgs.splatmoji}/bin/splatmoji -s medium-light type"; emoji_cmd = "${pkgs.splatmoji}/bin/splatmoji -s medium-light type";
xwayland = "disable";
in pkgs.substituteAll { in pkgs.substituteAll {
src = ./sway-config; src = ./sway-config;
inherit inherit
@@ -33,7 +31,6 @@ in pkgs.substituteAll {
terminal_cmd terminal_cmd
vol_down_cmd vol_down_cmd
vol_up_cmd vol_up_cmd
xwayland
; ;
inherit (config) inherit (config)
background background
@@ -46,6 +43,7 @@ in pkgs.substituteAll {
mod mod
workspace_layout workspace_layout
; ;
xwayland = if config.xwayland then "enable" else "disable";
playerctl = "${pkgs.playerctl}/bin/playerctl"; playerctl = "${pkgs.playerctl}/bin/playerctl";
waybar = "${pkgs.waybar}/bin/waybar"; waybar = "${pkgs.waybar}/bin/waybar";
} }

View File

@@ -211,9 +211,11 @@ in
# - `bindsym $mod+Shift+p exec sxmo_appmenu.sh sys` # - `bindsym $mod+Shift+p exec sxmo_appmenu.sh sys`
# - `input * xkb_options compose:ralt` # - `input * xkb_options compose:ralt`
# these could be added, but i don't see much benefit. # these could be added, but i don't see much benefit.
mod = "Mod1"; # prefer Alt
font = "Sxmo 10"; font = "Sxmo 10";
mod = "Mod1"; # prefer Alt
xwayland = false; # disable to reduce RAM usage.
workspace_layout = "tabbed"; workspace_layout = "tabbed";
brightness_down_cmd = "sxmo_brightness.sh down"; brightness_down_cmd = "sxmo_brightness.sh down";
brightness_up_cmd = "sxmo_brightness.sh up"; brightness_up_cmd = "sxmo_brightness.sh up";
screenshot_cmd = "sxmo_screenshot.sh"; screenshot_cmd = "sxmo_screenshot.sh";