summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.config/conky/main (renamed from .conkyrc)2
-rw-r--r--.config/conky/time38
-rw-r--r--.gitignore6
-rw-r--r--.xinitrc9
4 files changed, 49 insertions, 6 deletions
diff --git a/.conkyrc b/.config/conky/main
index 541e218..d80d0ef 100644
--- a/.conkyrc
+++ b/.config/conky/main
@@ -1,5 +1,5 @@
#----------------------------------------------------
-# File: .conkyrc
+# File: conky/main
# Version: 0.2
# Author: Florian "Bluewind" Pritz <f-p@gmx.at>
#----------------------------------------------------
diff --git a/.config/conky/time b/.config/conky/time
new file mode 100644
index 0000000..a1d019f
--- /dev/null
+++ b/.config/conky/time
@@ -0,0 +1,38 @@
+#----------------------------------------------------
+# File: conky/time
+# Version: 0.2
+# Author: Florian "Bluewind" Pritz <f-p@gmx.at>
+#----------------------------------------------------
+background no
+use_xft yes
+xftfont arial:size=9
+xftalpha 0.8
+update_interval 1.0
+total_run_times 0
+own_window yes
+own_window_type normal
+own_window_transparent yes
+own_window_hints undecorated,below,sticky,skip_taskbar,skip_pager
+double_buffer yes
+minimum_size 220 5
+maximum_width 350
+draw_shades yes
+draw_outline no
+draw_borders no
+stippled_borders 0
+border_margin 0
+border_width 0
+default_color #111111
+default_shade_color black
+default_outline_color blue
+alignment bottom_left
+gap_x 1680
+gap_y 25
+no_buffers yes
+uppercase no
+cpu_avg_samples 2
+net_avg_samples 2
+override_utf8_locale no
+
+TEXT
+${time}
diff --git a/.gitignore b/.gitignore
index cb73519..92df395 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
*
-!.zsh/
+!.zsh/*
!.zshrc
!.gitignore
@@ -10,11 +10,13 @@
!.xinitrc
!.pypanelrc
-!.conkyrc
!.screenrc
!.Xdefaults
!.gtkrc-2.0
+
!.config/awesome/rc.lua
+!.config/conky/*
+
!.motd
!.htoprc
diff --git a/.xinitrc b/.xinitrc
index dfe3215..5806a31 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -19,15 +19,18 @@ chat_terminal () {
urxvt -g 125x+45+0+0 -e ssh mistral
}
-autostart () {
- conky &
+autostart () {
+ for f in $XDG_CONFIG_HOME/conky/*; do
+ conky -c "$f" &
+ done
gajim &
#urxvtc -e $HOME/bin/screen.sh 2 &
chat_terminal &
ossxmix -b &
thunderbird &
thunar --daemon &
- (sleep 3 && pypanel) &
+ stalonetray -w -p &
+ #(sleep 3 && pypanel) &
#xfce4-panel &
#fbpanel &
#fsniper --daemon