More changes.

This commit is contained in:
2014-07-31 02:51:20 +02:00
parent fd7e96e5f9
commit 135b5449d3
6 changed files with 31 additions and 19 deletions

View File

@@ -310,7 +310,7 @@ client.urgent #2f343a #900000 #ffffff #900000
for_window [class="^Chromium$" ] border none for_window [class="^Chromium$" ] border none
for_window [class="^yad-status$" ] floating enable , border none for_window [class="^yad-status$" ] floating enable , border none
for_window [class="^Docky$" ] floating enable , border none for_window [class="^Docky$" ] floating enable , border none
for_window [class="^Skype$" ] border 1pixel for_window [class="^Skype$" ] border none
for_window [class="^Steam$" ] border none for_window [class="^Steam$" ] border none
for_window [class="^Eclipse$" ] border none for_window [class="^Eclipse$" ] border none
#for_window [class="^Steam$" title="^Friends$" ] border 1pixel , floating enable , floating_maximum_size 200 x 700 #for_window [class="^Steam$" title="^Friends$" ] border 1pixel , floating enable , floating_maximum_size 200 x 700
@@ -320,6 +320,7 @@ client.urgent #2f343a #900000 #ffffff #900000
for_window [class="^Designer$" ] border none for_window [class="^Designer$" ] border none
for_window [class="^main\.py$" ] floating enable for_window [class="^main\.py$" ] floating enable
for_window [class="^Xfce4-panel$"] floating enable for_window [class="^Xfce4-panel$"] floating enable
for_window [class="^Thunderbird"] border none
assign [class="^Thunderbird"] $workspace9
assign [class="^Skype$"] $workspace10

View File

@@ -15,7 +15,8 @@ bindsym XF86AudioNext exec --no-startup-id mpc next
# font for window titles. ISO 10646 = Unicode # font for window titles. ISO 10646 = Unicode
font pango:DejaVu Sans Mono 11 font pango:DejaVu Sans Mono 11
bindsym $mod+o exec --no-startup-id ~/development/projects/xautorandr/xautorandr.sh bindsym $mod+o exec --no-startup-id "bash -c '~/development/projects/xautorandr/xautorandr.sh ; kill -SIGUSR2 $(cat $HOME/.var/run/wallchanger.pid)'"
bindsym $mod+p exec --no-startup-id "bash -c 'kill -SIGUSR1 $(cat $HOME/.var/run/wallchanger.pid)'"
# start i3bar to display a workspace bar (plus the system information i3status # start i3bar to display a workspace bar (plus the system information i3status

View File

@@ -1 +0,0 @@
/home/hannes/development/projects/wallchanger/wallchanger.bash

View File

@@ -1,5 +1,6 @@
acpi acpi
alsa-utils alsa-utils
atool
atop atop
baobab baobab
blender blender
@@ -41,6 +42,7 @@ gvfs
gvim gvim
hardinfo hardinfo
hedgewars hedgewars
highlight
htop htop
i3lock i3lock
i3status i3status
@@ -114,6 +116,7 @@ rxvt-unicode
samba samba
scrot scrot
skype skype
smplayer
sshfs sshfs
steam steam
subversion subversion
@@ -126,14 +129,14 @@ thunderbird
tk tk
tmux tmux
tree tree
ttf-ubuntu-font-family
ttf-dejavu ttf-dejavu
ttf-ubuntu-font-family
tumbler tumbler
unclutter
units units
unrar unrar
virtualbox virtualbox
virtualbox-guest-iso virtualbox-guest-iso
virtualbox-host-dkms
virtualbox-host-modules virtualbox-host-modules
vlc vlc
vnstat vnstat

View File

@@ -23,6 +23,9 @@ URxvt.termName: urxvt
URxvt.cursorBlink: true URxvt.cursorBlink: true
URxvt.transparent: true
URxvt.shading: 10
! Solarized color scheme for the X Window System ! Solarized color scheme for the X Window System
! !
! http://ethanschoonover.com/solarized ! http://ethanschoonover.com/solarized

View File

@@ -50,7 +50,8 @@ keyboard_repeat_delay=150
keyboard_repeat_speed=30 keyboard_repeat_speed=30
# path and options for the wallpaper changer script # path and options for the wallpaper changer script
path_wallchanger="$HOME/.i3/scripts/wallchanger.bash" path_wallchanger="$HOME/.i3/scripts/wallchanger.sh"
wallchanger_pidfile="$RUNDIR/wallchanger.pid"
wallpaper_directory="$HOME/pictures/wallpaper/misc" wallpaper_directory="$HOME/pictures/wallpaper/misc"
wallpaper_logfile="$LOGDIR/wallpaper.log" wallpaper_logfile="$LOGDIR/wallpaper.log"
wallpaper_fallback="$HOME/.i3/data/wallpaper/" wallpaper_fallback="$HOME/.i3/data/wallpaper/"
@@ -61,7 +62,7 @@ redshift_lat_long="49.5:11"
redshift_colortemp="5500:4000" redshift_colortemp="5500:4000"
# start mpd # start mpd
if [[ -z "$(pgrep --euid hannes --exact "^mpd$")" ]] ; then if ! pgrep --euid hannes --exact '^mpd$' ; then
log "mpd is not running, starting mpd" log "mpd is not running, starting mpd"
mpd "$HOME/.mpd/mpd.conf" & mpd "$HOME/.mpd/mpd.conf" &
else else
@@ -77,46 +78,50 @@ fi
#fi #fi
log "starting conky clock on desktop" log "starting conky clock on desktop"
(sleep 5 && conky -c "$HOME/.conky/clock.conkyrc" &> $LOGFILE) & (sleep 5 && conky -c "$HOME/.conky/clock.conkyrc" &>> $LOGFILE) &
# start the pulseaudio volume control tray applet # start the pulseaudio volume control tray applet
log "starting pasystray" log "starting pasystray"
pasystray & &> $LOGFILE pasystray & &>> $LOGFILE
# start dropbox # start dropbox
log "starting dropboxd" log "starting dropboxd"
nice -n 10 ionice -c 3 dropboxd & &> $LOGFILE nice -n 10 ionice -c 3 dropboxd & &>> $LOGFILE
# start the wallpaper changer # start the wallpaper changer
log "starting $path_wallchanger" log "starting $path_wallchanger"
$path_wallchanger "$wallpaper_directory" "$wallpaper_interval" "$wallpaper_fallback" > "$wallpaper_logfile" & $path_wallchanger "$wallpaper_directory" "$wallpaper_interval" "$wallpaper_fallback" &
echo $! > "$wallchanger_pidfile"
# start redshift # start redshift
log "starting redshift-gtk" log "starting redshift-gtk"
redshift-gtk -l "$redshift_lat_long" -t "$redshift_colortemp" & &> $LOGFILE redshift-gtk -l "$redshift_lat_long" -t "$redshift_colortemp" & &>> $LOGFILE
# not it
# set keyboard layout # set keyboard layout
log "setting keyboard layout" log "setting keyboard layout"
setxkbmap -layout "$keyboard_layout" -variant "$keyboard_variant" & &> $LOGFILE setxkbmap -layout "$keyboard_layout" -variant "$keyboard_variant" & &>> $LOGFILE
# set key repeat delay # set key repeat delay
log "setting key repeat delay" log "setting key repeat delay"
xset r rate "$keyboard_repeat_delay" "$keyboard_repeat_speed" & &> $LOGFILE xset r rate "$keyboard_repeat_delay" "$keyboard_repeat_speed" & &>> $LOGFILE
# disable auto screen disable
xset -dpms
xset s off
# execute the host-specific .xinitrc-addition # execute the host-specific .xinitrc-addition
hostfile="$HOME/.xinitrc.d/$(hostname).xinitrc" hostfile="$HOME/.xinitrc.d/$(hostname).xinitrc"
log "looking for host specific xinitrc addition at $hostfile" log "looking for host specific xinitrc addition at $hostfile"
if [[ -f "$hostfile" ]] ; then if [[ -f "$hostfile" ]] ; then
log "found it. executing" log "found it. executing"
bash "$hostfile" & &> $LOGFILE bash "$hostfile" & &>> $LOGFILE
else else
log "found none" log "found none"
fi fi
if [[ -f ~/.Xresources ]] ; then if [[ -f ~/.Xresources ]] ; then
log "found ~/.Xresources, merging it into xrdb" log "found ~/.Xresources, merging it into xrdb"
xrdb -merge ~/.Xresources & &> $LOGFILE xrdb -merge ~/.Xresources & &>> $LOGFILE
else else
log "~/.Xresources not found" log "~/.Xresources not found"
fi fi