Several changes

3 files changed, 35 insertions, 7 deletions

diff --git a/fvwm/config b/fvwm/config
index 77bcf43..ffe625f 100644
--- a/fvwm/config
+++ b/fvwm/config
@@ -3,7 +3,7 @@
 DesktopSize 2x1
 IgnoreModifiers L25
 HideGeometryWindow Always
-EwmhBaseStruts 95 10 10 10
+EwmhBaseStruts 95 10 10 40
 
 Style * Font -xos4-terminus-*-*-*-*-12-*-*-*-*-*-*-*
 Style * IconFont -xos4-terminus-*-*-*-*-12-*-*-*-*-*-*-*
@@ -32,13 +32,22 @@ CursorStyle MENU left_ptr
 
 # Keys
 	Key Return A M Exec urxvt
-	Key "Q" A M Exec dmenu_run
+	Key "Q" A M Exec dmenu_run -nb '#000000' -nf '#a8c023' -sb '#a8c023' -sf '#000000'
+	Key "L" A M Exec xscreensaver-command -lock
 	Key Tab A M Next (CurrentPage !Sticky AcceptsFocus) Focus
 	Key "M" A M Maximize
 	Key "G" A M Desk -1 0 0 3
 	Key "R" A M Desk +1 0 0 3
 	Key "N" A M GotoPage -1p 0
 	Key "T" A M GotoPage +1p 0
+	Key "1" A M GotoDeskAndPage 0 0 0
+	Key "2" A M GotoDeskAndPage 0 1 1
+	Key "3" A M GotoDeskAndPage 1 0 0
+	Key "4" A M GotoDeskAndPage 1 1 1
+	Key "5" A M GotoDeskAndPage 2 0 0
+	Key "6" A M GotoDeskAndPage 2 1 1
+	Key "7" A M GotoDeskAndPage 3 0 0
+	Key "8" A M GotoDeskAndPage 3 1 1
 	Key "F" A M FvwmRearrange -tile -v  0 0 100 100
 	Key "H" A M FvwmRearrange -tile -h  0 0 100 100
 	Key "R" A CM Restart
@@ -56,6 +65,7 @@ CursorStyle MENU left_ptr
 	Colorset 2 RootTransparent Buffer, Tint #fecf35 40
 	Colorset 3 RootTransparent Buffer
 	Colorset 4 bg black, fg white
+	Colorset 5 Transparent, bg black
 	Colorset 10 fg #e0e0e0, bg #3a3a3a
 	Colorset 11 fg #f10000, bg #3a3a3a
 
@@ -80,8 +90,8 @@ CursorStyle MENU left_ptr
 	*FvwmPager: WindowColorsets 3 3
 
 # IconBox
-	Style * IconBox 75x500+1+180
-	Style * IconFill top bottom
+	Style * IconBox 1000x40+10+1030
+	Style * IconFill Left Right
 
 # Animate
 	AddToFunc StartFunction
@@ -116,3 +126,21 @@ CursorStyle MENU left_ptr
 # Tiling
 	AddToFunc StartFunction
 	+ I Module FvwmRearrange
+
+# Buttons
+	AddToFunc StartFunction
+	+ I Module FvwmButtons
+	Style FvwmButtons Sticky
+	Style FvwmButtons Notitle
+	Style FvwmButtons FixedPosition
+	Style FvwmButtons FixedSize
+	Style FvwmButtons ParentalRelativity
+	Style FvwmButtons !Iconifiable
+	Style FvwmButtons !Handles
+	Style FvwmButtons !Borders
+	*FvwmButtons: Geometry 75x75+12+170
+	*FvwmButtons: Colorset 5
+	*FvwmButtons: Rows 10
+	*FvwmButtons: Columns 1
+	*FvwmButtons: Frame 0
+	*FvwmButtons: (1x1, Swallow "wmclockmon" "Exec exec wmclockmon -w -sc -s led1")
diff --git a/xorg/xinitrc b/xorg/xinitrc
index c9a4cf2..af1599c 100755
--- a/xorg/xinitrc
+++ b/xorg/xinitrc
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 WM='fvwm2'
-WALLPAPER='media/bilder/wallpaper/wood_3.png'
+WALLPAPER='media/bilder/wallpaper/leaf.jpg'
 
 setxkbmap de neo
 xset +fp /usr/share/fonts/local
@@ -13,7 +13,7 @@ if [ -e /usr/bin/xrandr ]; then
 	fi
 fi
 
-if [ -e "$WALLPAPER" -a /usr/bin/feh]; then
+if [ -e "$WALLPAPER" ] && [ -e /usr/bin/feh ]; then
 	feh --bg-scale $WALLPAPER
 fi
 
diff --git a/zsh/zshrc b/zsh/zshrc
index 663c6db..d586d4a 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -104,7 +104,7 @@ bindkey '\e[8~' end-of-line
 shot() {
 	if [ "$1" != '' ]; then
 		scrot -c -d 3 $1
-		scp $1 xeno:www/pub/
+		scp $1 xeno:public_html/pub/
 		rm $1
 	else
 		scrot -c -d 3