Bunch of updates

6 files changed, 27 insertions, 15 deletions

diff --git a/dosbox-0.74.conf b/dosbox-0.74.conf
index 80133a0..3e88734 100644
--- a/dosbox-0.74.conf
+++ b/dosbox-0.74.conf
@@ -1,5 +1,5 @@
 [sdl]
-fullscreen=yes
+fullscreen=no
 fulldouble=false
 fullresolution=original
 windowresolution=original
diff --git a/fvwm/config b/fvwm/config
index c3174ed..65c3bd2 100644
--- a/fvwm/config
+++ b/fvwm/config
@@ -38,6 +38,8 @@ CursorStyle MENU left_ptr
 	Key Return A M Exec urxvt
 	Key "Q" A M Exec dmenu_run -nb '#000000' -nf '#a8c023' -sb '#a8c023' -sf '#000000'
 	Key "L" A M Exec xscreensaver-command -lock
+	Key "K" A M Exec amixer set PCM 5%+
+	Key "S" A M Exec amixer set PCM 5%-
 	Key Tab A M Next (CurrentPage !Sticky AcceptsFocus) Focus
 	Key "M" A M Maximize
 	Key "G" A M Desk -1 0 0 3
@@ -106,11 +108,6 @@ CursorStyle MENU left_ptr
 	*FvwmAnimate: Width 1 
 
 # Menus
-	DestroyMenu FvwmMenu
-	AddToMenu FvwmMenu "Fvwm" Title
-	+ "Restart" Restart
-	+ "Quit" Quit
-
 	DestroyMenu InternetMenu
 	AddToMenu InternetMenu "Internet" Title
 	+ "Opera" Exec exec opera
@@ -129,6 +126,9 @@ CursorStyle MENU left_ptr
 	DestroyMenu SystemMenu
 	AddToMenu SystemMenu "System" Title
 	+ "Midnight Commander" Exec exec urxvt -e mc
+	+ "Python" Exec exec urxvt -e python
+	+ "virt-manager" Exec exec virt-manager
+	+ "VirtualBox" Exec exec virtualbox
 	+ "Wicd" Exec exec urxvt -e wicd-curses
 
 	DestroyMenu MenuFvwmRoot
@@ -141,7 +141,9 @@ CursorStyle MENU left_ptr
 	+ "Office" Popup OfficeMenu
 	+ "System" Popup SystemMenu
 	+ "" Nop
-	+ "Fvwm" Popup FvwmMenu
+	+ "Lock Screen" Exec exec xscreensaver-command -lock
+	+ "Restart" Restart
+	+ "Quit" Quit
 
 	DestroyMenu FvwmWindowOpsMenu
 	AddToMenu   FvwmWindowOpsMenu
@@ -169,10 +171,18 @@ CursorStyle MENU left_ptr
 	Style FvwmButtons !Handles
 	Style FvwmButtons !Borders
 	# Raise $y by 75 for each app
-	*FvwmButtons: Geometry 75x150+12+170
+	*FvwmButtons: Geometry 75x225+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")
 	*FvwmButtons: (1x1, Padding 4 4, Swallow "wmifinfo" "Exec exec wmifinfo -i eth0")
+	*FvwmButtons: (1x1, Swallow "wmcpuload" "Exec exec wmcpuload -w")
+
+# Urgent
+	DestroyFunc UrgencyFunc
+	AddToFunc UrgencyFunc
+	+ I Nop
+
+Read windowdecors/brushedmetal/config
diff --git a/moc/mocconfig b/moc/mocconfig
index c795676..edb6122 100644
--- a/moc/mocconfig
+++ b/moc/mocconfig
@@ -19,7 +19,7 @@ StartInMusicDir			= yes
 HideFileExtension		= yes
 ShowFormat			= yes
 ShowTime			= IfAvailable
-Theme				= moca_theme
+Theme				= green_theme
 MOCDir				= ~/.moc
 UseMmap				= no
 SavePlaylist			= yes
diff --git a/xorg/xinitrc b/xorg/xinitrc
index 3318c25..4b994a3 100755
--- a/xorg/xinitrc
+++ b/xorg/xinitrc
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 WM='fvwm2'
-WALLPAPER='media/bilder/wallpaper/leaf.jpg'
+WALLPAPER='media/bilder/wallpaper/wood_6.jpg'
 
 setxkbmap de neo
 xset +fp /usr/share/fonts/local
diff --git a/xorg/xresources b/xorg/xresources
index 88a3e33..987ab08 100644
--- a/xorg/xresources
+++ b/xorg/xresources
@@ -1,7 +1,5 @@
-#*font: xft:Terminus:bold:size=6:antialias=false
-*font: xft:Dina:antialias=false
-#*font: -xos4-terminus-*-*-*-*-12-*-*-*-*-*-*-*
-*geometry: 100x25
+*font: xft:Dina:size=7:antialias=false
+*geometry: 110x24
 
 *buffered: true
 *internalBorder: 0
diff --git a/zsh/zshrc b/zsh/zshrc
index d586d4a..279bd98 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -60,7 +60,7 @@ alias p="pal -r 7"
 alias q="quilt"
 alias r="rdesktop-vrdp -k de -K localhost"
 alias s="screen -r -d"
-alias t="tmux a"
+alias t="task"
 alias tmux='tmux -u'
 alias v="vim"
 alias vi="vim"
@@ -125,6 +125,10 @@ automon() {
 	}
 }
 
+vpn() {
+	sudo openvpn --config /etc/openvpn/$1
+}
+
 case $TERM in
 	rxvt*)
     		precmd () {print -Pn "\e]0;%n@%m: %~\a"}