From b6655563e76cc547fbdd834c155b482e3f88026c Mon Sep 17 00:00:00 2001
From: Silvino Silva <silvino@bk.ru>
Date: Fri, 20 Jul 2018 17:51:29 +0100
Subject: release 0.3.6 fixes

---
 tools/x.html | 116 ++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 68 insertions(+), 48 deletions(-)

(limited to 'tools/x.html')

diff --git a/tools/x.html b/tools/x.html
index cbc9d3e..913f1f0 100644
--- a/tools/x.html
+++ b/tools/x.html
@@ -13,6 +13,9 @@
 
         <h2>Install</h2>
 
+
+        <h3>Xorg</h3>
+
         <pre>
         $ sudo prt-get depinst xorg-server \
              xorg-xinit \
@@ -28,7 +31,7 @@
              xkeyboard-config
         </pre>
 
-        <h2>Fonts</h2>
+        <h3>Fonts</h3>
 
         <pre>
         $ sudo prt-get depinst xorg-font-util \
@@ -50,35 +53,76 @@
         $ prt-get depinst otf-sourcecode
         </pre>
 
+        <h3>Utilities</h3>
+
+        <pre>
+        $ sudo prt-get depinst \
+            alsa-utils \
+            libdrm \
+            mesa3d \
+            ffmpeg \
+            gstreamer \
+            gstreamer-vaapi \
+            gst-plugins-base \
+            gst-plugins-good \
+            gst-plugins-bad \
+            gst-plugins-ugly \
+            cmus \
+            dmenu \
+            st \
+            gparted \
+            gimp \
+            libreoffice \
+            ca-certificates \
+	    linux-pam \
+	    gstreamer \
+	    libgd \
+            icu \
+	    syndaemon
+        </pre>
+
+        <h3>Window Managers</h3>
+
+	<pre>
+        $ sudo prt-get depinst \
+		openbox \
+		dwm \
+         	spectrwm \
+	 	mate
+	</pre>
+
         <h2>Configure</h2>
 
-        <p>Example of <a href="conf/etc/skel/.xinitrc">/etc/skel/.xinitrc</a>;</p>
+        <h3>Local xinitrc</h3>
 
-        <pre>
-        #xrandr --output eDP1 --mode 1024x768
-        #xrandr --dpi 100
-        #xgamma -gamma 0.8
-        syndaemon -d
-        #
-        ## Start the window manager
+        <p>Local xinitrc configuration: <a href="conf/etc/skel/.xinitrc">/etc/skel/.xinitrc</a>;</p>
 
-        #exec dwm
-        #exec twm
-        #exec openbox-session
-        exec spectrwm
+        <pre>
+	## Start the window manager
+
+	xrandr -s 1366x768
+	#xrandr --dpi 100
+	#xrandr --output eDP1 --mode 1366x768
+	#xgamma -gamma 0.8
+	#syndaemon -d
+	setxkbmap dvorak
+
+	#exec openbox-session
+	#exec dwm
+	exec spectrwm
+	#exec start-mate
         </pre>
 
-
-        <p>Example of
-        <a href="conf/usr/etc/X11/xinit/xinitrc">/usr/etc/X11/xinit/xinitrc</a>;</p>
+        <h3>Global xinitrc</h3>
+        <p>Global xinitrc configuration: <a href="conf/etc/X11/xinit/xinitrc">/usr/etc/X11/xinit/xinitrc</a>;</p>
 
         <pre>
         #!/bin/sh
 
         userresources=$HOME/.Xresources
         usermodmap=$HOME/.Xmodmap
-        sysresources=/usr/etc/X11/xinit/.Xresources
-        sysmodmap=/usr/etc/X11/xinit/.Xmodmap
+        sysresources=/etc/X11/xinit/.Xresources
+        sysmodmap=/etc/X11/xinit/.Xmodmap
 
         # merge in defaults and keymaps
 
@@ -102,15 +146,17 @@
 
         # start some nice programs
 
-        if [ -d /usr/etc/X11/xinit/xinitrc.d ] ; then
-         for f in /usr/etc/X11/xinit/xinitrc.d/?*.sh ; do
+        if [ -d /etc/X11/xinit/xinitrc.d ] ; then
+         for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
           [ -x "$f" ] && . "$f"
          done
          unset f
         fi
         </pre>
 
-        <p><a href="conf/etc/X11/xorg.conf.d/10-keyboard.conf">/etc/X11/xorg.conf.d/10-keyboard.conf</a></p>
+        <h3>Global keyboard config </h3>
+
+	<p>Xorg global default keyboard configuration; <a href="conf/etc/X11/xorg.conf.d/10-keyboard.conf">/etc/X11/xorg.conf.d/10-keyboard.conf</a></p>
 
         <pre>
          Section "InputClass"
@@ -120,7 +166,7 @@
          EndSection
         </pre>
 
-        <p><a href="/etc/X11/xorg.conf.d/50-synaptics.conf">/etc/X11/xorg.conf.d/50-synaptics.conf</a></p>
+	<p>Xorg synaptics configuration; <a href="/etc/X11/xorg.conf.d/50-synaptics.conf">/etc/X11/xorg.conf.d/50-synaptics.conf</a></p>
 
         <pre>
         # Example xorg.conf.d snippet that assigns the touchpad driver
@@ -180,32 +226,6 @@
 
         <h2>Window Managers</h2>
 
-
-        <pre>
-        $ sudo prt-get depinst \
-            alsa-utils \
-            libdrm \
-            mesa3d \
-            ffmpeg \
-            gstreamer \
-            gstreamer-vaapi \
-            gst-plugins-base \
-            gst-plugins-good \
-            gst-plugins-bad \
-            gst-plugins-ugly \
-            cmus \
-            adwaita-icon-theme \
-            dmenu \
-            st \
-            conky \
-            dillo \
-            spectrwm \
-            gparted \
-            gimp \
-            libreoffice \
-            epiphany
-        </pre>
-
         <h3>Spectrwm</h3>
 
         <p>Edit ~/.spectrwm.conf</p>
-- 
cgit 1.4.1-2-gfad0