Skip to content

Commit

Permalink
Completed merging
Browse files Browse the repository at this point in the history
  • Loading branch information
@zanterian
zanterian committed Apr 21, 2012
2 parents 145ac09 + df07ab4 commit 5936a34
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion Zanty/current/cpu0rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use_xft 1
xftfont Monospace:size=14
xftalpha 0

lua_load ./lua/rings1.lua
lua_load ~/workspace/git/ConkyConfig/Zanty/current/lua/rings1.lua
lua_draw_hook_pre cpu 225
lua_draw_hook_post cairo_cleanup
TEXT
Expand Down
2 changes: 1 addition & 1 deletion Zanty/current/cpu15rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use_xft 1
xftfont Monospace:size=8
xftalpha 0

lua_load ./lua/rings1.lua
lua_load ~/workspace/git/ConkyConfig/Zanty/current/lua/rings1.lua
lua_draw_hook_pre core1 125
lua_draw_hook_post cairo_cleanup
TEXT
Expand Down
2 changes: 1 addition & 1 deletion Zanty/current/cpu26rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use_xft 1
xftfont Monospace:size=8
xftalpha 0

lua_load ./lua/rings1.lua
lua_load ~/workspace/git/ConkyConfig/Zanty/current/lua/rings1.lua
lua_draw_hook_pre core2 125
lua_draw_hook_post cairo_cleanup
TEXT
Expand Down
2 changes: 1 addition & 1 deletion Zanty/current/cpu37rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use_xft 1
xftfont Monospace:size=8
xftalpha 0

lua_load ./lua/rings1.lua
lua_load ~/workspace/git/ConkyConfig/Zanty/current/lua/rings1.lua
lua_draw_hook_pre core3 125
lua_draw_hook_post cairo_cleanup
TEXT
Expand Down
2 changes: 1 addition & 1 deletion Zanty/current/cpu48rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use_xft 1
xftfont Monospace:size=8
xftalpha 0

lua_load ./lua/rings1.lua
lua_load ~/workspace/git/ConkyConfig/Zanty/current/lua/rings1.lua
lua_draw_hook_pre core3 125
lua_draw_hook_post cairo_cleanup
TEXT
Expand Down
2 changes: 1 addition & 1 deletion Zanty/current/downrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use_xft 1
xftfont Monospace:size=6
xftalpha 0

lua_load ./lua/rings1.lua
lua_load ~/workspace/git/ConkyConfig/Zanty/current/lua/rings1.lua
lua_draw_hook_pre network 0 230
lua_draw_hook_post cairo_cleanup
TEXT
Expand Down
2 changes: 1 addition & 1 deletion Zanty/current/memrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ color1 656565
use_xft 1
xftalpha 0

lua_load ./lua/rings1.lua
lua_load ~/workspace/git/ConkyConfig/Zanty/current/lua/rings1.lua
lua_draw_hook_pre mem 400
lua_draw_hook_post cairo_cleanup

Expand Down
2 changes: 1 addition & 1 deletion Zanty/current/networkrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use_xft 1
xftfont Monospace:size=14
xftalpha 0

lua_load ./lua/rings1.lua
lua_load ~/workspace/git/ConkyConfig/Zanty/current/lua/rings1.lua
lua_draw_hook_pre bandwidth 275
lua_draw_hook_post cairo_cleanup
TEXT
2 changes: 1 addition & 1 deletion Zanty/current/signalrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use_xft 1
xftfont Monospace:size=10
xftalpha 0

lua_load ./lua/rings1.lua
lua_load ~/workspace/git/ConkyConfig/Zanty/current/lua/rings1.lua
lua_draw_hook_pre wireless_strength 75
lua_draw_hook_post cairo_cleanup
TEXT
Expand Down
20 changes: 10 additions & 10 deletions Zanty/current/start_conky
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/bin/sh
/usr/bin/conky -c ~/.conky/conkyrc;
/usr/bin/conky -c ~/.conky/memrc;
/usr/bin/conky -c ~/.conky/swaprc;
/usr/bin/conky -c ~/.conky/networkrc;
/usr/bin/conky -c ~/.conky/signalrc;
/usr/bin/conky -c ~/.conky/cpu0rc;
/usr/bin/conky -c ~/.conky/cpu15rc;
/usr/bin/conky -c ~/.conky/cpu26rc;
/usr/bin/conky -c ~/.conky/cpu37rc;
/usr/bin/conky -c ~/.conky/cpu48rc;
/usr/bin/conky -c ~/workspace/git/ConkyConfig/Zanty/current/conkyrc;
/usr/bin/conky -c ~/workspace/git/ConkyConfig/Zanty/current/memrc;
/usr/bin/conky -c ~/workspace/git/ConkyConfig/Zanty/current/swaprc;
/usr/bin/conky -c ~/workspace/git/ConkyConfig/Zanty/current/networkrc;
/usr/bin/conky -c ~/workspace/git/ConkyConfig/Zanty/current/signalrc;
/usr/bin/conky -c ~/workspace/git/ConkyConfig/Zanty/current/cpu0rc;
/usr/bin/conky -c ~/workspace/git/ConkyConfig/Zanty/current/cpu15rc;
/usr/bin/conky -c ~/workspace/git/ConkyConfig/Zanty/current/cpu26rc;
/usr/bin/conky -c ~/workspace/git/ConkyConfig/Zanty/current/cpu37rc;
/usr/bin/conky -c ~/workspace/git/ConkyConfig/Zanty/current/cpu48rc;
2 changes: 1 addition & 1 deletion Zanty/current/swaprc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use_xft 1
xftfont Monospace:size=6
xftalpha 0

lua_load ./lua/rings1.lua
lua_load ~/workspace/git/ConkyConfig/Zanty/current/lua/rings1.lua
lua_draw_hook_pre swap 100
lua_draw_hook_post cairo_cleanup
TEXT
Expand Down

0 comments on commit 5936a34

Please sign in to comment.