Adapt to new font

2 files changed, 9 insertions, 25 deletions

diff --git a/conky.dot.link/weather/conkyrc b/conky.dot.link/weather/conkyrc
index f037bf5..c0302d3 100644
--- a/conky.dot.link/weather/conkyrc
+++ b/conky.dot.link/weather/conkyrc
@@ -95,36 +95,22 @@ ${execi 3600 weather-query weather}
 
 
 
-${execpi 3600 weather-query brweather --imagem4=C1 -p 10,100 -s 60x60}
-${execpi 3600 weather-query brweather --imagem4=C2 -p 110,100 -s 60x60}
-${execpi 3600 weather-query brweather --imagem4=C3 -p 210,100 -s 60x60}
 
+${execpi 3600 weather-query brweather --imagem4=C1 -p 10,110  -s 60x60}
+${execpi 3600 weather-query brweather --imagem4=C2 -p 110,110 -s 60x60}
+${execpi 3600 weather-query brweather --imagem4=C3 -p 210,110 -s 60x60}
+${execi  3600 weather-query brweather --option=Day1 | sed -e 's/á/a/g'}: ${execi 3600 weather-query brweather --option=LT1 | sed -e 's/°/C/g'}/${execi 3600 weather-query brweather --option=HT1 | sed -e 's/°/C/g'} ${goto 100} ${execi 3600 weather-query brweather --option=Day2 | sed -e 's/á/a/g'}: ${execi 3600 weather-query brweather --option=LT2 | sed -e 's/°/C/g'}/${execi 3600 weather-query brweather --option=HT2 | sed -e 's/°/C/g'} ${goto 200} ${execi 3600 weather-query brweather --option=Day3 | sed -e 's/á/a/g'}: ${execi 3600 weather-query brweather --option=LT3 | sed -e 's/°/C/g'}/${execi 3600 weather-query brweather --option=HT3 | sed -e 's/°/C/g'}
 
-
-${execi 3600 weather-query brweather --option=Day1 | sed -e 's/á/a/g'}: ${execi 3600 weather-query brweather --option=LT1 | sed -e 's/°/C/g'}/${execi 3600 weather-query brweather --option=HT1 | sed -e 's/°/C/g'} ${goto 100} ${execi 3600 weather-query brweather --option=Day2 | sed -e 's/á/a/g'}: ${execi 3600 weather-query brweather --option=LT2 | sed -e 's/°/C/g'}/${execi 3600 weather-query brweather --option=HT2 | sed -e 's/°/C/g'} ${goto 200} ${execi 3600 weather-query brweather --option=Day3 | sed -e 's/á/a/g'}: ${execi 3600 weather-query brweather --option=LT3 | sed -e 's/°/C/g'}/${execi 3600 weather-query brweather --option=HT3 | sed -e 's/°/C/g'}
-
-
-# segunda
 ${voffset -35}${goto 345}${execpi 3600 weather-query brweather --option=LUA2D}
-# terceira
 ${voffset -10}${goto 425}${execpi 3600 weather-query brweather --option=LUA3D}
-# quarta
 ${voffset -10}${goto 505}${execpi 3600 weather-query brweather --option=LUA4D}
-# Segunda
-${voffset 0}${goto 345}${execpi 3600 weather-query brweather --option=LUA2T}
-# terceira
+${voffset   0}${goto 345}${execpi 3600 weather-query brweather --option=LUA2T}
 ${voffset -10}${goto 425}${execpi 3600 weather-query brweather --option=LUA3T}
-# quarta
 ${voffset -10}${goto 505}${execpi 3600 weather-query brweather --option=LUA4T}
-# Imagem das luas
-# Hoje
-${execpi 3600 weather-query brweather --option=LUA1I -s 75x75 -p 405,35}
-# Segunda lua
-${execpi 3600 weather-query brweather --option=LUA2I -s 30x30 -p 350,115}
-# Terceira lua
-${execpi 3600 weather-query brweather --option=LUA3I -s 30x30 -p 420,115}
-# Quarta lua
-${execpi 3600 weather-query brweather --option=LUA4I -s 30x30 -p 500,115}
+${execpi 3600 weather-query brweather --option=LUA1I -s 75x75 -p 405,50}
+${execpi 3600 weather-query brweather --option=LUA2I -s 30x30 -p 350,130}
+${execpi 3600 weather-query brweather --option=LUA3I -s 30x30 -p 420,130}
+${execpi 3600 weather-query brweather --option=LUA4I -s 30x30 -p 500,130}
 
 ${voffset -165}${goto 490}${execpi 3600 weather-query brweather --option=LUA1T}
 
diff --git a/conkyrc.dot.link b/conkyrc.dot.link
index b5c8163..aeff9dc 100644
--- a/conkyrc.dot.link
+++ b/conkyrc.dot.link
@@ -228,9 +228,7 @@ $color$stippled_hr
 
 ${color grey}File systems:
  / $color${fs_free /}/${fs_size /} ${fs_bar 6 /}
-# /home $color${fs_free /home}/${fs_size /home} ${fs_bar 6 /home}
  /var $color${fs_free /var}/${fs_size /var} ${fs_bar 6 /var}
-# /var/vservers $color${fs_free /var/vservers}/${fs_size /var/vservers} ${fs_bar 6 /var/vservers}
  ${execpi 3600 xconky fs_home }
 #${color grey}syslog${hr 2}${color}
 #${execi 30 tail -n3 /var/log/daemon | fold -w50}