added xscreensaver usage, simplified xinitrc and dwms use of it

6 files changed, 307 insertions, 13 deletions

diff --git a/.autostart b/.autostart
index 8de5aa2..426f1d9 100755
--- a/.autostart
+++ b/.autostart
@@ -5,16 +5,17 @@ wait_time=0.1
 # also if using old monitor do:
 # xrandr --newmode 1280x1024_75.00  138.75  1280 1368 1504 1728  1024 1027 1034 1072 -hsync +vsync
 # xrandr --addmode DP-3 "1280x1024_75.00"
-# xrandr --output DP-1 --off --output HDMI-1 --mode 1920x1080 --pos 0x0 --rotate normal --output
-#	       	  DP-2 --off --output
-#		  DP-3 --mode 1280x1024_75.00 --pos 1920x0 --rotate normal
+# xrandr --output DP-1 --off --output HDMI-1 --mode 1920x1080 --pos 0x0 --rotate normal --output DP-2 --off --output DP-3 --mode 1280x1024_75.00 --pos 1920x0 --rotate normal
 
 nitrogen --restore
 
 xset s off -dpms
+xscreensaver -no-splash &
 
 st -e watch -t 'task' &
 sleep $wait_time
+st -e stig &
+sleep $wait_time
 st -e ncmpcpp &
 sleep $wait_time
 st -e htop &
diff --git a/.xinitrc b/.xinitrc
index 611e305..1ff3ce4 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,9 +1,4 @@
 #!/bin/bash
 
-/home/tom/.screenlayout/set.sh
-
-while true; do
-	/home/tom/src/dwmstatus/dwmstatus &
-	nitrogen --restore
-	/home/tom/src/dwm/dwm 2> /home/tom/.dwm.log
-done
+/home/tom/src/dwmstatus/dwmstatus &
+/home/tom/src/dwm/dwm 2> /home/tom/.dwm.log
diff --git a/.xscreensaver b/.xscreensaver
new file mode 100644
index 0000000..d26b80f
--- /dev/null
+++ b/.xscreensaver
@@ -0,0 +1,296 @@
+# XScreenSaver Preferences File
+# Written by xscreensaver-demo 5.44 for tom on Sat Feb 13 14:45:43 2021.
+# https://www.jwz.org/xscreensaver/
+
+timeout:	0:05:00
+cycle:		0:00:00
+lock:		True
+lockTimeout:	0:00:00
+passwdTimeout:	0:00:30
+visualID:	default
+installColormap:    True
+verbose:	False
+timestamp:	True
+splash:		True
+splashDuration:	0:00:05
+demoCommand:	xscreensaver-demo
+prefsCommand:	
+nice:		10
+memoryLimit:	0
+fade:		True
+unfade:		False
+fadeSeconds:	0:00:03
+fadeTicks:	20
+captureStderr:	True
+ignoreUninstalledPrograms:False
+font:		*-medium-r-*-140-*-m-*
+dpmsEnabled:	False
+dpmsQuickOff:	False
+dpmsStandby:	2:00:00
+dpmsSuspend:	2:00:00
+dpmsOff:	4:00:00
+grabDesktopImages:  True
+grabVideoFrames:    False
+chooseRandomImages: False
+imageDirectory:	
+
+mode:		one
+selected:	50
+
+textMode:	file
+textLiteral:	XScreenSaver
+textFile:	
+textProgram:	fortune
+textURL:	https://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss
+
+programs:								      \
+				maze -root				    \n\
+  GL: 				superquadrics -root			    \n\
+				attraction -root			    \n\
+				blitspin -root				    \n\
+				greynetic -root				    \n\
+				helix -root				    \n\
+				hopalong -root				    \n\
+				imsmap -root				    \n\
+-				noseguy -root				    \n\
+-				pyro -root				    \n\
+				qix -root				    \n\
+-				rocks -root				    \n\
+				rorschach -root				    \n\
+				decayscreen -root			    \n\
+				flame -root				    \n\
+				halo -root				    \n\
+				slidescreen -root			    \n\
+				pedal -root				    \n\
+				bouboule -root				    \n\
+-				braid -root				    \n\
+				coral -root				    \n\
+				deco -root				    \n\
+				drift -root				    \n\
+-				fadeplot -root				    \n\
+				galaxy -root				    \n\
+				goop -root				    \n\
+				grav -root				    \n\
+				ifs -root				    \n\
+  GL: 				jigsaw -root				    \n\
+				julia -root				    \n\
+-				kaleidescope -root			    \n\
+  GL: 				moebius -root				    \n\
+				moire -root				    \n\
+  GL: 				morph3d -root				    \n\
+				mountain -root				    \n\
+				munch -root				    \n\
+				penrose -root				    \n\
+  GL: 				pipes -root				    \n\
+				rd-bomb -root				    \n\
+  GL: 				rubik -root				    \n\
+-				sierpinski -root			    \n\
+				slip -root				    \n\
+  GL: 				sproingies -root			    \n\
+				starfish -root				    \n\
+				strange -root				    \n\
+				swirl -root				    \n\
+				triangle -root				    \n\
+				xjack -root				    \n\
+				xlyap -root				    \n\
+  GL: 				atlantis -root				    \n\
+				bsod -root				    \n\
+  GL: 				bubble3d -root				    \n\
+  GL: 				cage -root				    \n\
+-				crystal -root				    \n\
+				cynosure -root				    \n\
+				discrete -root				    \n\
+				distort -root				    \n\
+				epicycle -root				    \n\
+				flow -root				    \n\
+  GL: 				glplanet -root				    \n\
+				interference -root			    \n\
+				kumppa -root				    \n\
+  GL: 				lament -root				    \n\
+				moire2 -root				    \n\
+  GL: 				sonar -root				    \n\
+  GL: 				stairs -root				    \n\
+				truchet -root				    \n\
+-				vidwhacker -root			    \n\
+				blaster -root				    \n\
+				bumps -root				    \n\
+				ccurve -root				    \n\
+				compass -root				    \n\
+				deluxe -root				    \n\
+-				demon -root				    \n\
+- GL: 				extrusion -root				    \n\
+-				loop -root				    \n\
+				penetrate -root				    \n\
+				petri -root				    \n\
+				phosphor -root				    \n\
+  GL: 				pulsar -root				    \n\
+				ripples -root				    \n\
+				shadebobs -root				    \n\
+  GL: 				sierpinski3d -root			    \n\
+				spotlight -root				    \n\
+				squiral -root				    \n\
+				wander -root				    \n\
+-				webcollage -root			    \n\
+				xflame -root				    \n\
+				xmatrix -root				    \n\
+  GL: 				gflux -root				    \n\
+-				nerverot -root				    \n\
+				xrayswarm -root				    \n\
+				xspirograph -root			    \n\
+  GL: 				circuit -root				    \n\
+  GL: 				dangerball -root			    \n\
+- GL: 				dnalogo -root				    \n\
+  GL: 				engine -root				    \n\
+  GL: 				flipscreen3d -root			    \n\
+  GL: 				gltext -root				    \n\
+  GL: 				menger -root				    \n\
+  GL: 				molecule -root				    \n\
+				rotzoomer -root				    \n\
+				scooter -root				    \n\
+				speedmine -root				    \n\
+  GL: 				starwars -root				    \n\
+  GL: 				stonerview -root			    \n\
+				vermiculate -root			    \n\
+				whirlwindwarp -root			    \n\
+				zoom -root				    \n\
+				anemone -root				    \n\
+				apollonian -root			    \n\
+  GL: 				boxed -root				    \n\
+  GL: 				cubenetic -root				    \n\
+  GL: 				endgame -root				    \n\
+				euler2d -root				    \n\
+				fluidballs -root			    \n\
+  GL: 				flurry -root				    \n\
+- GL: 				glblur -root				    \n\
+  GL: 				glsnake -root				    \n\
+				halftone -root				    \n\
+  GL: 				juggler3d -root				    \n\
+  GL: 				lavalite -root				    \n\
+-				polyominoes -root			    \n\
+  GL: 				queens -root				    \n\
+- GL: 				sballs -root				    \n\
+  GL: 				spheremonics -root			    \n\
+-				thornbird -root				    \n\
+				twang -root				    \n\
+- GL: 				antspotlight -root			    \n\
+				apple2 -root				    \n\
+  GL: 				atunnel -root				    \n\
+				barcode -root				    \n\
+  GL: 				blinkbox -root				    \n\
+  GL: 				blocktube -root				    \n\
+  GL: 				bouncingcow -root			    \n\
+				cloudlife -root				    \n\
+  GL: 				cubestorm -root				    \n\
+				eruption -root				    \n\
+  GL: 				flipflop -root				    \n\
+  GL: 				flyingtoasters -root			    \n\
+				fontglide -root				    \n\
+  GL: 				gleidescope -root			    \n\
+  GL: 				glknots -root				    \n\
+  GL: 				glmatrix -root				    \n\
+- GL: 				glslideshow -root			    \n\
+  GL: 				hypertorus -root			    \n\
+- GL: 				jigglypuff -root			    \n\
+				metaballs -root				    \n\
+  GL: 				mirrorblob -root			    \n\
+				piecewise -root				    \n\
+  GL: 				polytopes -root				    \n\
+				pong -root				    \n\
+				popsquares -root			    \n\
+  GL: 				surfaces -root				    \n\
+				xanalogtv -root				    \n\
+				abstractile -root			    \n\
+				anemotaxis -root			    \n\
+- GL: 				antinspect -root			    \n\
+				fireworkx -root				    \n\
+				fuzzyflakes -root			    \n\
+				interaggregate -root			    \n\
+				intermomentary -root			    \n\
+				memscroller -root			    \n\
+  GL: 				noof -root				    \n\
+				pacman -root				    \n\
+  GL: 				pinion -root				    \n\
+  GL: 				polyhedra -root				    \n\
+- GL: 				providence -root			    \n\
+				substrate -root				    \n\
+				wormhole -root				    \n\
+- GL: 				antmaze -root				    \n\
+  GL: 				boing -root				    \n\
+				boxfit -root				    \n\
+  GL: 				carousel -root				    \n\
+				celtic -root				    \n\
+  GL: 				crackberg -root				    \n\
+  GL: 				cube21 -root				    \n\
+				fiberlamp -root				    \n\
+  GL: 				fliptext -root				    \n\
+  GL: 				glhanoi -root				    \n\
+  GL: 				tangram -root				    \n\
+  GL: 				timetunnel -root			    \n\
+  GL: 				glschool -root				    \n\
+  GL: 				topblock -root				    \n\
+  GL: 				cubicgrid -root				    \n\
+				cwaves -root				    \n\
+  GL: 				gears -root				    \n\
+  GL: 				glcells -root				    \n\
+  GL: 				lockward -root				    \n\
+				m6502 -root				    \n\
+  GL: 				moebiusgears -root			    \n\
+  GL: 				voronoi -root				    \n\
+  GL: 				hypnowheel -root			    \n\
+  GL: 				klein -root				    \n\
+-				lcdscrub -root				    \n\
+  GL: 				photopile -root				    \n\
+  GL: 				skytentacles -root			    \n\
+  GL: 				rubikblocks -root			    \n\
+  GL: 				companioncube -root			    \n\
+  GL: 				hilbert -root				    \n\
+  GL: 				tronbit -root				    \n\
+  GL: 				geodesic -root				    \n\
+				hexadrop -root				    \n\
+  GL: 				kaleidocycle -root			    \n\
+  GL: 				quasicrystal -root			    \n\
+  GL: 				unknownpleasures -root			    \n\
+				binaryring -root			    \n\
+  GL: 				cityflow -root				    \n\
+  GL: 				geodesicgears -root			    \n\
+  GL: 				projectiveplane -root			    \n\
+  GL: 				romanboy -root				    \n\
+				tessellimage -root			    \n\
+  GL: 				winduprobot -root			    \n\
+  GL: 				splitflap -root				    \n\
+  GL: 				cubestack -root				    \n\
+  GL: 				cubetwist -root				    \n\
+  GL: 				discoball -root				    \n\
+  GL: 				dymaxionmap -root			    \n\
+  GL: 				energystream -root			    \n\
+  GL: 				hexstrut -root				    \n\
+  GL: 				hydrostat -root				    \n\
+  GL: 				raverhoop -root				    \n\
+  GL: 				splodesic -root				    \n\
+  GL: 				unicrud -root				    \n\
+  GL: 				esper -root				    \n\
+  GL: 				vigilance -root				    \n\
+  GL: 				crumbler -root				    \n\
+				filmleader -root			    \n\
+				glitchpeg -root				    \n\
+  GL: 				handsy -root				    \n\
+  GL: 				maze3d -root				    \n\
+  GL: 				peepers -root				    \n\
+  GL: 				razzledazzle -root			    \n\
+				vfeedback -root				    \n\
+  GL: 				deepstars -root				    \n\
+  GL: 				gravitywell -root			    \n\
+  GL: 				etruscanvenus -root			    \n\
+  GL: 				gibson -root				    \n\
+
+
+pointerPollTime:    0:00:05
+pointerHysteresis:  10
+windowCreationTimeout:0:00:30
+initialDelay:	0:00:00
+GetViewPortIsFullOfLies:False
+procInterrupts:	True
+xinputExtensionDev: False
+overlayStderr:	True
+authWarningSlack:   20
+
diff --git a/arch/mainline b/arch/mainline
index 821d945..e072764 100644
--- a/arch/mainline
+++ b/arch/mainline
@@ -55,3 +55,4 @@ wget
 which
 xorg-server
 xorg-xinit
+xscreensaver
diff --git a/build b/build
index a4ad07e..2d5fa8f 100755
--- a/build
+++ b/build
@@ -67,3 +67,6 @@ ln -s $RC_DIR'/.mailcap' $HOME
 # taskwarrior setup
 ln -s $RC_DIR'/.taskrc' $HOME
 ln -s $RC_DIR'/.task' $HOME
+
+# xscreensaver setup
+ln -s $RC_DIR'/.xscreensaver' $HOME
diff --git a/dwm/config.h b/dwm/config.h
index 15d5052..a2ed44e 100644
--- a/dwm/config.h
+++ b/dwm/config.h
@@ -61,7 +61,6 @@ static const char *passmenucmd[] = { "passmenu", "-fn", dmenufont, "-nb", col_gr
 static const char *volumeup[] = { "amixer", "-D", "pulse", "sset", "Master", "5%+", NULL};
 static const char *volumedown[] = { "amixer", "-D", "pulse", "sset", "Master", "5%-", NULL};
 static const char *termcmd[]  = { "st", NULL };
-static const char *exitcmd[]  = { "killall", "xinit", NULL };
 
 static Key keys[] = {
 	/* modifier                     key        function        argument */
@@ -73,8 +72,7 @@ static Key keys[] = {
 	{ MODKEY,                       XK_minus,  spawn,          {.v = volumedown } },
 
 	{ MODKEY,             		XK_q,      killclient,     {0} },
-	{ MODKEY,             		XK_r,      quit,           {0} },
-	{ MODKEY|ShiftMask, 		XK_e,      spawn,          {.v = exitcmd} },
+	{ MODKEY|ShiftMask, 		XK_e,      quit,           {0} },
 
 	{ MODKEY,                       XK_i,      incnmaster,     {.i = +1 } },
 	{ MODKEY,                       XK_u,      incnmaster,     {.i = -1 } },