diff --git a/0001-configuration-changes-for-default-labwc-session.patch b/0001-configuration-changes-for-default-labwc-session.patch index d6a1e23..8a3fd9a 100644 --- a/0001-configuration-changes-for-default-labwc-session.patch +++ b/0001-configuration-changes-for-default-labwc-session.patch @@ -1,15 +1,19 @@ -From 24e1764403171309cde962f5849ad11fbd16b2f4 Mon Sep 17 00:00:00 2001 +From feadef23b66391c0ec41c5591fa09927cf96979c Mon Sep 17 00:00:00 2001 From: "Shawn W. Dunn" <sfalken@cloverleaf-linux.org> Date: Wed, 8 Jan 2025 09:24:02 -0800 Subject: [PATCH 1/4] configuration changes for default labwc session -Combines two prior patches into one, as they're both for the labwc -session. Sets openSUSE background for labwc session, and adjusts -the pointerspeed to make the default mouse pointer less twitchy +- Combines two prior patches into one, as they're both for the labwc +session. +- Sets openSUSE background for labwc session +- Adjusts the pointerspeed to make the default mouse pointer less twitchy +- Moves user configs from default labwc locations, to avoid config + conflicts --- configurations/labwc/autostart | 2 +- configurations/labwc/rc.xml | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + startlxqtwayland.in | 8 ++++---- + 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configurations/labwc/autostart b/configurations/labwc/autostart index fa49741..a756d24 100644 @@ -37,6 +41,33 @@ index 41d628c..07acc3c 100644 <accelProfile></accelProfile> <tap>yes</tap> <tapButtonMap></tapButtonMap> +diff --git a/startlxqtwayland.in b/startlxqtwayland.in +index 64a2986..d46c317 100644 +--- a/startlxqtwayland.in ++++ b/startlxqtwayland.in +@@ -96,10 +96,10 @@ if [ -z "$COMPOSITOR" ]; then + + elif [ "$COMPOSITOR" = "labwc" ]; then + # Copy default configuration if not existing and set keyboard layout if different from us +- if [ ! -d "$XDG_CONFIG_HOME/labwc" ]; then +- cp -av "$share_dir"/lxqt/wayland/labwc "$XDG_CONFIG_HOME"/ # use default location here ++ if [ ! -d "$XDG_CONFIG_HOME/lxqt/labwc" ]; then ++ cp -av "$share_dir"/lxqt/wayland/labwc "$XDG_CONFIG_HOME"/lxqt/labwc/ # 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=$trylayout" >> $XDG_CONFIG_HOME/lxqt/labwc/environment + fi + fi + +@@ -109,7 +109,7 @@ elif [ "$COMPOSITOR" = "labwc" ]; then + echo "Running on virtualized hardware" + fi + +- exec $COMPOSITOR -C $XDG_CONFIG_HOME/labwc -S lxqt-session ++ exec $COMPOSITOR -C $XDG_CONFIG_HOME/lxqt/labwc -S lxqt-session + + elif [ "$COMPOSITOR" = "niri" ]; then + if [ ! -f "$XDG_CONFIG_HOME/lxqt/wayland/lxqt-niri.kdl" ]; then -- -2.47.1 +2.48.1 diff --git a/0002-configuration-changes-for-default-wayfire-session.patch b/0002-configuration-changes-for-default-wayfire-session.patch index 2c8fe6f..a9050fa 100644 --- a/0002-configuration-changes-for-default-wayfire-session.patch +++ b/0002-configuration-changes-for-default-wayfire-session.patch @@ -1,4 +1,4 @@ -From 38f2d4080029bf38c452c176bc675a2b1bd2c818 Mon Sep 17 00:00:00 2001 +From 5a84a1fdcbe2dd833cc04a6398b92eca4187ed71 Mon Sep 17 00:00:00 2001 From: "Shawn W. Dunn" <sfalken@cloverleaf-linux.org> Date: Wed, 8 Jan 2025 10:47:45 -0800 Subject: [PATCH 2/4] configuration changes for default wayfire session @@ -22,5 +22,5 @@ index edcbab3..3e531ef 100644 # Output configuration -- -2.47.1 +2.48.1 diff --git a/0003-configuration-changes-for-default-niri-session.patch b/0003-configuration-changes-for-default-niri-session.patch index 3f21aa6..0816d0c 100644 --- a/0003-configuration-changes-for-default-niri-session.patch +++ b/0003-configuration-changes-for-default-niri-session.patch @@ -1,4 +1,4 @@ -From 68ce5d43980b817fcf2759144d14bcead3689378 Mon Sep 17 00:00:00 2001 +From 388118cd1bf1bb902212fe98bb2b2a6b3ec8e013 Mon Sep 17 00:00:00 2001 From: "Shawn W. Dunn" <sfalken@cloverleaf-linux.org> Date: Wed, 8 Jan 2025 10:51:06 -0800 Subject: [PATCH 3/4] configuration changes for default niri session @@ -22,5 +22,5 @@ index 845a4d0..883eeac 100644 // accel-profile "flat" // scroll-method "two-finger" -- -2.47.1 +2.48.1 diff --git a/0004-configuration-adds-miriway-session.patch b/0004-configuration-adds-miriway-session.patch index 64ab121..ff4ba27 100644 --- a/0004-configuration-adds-miriway-session.patch +++ b/0004-configuration-adds-miriway-session.patch @@ -1,4 +1,4 @@ -From 0f6ac090dfa3767fec272fed0f1391db3b859ab8 Mon Sep 17 00:00:00 2001 +From b9fd6f144daae4f1b23fda0e4e515677eafd1610 Mon Sep 17 00:00:00 2001 From: "Shawn W. Dunn" <sfalken@cloverleaf-linux.org> Date: Thu, 16 Jan 2025 16:12:51 -0800 Subject: [PATCH 4/4] configuration adds miriway session @@ -104,7 +104,7 @@ index 0000000..9f4cf9e +ctrl-alt=BackSpace:@exit + diff --git a/startlxqtwayland.in b/startlxqtwayland.in -index 64a2986..dd91eb4 100644 +index d46c317..e3df50b 100644 --- a/startlxqtwayland.in +++ b/startlxqtwayland.in @@ -140,6 +140,16 @@ elif [ "$COMPOSITOR" = "kwin_wayland" ]; then @@ -125,5 +125,5 @@ index 64a2986..dd91eb4 100644 if [ ! -f "$XDG_CONFIG_HOME/lxqt/wayland/lxqt-wayfire.ini" ]; then cp "$share_dir"/lxqt/wayland/lxqt-wayfire.ini "$XDG_CONFIG_HOME"/lxqt/wayland/ -- -2.48.0 +2.48.1 diff --git a/lxqt-wayland-session.changes b/lxqt-wayland-session.changes index b4cacf4..c472499 100644 --- a/lxqt-wayland-session.changes +++ b/lxqt-wayland-session.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 20 18:14:25 UTC 2025 - Shawn Dunn <sfalken@opensuse.org> + +- Rework 0001 labwc patch, to move user labwc configs to a location + that doesn't conflict with the labwc defaults + ------------------------------------------------------------------- Wed Jan 15 16:38:31 UTC 2025 - Shawn Dunn <sfalken@opensuse.org>