File 002-xkb-layout.patch of Package lxqt-wayland-session

diff --git a/configurations/labwc/environment b/configurations/labwc/environment
index e78c05c..aff2c55 100644
--- a/configurations/labwc/environment
+++ b/configurations/labwc/environment
@@ -6,8 +6,8 @@
 ##
 ## Cursor theme and size are set by LXQt and can be configured in"Appearance → Cursor".
 ## No need to edit.
-# XCURSOR_THEME=
-# XCURSOR_SIZE=
+XCURSOR_THEME=Adwaita
+XCURSOR_SIZE=22
 
 ## Disable hardware cursors. Most users wouldn't want to do this, but if you
 ## are experiencing issues with disappearing cursors, this might fix it.
@@ -72,7 +72,6 @@
 ## For further details, see xkeyboard-config(7)
 ##
 
-# XKB_DEFAULT_LAYOUT=se
-# XKB_DEFAULT_LAYOUT=se,us(intl)
-# XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle
-# XKB_DEFAULT_OPTIONS=grp:shift_caps_toggle,compose:ralt
+#XKB_DEFAULT_LAYOUT=us,ru
+XKB_DEFAULT_VARIANT=,winkeys
+XKB_DEFAULT_OPTIONS=terminate:ctrl_alt_bksp,grp:ctrl_shift_toggle,grp_led:scrol
diff --git a/startlxqtwayland.in b/startlxqtwayland.in
index b1dbcef..23ac985 100644
--- a/startlxqtwayland.in
+++ b/startlxqtwayland.in
@@ -103,7 +103,7 @@ elif [ "$COMPOSITOR" = "labwc" ]; then
     if [ ! -d "$XDG_CONFIG_HOME/labwc" ]; then
        cp -av "$share_dir"/lxqt/wayland/labwc "$XDG_CONFIG_HOME"/  # use default location here
        if echo "$valid_layouts" | grep -q "$trylayout"; then
-          echo "XKB_DEFAULT_LAYOUT=$trylayout" >> $XDG_CONFIG_HOME/labwc/environment
+          echo "XKB_DEFAULT_LAYOUT=us,$trylayout" >> $XDG_CONFIG_HOME/labwc/environment
        fi
     fi
 
@@ -128,7 +128,7 @@ elif [ "$COMPOSITOR" = "kwin_wayland" ]; then
     export XDG_CURRENT_DESKTOP="LXQt:$COMPOSITOR"
     if echo "$valid_layouts" | grep -q "$trylayout"; then
         kxkbrc=$XDG_CONFIG_HOME/kxkbrc
-        layout="LayoutList=$trylayout"
+        layout="LayoutList=us,$trylayout"
         if [ -f $XDG_CONFIG_HOME/kxkbrc ]; then
             if ! grep -q "LayoutList" "$kxkbrc"; then
                 echo $layout >> $XDG_CONFIG_HOME/kxkbrc
@@ -145,7 +145,7 @@ elif [ "$COMPOSITOR" = "wayfire" ]; then
     if [ ! -f "$XDG_CONFIG_HOME/lxqt/wayland/lxqt-wayfire.ini" ]; then
         cp "$share_dir"/lxqt/wayland/lxqt-wayfire.ini "$XDG_CONFIG_HOME"/lxqt/wayland/
         if echo "$valid_layouts" | grep -q "$trylayout"; then
-        layout="xkb_layout = $trylayout"
+        layout="xkb_layout = us,$trylayout"
         sed -i '/xkb_layout/d' $XDG_CONFIG_HOME/lxqt/wayland/lxqt-wayfire.ini
         sed -i "/\[input\]/a $layout" $XDG_CONFIG_HOME/lxqt/wayland/lxqt-wayfire.ini
         fi
@@ -156,7 +156,7 @@ elif [ "$COMPOSITOR" = "sway" ]; then
     if [ ! -f "$XDG_CONFIG_HOME/lxqt/wayland/lxqt-sway.config" ]; then
         cp "$share_dir"/lxqt/wayland/lxqt-sway.config "$XDG_CONFIG_HOME"/lxqt/wayland/
         if echo "$valid_layouts" | grep -q "$trylayout"; then
-        layout="xkb_layout $trylayout"
+        layout="xkb_layout us,$trylayout"
         sed -i '/xkb_layout/d' $XDG_CONFIG_HOME/lxqt/wayland/lxqt-sway.config
         sed -i "/input \"type\:keyboard\"/a $layout" $XDG_CONFIG_HOME/lxqt/wayland/lxqt-sway.config
         fi
@@ -167,7 +167,7 @@ elif [ "$COMPOSITOR" = "Hyprland" ]; then
     if [ ! -f "$XDG_CONFIG_HOME/lxqt/wayland/lxqt-hyprland.conf" ]; then
         cp "$share_dir"/lxqt/wayland/lxqt-hyprland.conf "$XDG_CONFIG_HOME"/lxqt/wayland/
         if echo "$valid_layouts" | grep -q "$trylayout"; then
-            layout="kb_layout = $trylayout"
+            layout="kb_layout = us,$trylayout"
             sed -i "s/kb_layout = us/$layout/" "$XDG_CONFIG_HOME/lxqt/wayland/lxqt-hyprland.conf"
         fi
     fi
@@ -181,7 +181,7 @@ elif [ "$COMPOSITOR" = "river" ]; then
         cp "$share_dir"/lxqt/wayland/lxqt-river-init "$XDG_CONFIG_HOME"/lxqt/wayland/
         chmod a+x "$XDG_CONFIG_HOME"/lxqt/wayland/lxqt-river-init
         if echo "$valid_layouts" | grep -q "$trylayout"; then
-            layout="riverctl keyboard-layout $trylayout"
+            layout="riverctl keyboard-layout us,$trylayout"
             sed -i "s/riverctl keyboard-layout us/$layout/" "$XDG_CONFIG_HOME/lxqt/wayland/lxqt-river-init"
         fi
     fi
openSUSE Build Service is sponsored by