dotfiles
/
xinitrc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Slight formatting changes

This commit is contained in:
David Thurstenson 2016-04-11 12:25:45 -05:00
parent 56bd198f2f
commit 7e55ab0424
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
.xinitrc
View File

@ -7,18 +7,11 @@ sysmodmap=/etc/X11/xinit/.Xmodmap
# merge in defaults and keymaps # merge in defaults and keymaps
if [ -f $sysresources ]; then [ -f $sysresources ] && xrdb -merge $sysresources
xrdb -merge $sysresources [ -f $sysmodmap ] && xmodmap $sysmodmap
fi [ -f "$userresources" ] && xrdb -merge "$userresources"
if [ -f $sysmodmap ]; then [ -f "$usermodmap" ] && xmodmap "$usermodmap"
xmodmap $sysmodmap
fi
if [ -f "$userresources" ]; then
xrdb -merge "$userresources"
fi
if [ -f "$usermodmap" ]; then
xmodmap "$usermodmap"
fi
# start some nice programs # start some nice programs
@ -39,10 +32,7 @@ export SSH_AUTH_SOCK
xautolock -time 30 -locker i3lock -b -d -c 000000 -e -f xautolock -time 30 -locker i3lock -b -d -c 000000 -e -f
# Thurstybook-specific config: # Thurstybook-specific config:
if [[ "$HOSTNAME" == "thurstybook" ]]; then [[ "$HOSTNAME" == "thurstybook" ]] && srandrd ~/.config/srandrd.conf
# start srandrd
srandrd ~/.config/srandrd.conf
fi
if [[ "$HOSTNAME" == "dtarch" ]]; then if [[ "$HOSTNAME" == "dtarch" ]]; then
@ -57,9 +47,8 @@ if [[ "$HOSTNAME" == "dtarch" ]]; then
fi fi
# If numlockx is installed, activate it # If numlockx is installed, activate it
if [[ -s /usr/bin/numlockx ]]; then [[ -s /usr/bin/numlockx ]] && numlockx on
numlockx on
fi
session=${1:-i3} session=${1:-i3}