tools x configuration revision

5 files changed, 170 insertions, 40 deletions

diff --git a/tools/conf/etc/X11/xorg.conf.d/10-keyboard.conf b/tools/conf/etc/X11/xorg.conf.d/10-keyboard.conf
new file mode 100644
index 0000000..d8b99b3
--- /dev/null
+++ b/tools/conf/etc/X11/xorg.conf.d/10-keyboard.conf
@@ -0,0 +1,6 @@
+Section "InputClass"
+	Identifier             "Keyboard Defaults"
+	MatchIsKeyboard       "yes"
+	Option               "XkbLayout" "dvorak"
+EndSection
+
diff --git a/tools/conf/etc/X11/xorg.conf.d/50-synaptics.conf b/tools/conf/etc/X11/xorg.conf.d/50-synaptics.conf
new file mode 100644
index 0000000..9fbb829
--- /dev/null
+++ b/tools/conf/etc/X11/xorg.conf.d/50-synaptics.conf
@@ -0,0 +1,54 @@
+# Example xorg.conf.d snippet that assigns the touchpad driver
+# to all touchpads. See xorg.conf.d(5) for more information on
+# InputClass.
+# DO NOT EDIT THIS FILE, your distribution will likely overwrite
+# it when updating. Copy (and rename) this file into
+# /etc/X11/xorg.conf.d first.
+# Additional options may be added in the form of
+#   Option "OptionName" "value"
+#
+Section "InputClass"
+	Identifier "touchpad catchall"
+	Driver "synaptics"
+	MatchIsTouchpad "on"
+	# This option is recommend on all Linux systems using evdev, but cannot be
+	# enabled by default. See the following link for details:
+	# http://who-t.blogspot.com/2010/11/how-to-ignore-configuration-errors.html
+	#       MatchDevicePath "/dev/input/event*"
+	Option "TapButton1" "1"
+	Option "TapButton2" "3"
+	Option "TapButton3" "2"
+	Option "VertEdgeScroll" "on"
+	Option "VertTwoFingerScroll" "on"
+	Option "HorizEdgeScroll" "on"
+	Option "HorizTwoFingerScroll" "on"
+EndSection
+
+Section "InputClass"
+	Identifier "touchpad ignore duplicates"
+	MatchIsTouchpad "on"
+	MatchOS "Linux"
+	MatchDevicePath "/dev/input/mouse*"
+	Option "Ignore" "on"
+EndSection
+
+# This option enables the bottom right corner to be a right button on clickpads
+# and the right and middle top areas to be right / middle buttons on clickpads
+# with a top button area.
+# This option is only interpreted by clickpads.
+Section "InputClass"
+	Identifier "Default clickpad buttons"
+	MatchDriver "synaptics"
+	Option "SoftButtonAreas" "50% 0 82% 0 0 0 0 0"
+	Option "SecondarySoftButtonAreas" "58% 0 0 15% 42% 58% 0 15%"
+EndSection
+
+# This option disables software buttons on Apple touchpads.
+# This option is only interpreted by clickpads.
+Section "InputClass"
+	Identifier "Disable clickpad buttons on Apple touchpads"
+	MatchProduct "Apple|bcm5974"
+	MatchDriver "synaptics"
+	Option "SoftButtonAreas" "0 0 0 0 0 0 0 0"
+EndSection
+
diff --git a/tools/conf/etc/skel/.xinitrc b/tools/conf/etc/skel/.xinitrc
index ac94b39..c331d37 100644
--- a/tools/conf/etc/skel/.xinitrc
+++ b/tools/conf/etc/skel/.xinitrc
@@ -1,11 +1,5 @@
 
-##twm &
-##xclock -geometry 50x50-1+1 &
-##xterm -geometry 80x50+494+51 &
-##xterm -geometry 80x20+494-0 &
-##exec xterm -geometry 80x66+0+0 -name login
-#
-##xrandr --output eDP1 --mode 1024x768
+#xrandr --output eDP1 --mode 1024x768
 #xrandr --dpi 100
 #xgamma -gamma 0.8
 syndaemon -d
@@ -13,4 +7,5 @@ syndaemon -d
 ## Start the window manager
 
 #exec dwm
-exec openbox
+#exec openbox-session
+exec spectrwm
diff --git a/tools/conf/usr/etc/X11/xinit/xinitrc b/tools/conf/usr/etc/X11/xinit/xinitrc
new file mode 100644
index 0000000..36b3c3c
--- /dev/null
+++ b/tools/conf/usr/etc/X11/xinit/xinitrc
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/usr/etc/X11/xinit/.Xresources
+sysmodmap=/usr/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+
+if [ -f $sysresources ]; then
+    xrdb -merge $sysresources
+fi
+
+if [ -f $sysmodmap ]; then
+    xmodmap $sysmodmap
+fi
+
+if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+fi
+
+if [ -f "$usermodmap" ]; then
+    xmodmap "$usermodmap"
+fi
+
+# start some nice programs
+
+if [ -d /usr/etc/X11/xinit/xinitrc.d ] ; then
+ for f in /usr/etc/X11/xinit/xinitrc.d/?*.sh ; do
+  [ -x "$f" ] && . "$f"
+ done
+ unset f
+fi
diff --git a/tools/x.html b/tools/x.html
index 3c6aff7..9440455 100644
--- a/tools/x.html
+++ b/tools/x.html
@@ -13,32 +13,54 @@
 
         <h2>Install</h2>
 
-        <p>Add <a href="https://crux.nu/portdb/?a=getup&q=6c37">6c37</a>
-        port collection and activate on /etc/prt-get.conf above xorg.</p>
-
         <pre>
-        $ sudo prt-get depinst xorg-server
-        $ sudo prt-get depinst xorg-xinit
-        $ sudo prt-get depinst xkeyboard-config
-        $ sudo prt-get depinst xorg-xf86-input-evdev
-        $ sudo prt-get depinst xorg-font-dejavu-ttf
-        $ sudo prt-get depinst xorg-xrdb
-        $ sudo prt-get depinst xorg-xmodmap
-        $ sudo prt-get depinst xorg-xrandr
-        $ sudo prt-get depinst xorg-xgamma
-        $ sudo prt-get depinst xorg-xf86-input-synaptics
-        $ sudo prt-get depinst xsel
+        $ sudo prt-get depinst xorg-server \
+             xorg-xinit \
+             xorg-xrdb \
+             xorg-xdpyinfo \
+             xorg-xauth \
+             xorg-xmodmap \
+             xorg-xrandr \
+             xorg-xgamma \
+             xorg-xf86-input-evdev \
+             xorg-xf86-input-synaptics \
+             xsel \
+             xkeyboard-config
         </pre>
 
         <pre>
-        $ sudo prt-get depinst dwm
-        $ sudo prt-get depinst dmenu
-        $ sudo prt-get depinst st
+        $ sudo prt-get depinst xorg-font-util \
+             xorg-font-alias \
+             xorg-font-dejavu-ttf \
+             xorg-font-cursor-misc \
+             xorg-font-misc-misc \
+             xorg-font-mutt-misc
+
+        $ prt-get search xorg-font-bitstream | xargs sudo prt-get depinst
+        $ prt-get search xorg-font-bh | xargs sudo prt-get depinst
         </pre>
 
         <h2>Configure</h2>
 
-        <p>/usr/etc/X11/xinit/xinitrc</p>
+        <p>Example of <a href="conf/etc/skel/.xinitrc">/etc/skel/.xinitrc</a>;</p>
+
+        <pre>
+        #xrandr --output eDP1 --mode 1024x768
+        #xrandr --dpi 100
+        #xgamma -gamma 0.8
+        syndaemon -d
+        #
+        ## Start the window manager
+
+        #exec dwm
+        #exec twm
+        #exec openbox-session
+        exec spectrwm
+        </pre>
+
+
+        <p>Example of
+        <a href="conf/usr/etc/X11/xinit/xinitrc">/usr/etc/X11/xinit/xinitrc</a>;</p>
 
         <pre>
         #!/bin/sh
@@ -78,7 +100,7 @@
         fi
         </pre>
 
-        <p>/etc/X11/xorg.conf.d/10-keyboard.conf</p>
+        <p><a href="conf/etc/X11/xorg.conf.d/10-keyboard.conf">/etc/X11/xorg.conf.d/10-keyboard.conf</a></p>
 
         <pre>
          Section "InputClass"
@@ -88,7 +110,7 @@
          EndSection
         </pre>
 
-        <p>/etc/X11/xorg.conf.d/50-synaptics.conf</p>
+        <p><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
@@ -146,22 +168,42 @@
         EndSection
         </pre>
 
-        <p>Example of ~/.xinitrc;</p>
+        <h2>Window Managers</h2>
+
+        <h3>Dwm</h3>
 
         <pre>
-        #twm &
-        #xclock -geometry 50x50-1+1 &
-        #xterm -geometry 80x50+494+51 &
-        #xterm -geometry 80x20+494-0 &
-        #exec xterm -geometry 80x66+0+0 -name login
+        $ sudo prt-get depinst dmenu \
+            dwm \
+            spectrwm \
+            st \
+            conky \
+            dillo \
+            adwaita-icon-theme \
+            gparted \
+            gimp \
+            libreoffice
+        </pre>
 
-        #xrandr --output eDP1 --mode 1024x768
-        xrandr --dpi 100
-        xgamma -gamma 0.8
-        syndaemon -d
+        <h3>Spectrwm</h3>
+
+        <p>Edit ~/.spectrwm.conf</p>
 
-        # Start the window manager
-        exec dwm
+        <pre>
+        program[term] = st
+        bar_enabled = 1
+        bar_action = conky
+        </pre>
+
+        <p>Edit ~/.conkyrc</p>
+
+        <pre>
+        out_to_x no
+        out_to_console yes
+        update_interval 1.0
+        total_run_times 0
+        use_spacer none
+        TEXT
         </pre>
 
         <a href="index.html">Tools Index</a>