Skip to content
Browse files

Update

  • Loading branch information...
1 parent a510a7d commit 076001295248341944259d3fc3d98394c7ef269c Aldis Berjoza committed Aug 24, 2011
Showing with 42 additions and 48 deletions.
  1. +6 −13 dot.Xmodmap
  2. +1 −0 dot.screenrc
  3. +35 −35 dot.xinitrc
View
19 dot.Xmodmap
@@ -1,13 +1,6 @@
-! keycode 153 = XF86Favorites
-! keycode 178 = XF86HomePage
-! keycode 236 = XF86Mail
-! keycode 140 = XF86AudioMute
-! keycode 174 = XF86AudioLowerVolume
-! keycode 176 = XF86AudioRaiseVolume
-! keycode 162 = XF86AudioPlay
-! keycode 115 = XF86Start
-! keycode 116 = XF86Start
-! keycode 117 = XF86MenuKB
-
-clear Lock
-keysym Caps_Lock = Return
+remove Lock = Caps_Lock
+remove Control = Control_L
+keysym Control_L = Caps_Lock
+keysym Caps_Lock = Control_L
+add Lock = Caps_Lock
+add Control = Control_L
View
1 dot.screenrc
@@ -0,0 +1 @@
+vbell off
View
70 dot.xinitrc
@@ -1,13 +1,41 @@
[ -f "$HOME/.profile" ] && . "$HOME/.profile"
-export WM=${1:-fvwm}
+export WM=${1:-xmonad}
export MY_BROWSER=opera
-export GUI_EDITOR=gvim
+#export GUI_EDITOR=gvim
export UTERM=urxvtc
export IMG_VIEWER=gpicview
# WMSCRIPTS_DIR is set in ~/.profile
export BROWSER="$WMSCRIPTS_DIR/browser.sh"
+EXEC_CMD="xterm"
+
+case $WM in
+'fvwm' )
+ keynav &
+ #xcompmgr -C -c &
+ #"$HOME/.fvwm/config.sh"
+ which fvwm > /dev/null && EXEC_CMD="exec fvwm"
+ ;;
+
+'xmonad' )
+ which xmonad > /dev/null && EXEC_CMD="exec xmonad"
+ ;;
+
+'e17' )
+ which enlightenment_start > /dev/null && EXEC_CMD="exec ck-launch-session enlightenment_start"
+ ;;
+
+'dwm' )
+ xrdb $HOME/.Xdefaults
+ which dwm > /dev/null && EXEC_CMD="exec dwm"
+ ;;
+
+*)
+ which $1 > /dev/null && EXEC_CMD="exec $1"
+ ;;
+
+esac
cd "$HOME/src/dot.files" && ./Xdefaults.sh; cd "$HOME" # Update ~/.Xdefaults
@@ -16,47 +44,19 @@ eval `"$WMSCRIPTS_DIR/agentCtl.sh" start all`
mixer vol 70 pcm 70 &
urxvtd -q -o -f
-renice -n 20 unclutter -noevents &
+nice -n 20 unclutter -noevents &
pidgin &
#workrave &
#nm-applet &
nvidia-settings -l
when --warp=0 --nopaging --monday_first --noampm | exec gxmessage -font "dejavu sans mono" -name when -buttons "_OK" -default '_OK' -file - &
setxkbmap lv
numlockx on
-
hsetroot -fill $HOME/.wallpaper
+xset r rate 250 50 b off dpms 300
+$WMSCRIPTS_DIR/screensaverCtl.sh start
+
-{
- case $WM in
- 'fvwm' )
- keynav &
- #xcompmgr -C -c &
- #"$HOME/.fvwm/config.sh"
- which fvwm > /dev/null && exec fvwm
- ;;
-
- 'xmonad' )
- which xmonad > /dev/null && exec xmonad
- ;;
-
- 'e17' )
- which enlightenment_start > /dev/null && exec ck-launch-session enlightenment_start
- ;;
-
- 'dwm' )
- xrdb $HOME/.Xdefaults
- which dwm > /dev/null && exec dwm
- ;;
-
- *)
- which $1 > /dev/null && exec $1
- ;;
-
- esac
-
- # fallback
- urxvtc || urxvt || exec xterm
-} > $HOME/.xsession-errors 2> $HOME/.xsession-errors
+$EXEC_CMD > $HOME/.xsession-errors 2> $HOME/.xsession-errors
# vim: set ts=4 sw=4 syntax=sh nowrap:

0 comments on commit 0760012

Please sign in to comment.
Something went wrong with that request. Please try again.