conky: Match new HDD layout

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>

2 files changed, 21 insertions, 31 deletions

diff --git a/conky/desktop/conkyrc b/conky/desktop/conkyrc
index 3dbb258..9e4dc86 100755
--- a/conky/desktop/conkyrc
+++ b/conky/desktop/conkyrc
@@ -41,4 +41,4 @@ lua_draw_hook_pre draw_bg
 
 
 TEXT
-${font Roboto Th:pixelsize=86}${time %H:%M}${font}${GOTO 215}${voffset -43}${font Roboto:pixelsize=33}${time %A} ${color ff8800}${time %-e}${font}${voffset 33}${GOTO 215}${font Roboto:pixelsize=23}${time %B} ${color}${time %Y}${font}${voffset -50}${GOTO 554}NET: ${font}${GOTO 780}CPU: ${cpu}%${GOTO 1006}RAM: ${font Roboto Th:pixelsize=18}${mem}/${memmax}${voffset -11}${font}${GOTO 1232}DISKS:${voffset 28}${GOTO 584}${font Roboto:pixelsize=15}eth0: ${font Roboto Th:pixelsize=15}${addr eth0}${GOTO 780}${cpugraph cpu0 10,200 000000}${GOTO 1036}${font Roboto:pixelsize=15}SWAP: ${font Roboto Th:pixelsize=15}${swap}/${swapmax}${GOTO 1232}${font Roboto:pixelsize=15}/: ${font Roboto Th:pixelsize=15}${fs_free /}${GOTO 1344}${voffset 1}${fs_bar 10,100 /}${voffset -1}${GOTO 1456}${font Roboto:pixelsize=15}home: ${font Roboto Th:pixelsize=15}${fs_free /home}${GOTO 1568}${voffset 1}${fs_bar 10,100 /home}${voffset -1}${voffset 16}${font Roboto Th:pixelsize=15}${GOTO 780}${top name 1}${GOTO 934}${top cpu 1}%${GOTO 1006}${top name 1}${GOTO 1160}${top mem 1}%${voffset 17}${GOTO 584}${font Roboto Th:pixelsize=15}${font Roboto:pixelsize=15}Rx: ${font Roboto Th:pixelsize=15}${downspeed eth0}${GOTO 669}${font Roboto:pixelsize=15}Tx: ${font Roboto Th:pixelsize=15}${upspeed eth0}${font Roboto Th:pixelsize=15}${GOTO 780}${top name 2}${GOTO 934}${top cpu 2}%${GOTO 1006}${top name 2}${GOTO 1160}${top mem 2}%${voffset -8}${GOTO 1232}${font Roboto:pixelsize=15}data: ${font Roboto Th:pixelsize=15}${fs_free /data}${GOTO 1344}${voffset 1}${fs_bar 10,100 /data}${voffset -1}${GOTO 1456}${font Roboto:pixelsize=15}projets: ${font Roboto Th:pixelsize=15}${fs_free /data/Projets}${GOTO 1568}${voffset 1}${fs_bar 10,100 /data/Projets}${voffset -1}
+${font Roboto Th:pixelsize=86}${time %H:%M}${font}${GOTO 215}${voffset -43}${font Roboto:pixelsize=33}${time %A} ${color ff8800}${time %-e}${font}${voffset 33}${GOTO 215}${font Roboto:pixelsize=23}${time %B} ${color}${time %Y}${font}${voffset -50}${GOTO 763}NET: ${font}${GOTO 994}CPU: ${cpu}%${GOTO 1224}RAM: ${font Roboto Th:pixelsize=18}${mem}/${memmax}${voffset -11}${font}${GOTO 1454}DISKS:${voffset 28}${GOTO 793}${font Roboto:pixelsize=15}eth0: ${font Roboto Th:pixelsize=15}${addr eth0}${GOTO 994}${cpugraph cpu0 10,200 000000}${GOTO 1258}${font Roboto:pixelsize=15}SWAP: ${font Roboto Th:pixelsize=15}${swap}/${swapmax}${GOTO 1454}${font Roboto:pixelsize=15}/: ${font Roboto Th:pixelsize=15}${fs_free /}${GOTO 1566}${voffset 1}${fs_bar 10,100 /}${voffset -1}${voffset 16}${font Roboto Th:pixelsize=15}${GOTO 994}${top name 1}${GOTO 1148}${top cpu 1}%${GOTO 1224}${top name 1}${GOTO 1382}${top mem 1}%${voffset 17}${GOTO 793}${font Roboto Th:pixelsize=15}${font Roboto:pixelsize=15}Rx: ${font Roboto Th:pixelsize=15}${downspeed eth0}${GOTO 878}${font Roboto:pixelsize=15}Tx: ${font Roboto Th:pixelsize=15}${upspeed eth0}${font Roboto Th:pixelsize=15}${GOTO 994}${top name 2}${GOTO 1148}${top cpu 2}%${GOTO 1224}${top name 2}${GOTO 1382}${top mem 2}%${voffset -8}${GOTO 1454}${font Roboto:pixelsize=15}home: ${font Roboto Th:pixelsize=15}${fs_free /home}${GOTO 1566}${voffset 1}${fs_bar 10,100 /home}${voffset -1}
diff --git a/conky/desktop/draw_bg.lua b/conky/desktop/draw_bg.lua
index 5aad8b9..be54552 100644
--- a/conky/desktop/draw_bg.lua
+++ b/conky/desktop/draw_bg.lua
@@ -29,52 +29,42 @@ function conky_draw_bg()
 	cairo_fill(cr)
 
 	ln=cairo_create(cs)
-	cairo_move_to(ln,540,10)
-	cairo_line_to(ln,540,100)
-	cairo_line_to(ln,541,100)
-	cairo_line_to(ln,541,10)
-	cairo_move_to(ln,540,10)
+	cairo_move_to(ln,750,10)
+	cairo_line_to(ln,750,100)
+	cairo_line_to(ln,751,100)
+	cairo_line_to(ln,751,10)
+	cairo_move_to(ln,750,10)
 	cairo_close_path(ln)
  	cairo_set_source_rgba(ln,rgb_to_r_g_b(ln_colour,1))
 	cairo_fill(ln)
 
 	ln=cairo_create(cs)
-	cairo_move_to(ln,766,10)
-	cairo_line_to(ln,766,100)
-	cairo_line_to(ln,767,100)
-	cairo_line_to(ln,767,10)
-	cairo_move_to(ln,766,10)
+	cairo_move_to(ln,980,10)
+	cairo_line_to(ln,980,100)
+	cairo_line_to(ln,981,100)
+	cairo_line_to(ln,981,10)
+	cairo_move_to(ln,980,10)
 	cairo_close_path(ln)
  	cairo_set_source_rgba(ln,rgb_to_r_g_b(ln_colour,1))
 	cairo_fill(ln)
 
 	ln=cairo_create(cs)
-	cairo_move_to(ln,992,10)
-	cairo_line_to(ln,992,100)
-	cairo_line_to(ln,993,100)
-	cairo_line_to(ln,993,10)
-	cairo_move_to(ln,992,10)
+	cairo_move_to(ln,1210,10)
+	cairo_line_to(ln,1210,100)
+	cairo_line_to(ln,1211,100)
+	cairo_line_to(ln,1211,10)
+	cairo_move_to(ln,1210,10)
 	cairo_close_path(ln)
  	cairo_set_source_rgba(ln,rgb_to_r_g_b(ln_colour,1))
 	cairo_fill(ln)
 
 	ln=cairo_create(cs)
-	cairo_move_to(ln,1218,10)
-	cairo_line_to(ln,1218,100)
-	cairo_line_to(ln,1219,100)
-	cairo_line_to(ln,1219,10)
-	cairo_move_to(ln,1218,10)
+	cairo_move_to(ln,1440,10)
+	cairo_line_to(ln,1440,100)
+	cairo_line_to(ln,1441,100)
+	cairo_line_to(ln,1441,10)
+	cairo_move_to(ln,1440,10)
 	cairo_close_path(ln)
  	cairo_set_source_rgba(ln,rgb_to_r_g_b(ln_colour,1))
 	cairo_fill(ln)
-
---	ln1=cairo_create(cs)
---	cairo_move_to(ln1,550,10)
---	cairo_line_to(ln1,550,165)
---	cairo_line_to(ln1,551,165)
---	cairo_line_to(ln1,551,10)
---	cairo_line_to(ln1,550,10)
---	cairo_close_path(ln1)
- --	cairo_set_source_rgba(ln1,rgb_to_r_g_b(ln_colour,1))
---	cairo_fill(ln1)
 end