Stuff.
This commit is contained in:
36
x/Xresources
36
x/Xresources
@@ -2,14 +2,14 @@
|
||||
Xcursor.theme: Vanilla-DMZ
|
||||
|
||||
URxvt.scrollBar: false
|
||||
URxvt.font: xft:DejaVu Sans Mono:size=11
|
||||
URxvt.font: xft:DejaVu Sans Mono:size=10.5
|
||||
|
||||
URxvt.letterSpace: -2
|
||||
URxvt.letterSpace: -1
|
||||
|
||||
! clickable URLs
|
||||
!URxvt.perl-ext-common: default,matcher
|
||||
!URxvt.urlLauncher: firefox
|
||||
!URxvt.matcher.button: 1
|
||||
URxvt.perl-ext-common: default,matcher
|
||||
URxvt.url-launcher: /usr/bin/chromium
|
||||
URxvt.matcher.button: 1
|
||||
|
||||
URxvt.intensityStyles: false
|
||||
|
||||
@@ -17,7 +17,7 @@ URxvt.intensityStyles: false
|
||||
|
||||
URxvt.saveLines: 10000
|
||||
|
||||
URxvt.fading: 20
|
||||
URxvt.fading: 40
|
||||
|
||||
URxvt.termName: urxvt
|
||||
|
||||
@@ -95,3 +95,27 @@ URxvt*color14: S_base1
|
||||
URxvt*color15: S_base3
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
urxvt*foreground: white
|
||||
urxvt*background: black
|
||||
|
||||
*color0: #2E3436
|
||||
*color1: #a40000
|
||||
*color2: #4E9A06
|
||||
*color3: #C4A000
|
||||
*color4: #3465A4
|
||||
*color5: #75507B
|
||||
*color6: #ce5c00
|
||||
*color7: #babdb9
|
||||
*color8: #555753
|
||||
*color9: #EF2929
|
||||
*color10: #8AE234
|
||||
*color11: #FCE94F
|
||||
*color12: #729FCF
|
||||
*color13: #AD7FA8
|
||||
*color14: #fcaf3e
|
||||
*color15: #EEEEEC
|
||||
|
||||
|
||||
61
x/xinitrc
61
x/xinitrc
@@ -25,6 +25,24 @@ fi
|
||||
|
||||
export LANG=en_US.UTF-8
|
||||
|
||||
start_wm() {
|
||||
log "generating i3 config"
|
||||
I3_LOG="$LOGDIR/i3/i3.log"
|
||||
I3_LOGOLD="${I3_LOG}.old"
|
||||
|
||||
# simple logrotate so we can still get info about the last session
|
||||
if [[ -f "$I3_LOG" ]] ; then
|
||||
log "moving old i3 log at $I3_LOG to $I3_LOGOLD"
|
||||
mv -f "$I3_LOG" "$I3_LOGOLD"
|
||||
fi
|
||||
|
||||
[[ ! -d "$(dirname $I3_LOG)" ]] && mkdir -p "$(dirname $I3_LOG)"
|
||||
SESSION_CONF=$(bash "$HOME/.i3/scripts/genconfig.bash")
|
||||
log "generated, starting i3"
|
||||
exec i3 -c "$SESSION_CONF" >> "$LOGDIR/i3/i3.log"
|
||||
}
|
||||
|
||||
|
||||
# keyboard options
|
||||
keyboard_layout=de
|
||||
keyboard_variant=nodeadkeys
|
||||
@@ -45,18 +63,26 @@ redshift_colortemp="5500:4000"
|
||||
# start mpd
|
||||
if [[ -z "$(pgrep --euid hannes --exact "^mpd$")" ]] ; then
|
||||
log "mpd is not running, starting mpd"
|
||||
mpd "$HOME/.mpd/mpd.conf"
|
||||
mpd "$HOME/.mpd/mpd.conf" &
|
||||
else
|
||||
log "mpd already running, will not start another instance"
|
||||
fi
|
||||
|
||||
## start the urxvt daemon
|
||||
#if pidof urxvtd &>/dev/null ; then
|
||||
# log "urxvtd already running"
|
||||
#else
|
||||
# log "starting urxvtd"
|
||||
# urxvtd -q --fork
|
||||
#fi
|
||||
|
||||
# start the pulseaudio volume control tray applet
|
||||
log "starting pasystray"
|
||||
pasystray &
|
||||
pasystray & &> $LOGFILE
|
||||
|
||||
# start dropbox
|
||||
log "starting dropboxd"
|
||||
dropboxd &
|
||||
dropboxd & &> $LOGFILE
|
||||
|
||||
# start the wallpaper changer
|
||||
log "starting $path_wallchanger"
|
||||
@@ -64,48 +90,33 @@ $path_wallchanger "$wallpaper_directory" "$wallpaper_interval" "$wallpaper_fallb
|
||||
|
||||
# start redshift
|
||||
log "starting redshift-gtk"
|
||||
redshift-gtk -l "$redshift_lat_long" -t "$redshift_colortemp" &
|
||||
redshift-gtk -l "$redshift_lat_long" -t "$redshift_colortemp" & &> $LOGFILE
|
||||
# not it
|
||||
|
||||
# set keyboard layout
|
||||
log "setting keyboard layout"
|
||||
setxkbmap -layout "$keyboard_layout" -variant "$keyboard_variant" &
|
||||
setxkbmap -layout "$keyboard_layout" -variant "$keyboard_variant" & &> $LOGFILE
|
||||
|
||||
# set key repeat delay
|
||||
log "setting key repeat delay"
|
||||
xset r rate "$keyboard_repeat_delay" "$keyboard_repeat_speed" &
|
||||
xset r rate "$keyboard_repeat_delay" "$keyboard_repeat_speed" & &> $LOGFILE
|
||||
|
||||
# execute the host-specific .xinitrc-addition
|
||||
hostfile="$HOME/.xinitrc.d/$(hostname).xinitrc"
|
||||
log "looking for host specific xinitrc addition at $hostfile"
|
||||
if [[ -f "$hostfile" ]] ; then
|
||||
log "found it. executing"
|
||||
bash "$hostfile" &
|
||||
bash "$hostfile" & &> $LOGFILE
|
||||
else
|
||||
log "found none"
|
||||
fi
|
||||
|
||||
if [[ -f ~/.Xresources ]] ; then
|
||||
log "found ~/.Xresources, merging it into xrdb"
|
||||
xrdb -merge ~/.Xresources &
|
||||
xrdb -merge ~/.Xresources & &> $LOGFILE
|
||||
else
|
||||
log "~/.Xresources not found"
|
||||
fi
|
||||
|
||||
I3_LOG="$LOGDIR/i3/i3.log"
|
||||
I3_LOGOLD="${I3_LOG}.old"
|
||||
|
||||
# simple logrotate so we can still get info about the last session
|
||||
if [[ -f "$I3_LOG" ]] ; then
|
||||
log "moving old i3 log at $I3_LOG to $I3_LOGOLD"
|
||||
mv -f "$I3_LOG" "$I3_LOGOLD"
|
||||
fi
|
||||
|
||||
[[ ! -d "$(dirname $I3_LOG)" ]] && mkdir -p "$(dirname $I3_LOG)"
|
||||
|
||||
log "generating i3 config"
|
||||
|
||||
|
||||
SESSION_CONF=$(bash "$HOME/.i3/scripts/genconfig.bash")
|
||||
log "generated, starting i3"
|
||||
exec i3 -c "$SESSION_CONF" >> "$LOGDIR/i3/i3.log"
|
||||
|
||||
start_wm
|
||||
|
||||
Reference in New Issue
Block a user