summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.config/conky/main2
-rw-r--r--.xinitrc30
2 files changed, 6 insertions, 26 deletions
diff --git a/.config/conky/main b/.config/conky/main
index d3a9caa..7fd9f7f 100644
--- a/.config/conky/main
+++ b/.config/conky/main
@@ -41,5 +41,3 @@ ${mem} ${alignc}${memperc}%${alignr}${cpu cpu0}%
${color #92BCF3}Downstream:${color0} ${alignc} ${totaldown eth0}${alignr}${downspeed eth0}
${color #92BCF3}Upstream:${color0} ${alignc} ${totalup eth0}${alignr}${upspeed eth0}
-
-${texeci 500 /home/flo/bin/update_checker.sh}
diff --git a/.xinitrc b/.xinitrc
index 430f290..3285521 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -12,48 +12,30 @@ source $HOME/bin/gpg-agent.sh
setxkbmap de nodeadkeys
xbindkeys &
xmodmap ~/.xmodmaprc &
-urxvtd -o -f -q
-xautolock -nowlocker $HOME/bin/screen-locker.sh -locker $HOME/bin/screen-locker.sh -time 5 &
+xautolock -nowlocker $HOME/bin/screen-locker.sh -locker $HOME/bin/screen-locker.sh -time 10 &
+/usr/lib/xfce4/notifyd/xfce4-notifyd &
autostart () {
- notipy.py -a SOUTH_EAST -m 0,1920,0,0 &
- $HOME/bin/irssi_notify.sh & # also in ~/bin/suspend-resume.sh
- urxvt -g 125x+45+1166+0 -e ssh mistral &
- urxvt -g 125x+45+1920+0 -e ssh karif &
+ notipy.py -a SOUTH_EAST -m 0,1920,0,0 &
+ urxvt -g 125x+45+1041+0 -e ssh mistral &
+# urxvt -g 125x+45+1920+0 -e ssh karif &
stalonetray --dockapp-mode -p --kludges force_icons_size &
-# lxpanel &
for f in $XDG_CONFIG_HOME/conky/*; do
conky -c "$f" &
done
- rm $HOME/passwords.kdb.lock
+ rm -f $HOME/passwords.kdb.lock
keepassx&
-# transmission-qt &
transmission-remote-gtk &
-# psi &
- gajim &
-# /opt/Samsung/SmartPanel/bin/smartpanel &
-# ossxmix -b & # also in ~/bin/suspend-resume.sh
ossmixer.py &> /dev/null &
thunderbird &
liferea &
zim &
parcellite &
-# blueman-applet &
$HOME/git/thetime/src/thetime -t "%F %H:%M:%S" -p 1921,1040 -f "xft:DejaVu Sans:size=10"
}
# WM
case "$1" in
- awesome|i3)
- i3 --force-xinerama &
- sleep 1
- autostart &
- ;;
- twm)
- twm &
- sleep 1
- autostart &
- ;;
console)
openbox &
sleep 1