diff --git a/Slax/debian/modules/02-xorg/build b/Slax/debian/modules/02-xorg/build index 39628c9..cd973af 100755 --- a/Slax/debian/modules/02-xorg/build +++ b/Slax/debian/modules/02-xorg/build @@ -1,6 +1,6 @@ apt-get update -apt-get install --yes --no-install-recommends xserver-xorg xinit xterm blackbox libxcursor1 breeze-cursor-theme compton +apt-get install --yes --no-install-recommends xserver-xorg xinit xterm blackbox libxcursor1 breeze-cursor-theme # use only white cursors. There were some troubles if the other cursors # was left behind, installing gtk apps reverted the cursor from white to gray, diff --git a/Slax/debian/modules/02-xorg/rootcopy/root/.blackbox-menu b/Slax/debian/modules/02-xorg/rootcopy/root/.blackbox-menu index f7b16bd..9e7113e 100644 --- a/Slax/debian/modules/02-xorg/rootcopy/root/.blackbox-menu +++ b/Slax/debian/modules/02-xorg/rootcopy/root/.blackbox-menu @@ -1,5 +1,5 @@ [begin] ( Menu ) - [exec] (Terminal) { xterm } + [exec] (Terminal) { xterm -ls } [exec] (Web browser) { chromium } [exit] (Exit) [end] diff --git a/Slax/debian/modules/02-xorg/rootcopy/root/.xinitrc b/Slax/debian/modules/02-xorg/rootcopy/root/.xinitrc deleted file mode 100644 index eb818e3..0000000 --- a/Slax/debian/modules/02-xorg/rootcopy/root/.xinitrc +++ /dev/null @@ -1,13 +0,0 @@ -xrdb -merge ~/.Xresources -feh --bg-scale /usr/share/wallpapers/wp.jpg -compton -D 5 -c -f -l -2 -t -2 -r 0 -o 1 -z --shadow-exclude 'bounding_shaped' & - -if [ -e /usr/bin/startfluxbox ]; then - /usr/bin/startfluxbox -else - if [ -e /usr/bin/blackbox ]; then - /usr/bin/blackbox - else - xterm - fi -fi diff --git a/Slax/debian/modules/03-desktop/build b/Slax/debian/modules/03-desktop/build index e3129e2..f5182f5 100755 --- a/Slax/debian/modules/03-desktop/build +++ b/Slax/debian/modules/03-desktop/build @@ -8,7 +8,7 @@ VERSION=1.3.5 # first install stock version apt-get update -apt-get install --no-install-recommends --yes $NAME feh +apt-get install --no-install-recommends --yes $NAME feh compton . ../../cleanup (cd rootcopy && cp --parents -afr * /) diff --git a/Slax/debian/modules/03-desktop/rootcopy/root/.xinitrc b/Slax/debian/modules/03-desktop/rootcopy/root/.xinitrc new file mode 100644 index 0000000..202bd3f --- /dev/null +++ b/Slax/debian/modules/03-desktop/rootcopy/root/.xinitrc @@ -0,0 +1,3 @@ +feh --bg-scale /usr/share/wallpapers/wp.jpg +compton -D 5 -c -f -l -2 -t -2 -r 0 -o 1 -z --shadow-exclude 'bounding_shaped' & +startfluxbox diff --git a/Slax/debian/modules/02-xorg/rootcopy/usr/share/wallpapers/wp.jpg b/Slax/debian/modules/03-desktop/rootcopy/usr/share/wallpapers/wp.jpg similarity index 100% rename from Slax/debian/modules/02-xorg/rootcopy/usr/share/wallpapers/wp.jpg rename to Slax/debian/modules/03-desktop/rootcopy/usr/share/wallpapers/wp.jpg