Merge remote-tracking branch 'ryuslash/master' into phoenix
This commit is contained in:
commit
0b775a872e
3 changed files with 16 additions and 10 deletions
9
.Xmodmap
9
.Xmodmap
|
@ -4,11 +4,12 @@ pointer = 3 2 1
|
||||||
!
|
!
|
||||||
! Swap Caps_Lock and Control_L
|
! Swap Caps_Lock and Control_L
|
||||||
!
|
!
|
||||||
remove Lock = Caps_Lock
|
! remove Lock = Caps_Lock
|
||||||
remove Control = Control_L
|
remove Control = Control_L
|
||||||
keysym Control_L = Caps_Lock
|
! keysym Control_L = Caps_Lock
|
||||||
keysym Caps_Lock = Control_L
|
! keysym Caps_Lock = Control_L
|
||||||
add Lock = Caps_Lock
|
keycode 66 = Control_L
|
||||||
|
! add Lock = Caps_Lock
|
||||||
add Control = Control_L
|
add Control = Control_L
|
||||||
|
|
||||||
!
|
!
|
||||||
|
|
|
@ -11,13 +11,13 @@ fi
|
||||||
x=${geometry[0]}
|
x=${geometry[0]}
|
||||||
width=${geometry[2]}
|
width=${geometry[2]}
|
||||||
height=12
|
height=12
|
||||||
y=$(expr ${geometry[3]} - $height)
|
y=0 #$(expr ${geometry[3]} - $height)
|
||||||
tag_width=40
|
tag_width=40
|
||||||
font="-misc-tamsyn-medium-r-normal-*-14-*-*-*-*-*-iso8859-*"
|
font="-misc-tamsyn-medium-r-normal-*-14-*-*-*-*-*-iso8859-*"
|
||||||
|
|
||||||
selcolor='#24c6e0'
|
selcolor='#24c6e0'
|
||||||
locolor='#15abc3'
|
locolor='#657b83'
|
||||||
bgcolor='#000000'
|
bgcolor='#002b36'
|
||||||
hicolor="#808080"
|
hicolor="#808080"
|
||||||
urcolor="#e0c625"
|
urcolor="#e0c625"
|
||||||
|
|
||||||
|
@ -113,7 +113,7 @@ function emacs_running()
|
||||||
ps ax | awk '{ print $5 " " $6 }' | grep -E "^emacs --daemon"
|
ps ax | awk '{ print $5 " " $6 }' | grep -E "^emacs --daemon"
|
||||||
}
|
}
|
||||||
|
|
||||||
herbstclient pad $monitor -5 -5 $(expr -5 + $height) -5
|
herbstclient pad $monitor $(expr -5 + $height) -5 -5 -5
|
||||||
herbstclient pad $monitor2 -5 -5 -5 -5
|
herbstclient pad $monitor2 -5 -5 -5 -5
|
||||||
{
|
{
|
||||||
childpid=$!
|
childpid=$!
|
||||||
|
|
9
.xinitrc
9
.xinitrc
|
@ -7,11 +7,16 @@ numlockx &
|
||||||
emacs --daemon &
|
emacs --daemon &
|
||||||
xbindkeys &
|
xbindkeys &
|
||||||
#_ Start notifier
|
#_ Start notifier
|
||||||
|
x=0
|
||||||
|
width=1920
|
||||||
|
height=12
|
||||||
|
y=0
|
||||||
/usr/bin/dunst \
|
/usr/bin/dunst \
|
||||||
-fn "-misc-tamsyn-medium-r-normal-*-14-*-*-*-*-*-iso8859-*" \
|
-fn "-misc-tamsyn-medium-r-normal-*-14-*-*-*-*-*-iso8859-*" \
|
||||||
-nb "#000000" -nf "#15abc3" &
|
-nb "#002b36" -nf "#657b83" -to 5
|
||||||
|
-geometry "${width}x${height}+${x}+${y}" &
|
||||||
#_ Start session
|
#_ Start session
|
||||||
#exec ck-launch-session /usr/bin/herbstluftwm 2>&1 >> ~/.xsession_errors
|
exec ck-launch-session /usr/bin/herbstluftwm 2>&1 >> ~/.xsession_errors
|
||||||
exec ck-launch-session /usr/local/bin/dwm 2>&1 >> ~/.xsession_errors
|
exec ck-launch-session /usr/local/bin/dwm 2>&1 >> ~/.xsession_errors
|
||||||
#_ Local Variables
|
#_ Local Variables
|
||||||
# Local Variables:
|
# Local Variables:
|
||||||
|
|
Loading…
Add table
Reference in a new issue