Merge branch 'master' of github.com:chronoslynx/dotfiles

* 'master' of github.com:chronoslynx/dotfiles: added conkyrc and got rid of compiled/intermediate files
tdeebswihart · Mar 15, 2013 · e438c92 · e438c92
2 parents 90577ce + ce3b60e
commit e438c92
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 270 deletions.
diff --git a/conkyrc b/conkyrc
@@ -0,0 +1,5 @@
+out_to_console yes
+out_to_x no
+update_interval 1
+TEXT
+mpd: ${exec mpc current | awk '{split($0,ar,": "); print ar[1]}'} | cpu: ${cpu cpu0}%:${cpu cpu1}%:${cpu cpu2}%:${cpu cpu3}% | ${if_running openvpn}MALNET${else}GTRI${endif} | time: ${time %F %T %Z}
diff --git a/dmenu/dmenu b/dmenu/dmenu
diff --git a/dmenu/dmenu.1 b/dmenu/dmenu.1
diff --git a/dmenu/dmenu.o b/dmenu/dmenu.o
diff --git a/dmenu/dmenu_run b/dmenu/dmenu_run
diff --git a/dmenu/draw.o b/dmenu/draw.o
diff --git a/dmenu/stest.1 b/dmenu/stest.1
diff --git a/dmenu/stest.o b/dmenu/stest.o