From 19c56556fe46d3d8b7215805069a676f2c04709c Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Fri, 27 Dec 2013 15:21:41 -0200 Subject: Removing conky to convert it to a submodule --- modules/conky/apps/brweather.link | 1 - modules/conky/brweather.conf.dot.sample | 70 -------- modules/conky/conky.dot.link/weather/conkyrc | 139 --------------- modules/conky/conkyrc.dot.link | 245 --------------------------- modules/conky/weather.dot/weatherrc.sample | 2 - 5 files changed, 457 deletions(-) delete mode 160000 modules/conky/apps/brweather.link delete mode 100644 modules/conky/brweather.conf.dot.sample delete mode 100644 modules/conky/conky.dot.link/weather/conkyrc delete mode 100644 modules/conky/conkyrc.dot.link delete mode 100644 modules/conky/weather.dot/weatherrc.sample diff --git a/modules/conky/apps/brweather.link b/modules/conky/apps/brweather.link deleted file mode 160000 index 2bb08fc..0000000 --- a/modules/conky/apps/brweather.link +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2bb08fc423620145e1c12991ecfaab9e217ebe82 diff --git a/modules/conky/brweather.conf.dot.sample b/modules/conky/brweather.conf.dot.sample deleted file mode 100644 index f199345..0000000 --- a/modules/conky/brweather.conf.dot.sample +++ /dev/null @@ -1,70 +0,0 @@ -# Arquivo de configuração do BrWeather -# Autor: LeandroNKZ -# Acesse o site para maiores instruções: -# http://brweatherproject.blogspot.com/ - -# Pasta base -DIRNAME="$HOME/apps/brweather/brweather" - -# Agora você pode escolher quais serviços de meteorologia utilizar no BrWeather: O nacional INPE ou o internacional Open Weather. -# Recomenda-se que utilize os serviços do Open Weather, apenas se o serviço nacional não funcionar. Como no caso de você residir no exterior, -# ou, no caso de o INPE não fornecer os dados completos para a usa cidade (como as condições atuais). -# Nota: Por questões de compatibilidade e confiabilidade de informações, só é possível utilizar um tipo de serviço ao mesmo tempo. - -# No campo abaixo você ativa/desativa o modo Open Weather. -# Escolha: -# "0" = ATIVAR o serviço Nacinal INPE. -# "1" = DESATIVAR o INPE e utilizar APENAS o serviço internacional Open Weather. -OPEN="0" - -# Escolha o tempo de espera (em segundos) para a conexão. -# Isso é útil para diminuir o tempo de resposta do programa. -# Para conexões rápidas (banda larga), é recomendável deixar entre 5~10. -# Já para conexões lentas, deixe entre 15~20 segundos. -TIME="10" - -# Especifique o intervalo de funcionamento (em segundos) do programa. -# O BrWeather só atualizará as previsões quando este invervalo for alcançado. -# Como os sites que o BrWeather busca os dados costumam atualizar as previsões -# a cada hora, um tempo entre 1800 (30min) e 3600 (1H) já está de bom tamanho. -# Um invervalo menor do que 30min não é recomendado, uma vez que o BrWeather baixaria apenas -# as mesmas previsões. -TIMER="3600" - -# Especifique a codificação de caracteres. -# Na dúvida, deixe o padrão (UTF-8). -# Altere apenas se ocorrer problemas com os acentos das palavras. -CODIGO="UTF-8" - -### Serviço Nacional ### -# Para exibir informações mais precisas e, contar com várias opções, -# o BrWeather utiliza o serviço de meteorologia do CPTEC/INPE (Instituto Nacional de Pesquisas Espaciais). -# Nota: Preencha o campo abaixo, apenas se estiver utilizando o serviço nacional. -# Se estiver utilizando apenas o Open Weather pule para o campo "Serviço Internacional". - -# CPTEC/INPE -# Acesse o site: -# http://www.cptec.inpe.br/cidades/ -# Digite apenas as primeiras letras de sua cidade e clique em "OK". -# Ex.: guaru , são, rio, maca, floria, etc.. -# Nota: Deve-se colocar apenas as primeiras letras do nome da sua cidade. -# Do contrário, se você colocar o nome inteiro, a tela exibirá diretamente as previsões, -# porém, sem o código numérico (necessário para o funcionamento do programa). -# Ao clicar em ok, aparecerá uma lista de cidades que começa com as letras especificadas. -# Selecione e clique em sua cidade. -# Na barra de URL, constará um código numérico. -# Ex.: http://www.cptec.inpe.br/cidades/tempo/4901 -# Anote o número e coloque no campo abaixo, no lugar de "2247". -CPTEC_INPE="244" - -### Observação importante: ### -# Se a sua cidade constar no site do INPE, mas não possuir a previsão completa (com dados como condições atuais, temperatura atual, nível de umidade atual, etc), você deve utilizar o BrWeather no modo Open. - -### Serviço Internacional ### -# Importante: Não é necessário preencher estes campos se você utiliza somente o serviço nacional. -# Acesse o site: http://openweathermap.org -# Procure pela sua cidade no mapa, e clique no ícone de previsão da mesma -# Assim que abrir a página com a previsão completa, veja que na barra de URL constará um código númérico. -# Ex.: http://openweathermap.org/city/3461786 -# Anote o número e adicione no campo abaixo, no lugar de "3461786". -OPEN_ID="3448439" diff --git a/modules/conky/conky.dot.link/weather/conkyrc b/modules/conky/conky.dot.link/weather/conkyrc deleted file mode 100644 index a31d43d..0000000 --- a/modules/conky/conky.dot.link/weather/conkyrc +++ /dev/null @@ -1,139 +0,0 @@ -# -# conky configuration for weather information -# - -# set to yes if you want conky to be forked in the background -background yes - -# X font when Xft is disabled, you can pick one with program xfontsel -#font 5x7 -#font 6x10 -#font 7x13 -#font 8x13 -#font 9x15 -#font *mintsmild.se* -#font -*-*-*-*-*-*-34-*-*-*-*-*-*-* - -# Use Xft? -#use_xft no - -# Xft font when Xft is enabled -xftfont courier-12 - -# Text alpha when using Xft -#xftalpha 0.8 - -# mail spool -#mail_spool $MAIL - -# Update interval in seconds -update_interval 5.0 - -# Create own window instead of using desktop (required in nautilus) -own_window yes -own_window_type override -own_window_transparent yes -own_window_hints undecorate,sticky,skip_taskbar,skip_pager,below - -# Use double buffering (reduces flicker, may not work for everyone) -double_buffer yes - -# Minimum size of text area -#minimum_size 280 5 - -# Draw shades? -#draw_shades yes - -# Draw outlines? -#draw_outline no - -# Draw borders around text -#draw_borders yes - -# Stippled borders? -#stippled_borders 8 - -# border margins -#border_margin 4 - -# border width -#border_width 1 - -# Default colors and also border colors -#default_color white -#default_shade_color black -#default_outline_color black - -# Text alignment, other possible values are commented -alignment top_left -#alignment top_right -#alignment bottom_left -#alignment bottom_right - -# Gap between borders of screen and text -#gap_x 30 -#gap_y 25 -gap_x 20 -gap_y 30 - -# Subtract file system buffers from used memory? -no_buffers yes - -# set to yes if you want all text to be in uppercase -uppercase no - -# increase buffer size -text_buffer_size 400 - -# stuff after 'TEXT' will be formatted on screen - -TEXT -Weather -$stippled_hr -${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} - - - -${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 -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} - -${voffset -165}${goto 490}${execpi 3600 weather-query brweather --option=LUA1T} - - - - - - - - - - - diff --git a/modules/conky/conkyrc.dot.link b/modules/conky/conkyrc.dot.link deleted file mode 100644 index 756bdc4..0000000 --- a/modules/conky/conkyrc.dot.link +++ /dev/null @@ -1,245 +0,0 @@ -# -# conky configuration -# -# Resources: -# http://dancingpenguinsoflight.com/2009/01/gorgeous-and-useful-information-configuring-conky/ -# http://cristalinux.blogspot.com.br/2011/03/some-conky-favorites-of-mine_04.html -# http://desktopspotting.com/26/best-conky-configs-for-linux-desktop/ -# http://www.linuxandlife.com/2011/09/beautiful-conky-linux.html - -# set to yes if you want conky to be forked in the background -background yes - -# X font when Xft is disabled, you can pick one with program xfontsel -#font 5x7 -#font 6x10 -#font 7x13 -#font 8x13 -#font 9x15 -#font *mintsmild.se* -#font -*-*-*-*-*-*-34-*-*-*-*-*-*-* - -# Use Xft? -#use_xft no - -# Xft font when Xft is enabled -xftfont courier-12 - -# Text alpha when using Xft -#xftalpha 0.8 - -# mail spool -#mail_spool $MAIL - -# Update interval in seconds -update_interval 5.0 - -# Create own window instead of using desktop (required in nautilus) -own_window no - -# Use double buffering (reduces flicker, may not work for everyone) -double_buffer yes - -# Minimum size of text area -#minimum_size 280 5 - -# Draw shades? -#draw_shades yes - -# Draw outlines? -#draw_outline no - -# Draw borders around text -#draw_borders yes - -# Stippled borders? -#stippled_borders 8 - -# border margins -#border_margin 4 - -# border width -#border_width 1 - -# Default colors and also border colors -#default_color white -#default_shade_color black -#default_outline_color black - -# Text alignment, other possible values are commented -#alignment top_left -alignment top_right -#alignment bottom_left -#alignment bottom_right - -# Gap between borders of screen and text -#gap_x 30 -#gap_y 25 -gap_x 20 -gap_y 30 - -# Subtract file system buffers from used memory? -no_buffers yes - -# set to yes if you want all text to be in uppercase -uppercase no - -# boinc (seti) dir -#seti_dir /usr/local/seti - -# Possible variables to be used: -# -# Variable Arguments Description -# acpiacadapter ACPI ac adapter state. -# acpifan ACPI fan state -# acpitemp ACPI temperature. -# adt746xcpu CPU temperature from therm_adt746x -# adt746xfan Fan speed from therm_adt746x -# battery (num) Remaining capasity in ACPI or APM -# battery. ACPI battery number can be -# given as argument (default is BAT0). -# buffers Amount of memory buffered -# cached Amount of memory cached -# color (color) Change drawing color to color -# cpu CPU usage in percents -# cpubar (height) Bar that shows CPU usage, height is -# bar's height in pixels -# downspeed net Download speed in kilobytes -# downspeedf net Download speed in kilobytes with one -# decimal -# exec shell command Executes a shell command and displays -# the output in torsmo. warning: this -# takes a lot more resources than other -# variables. I'd recommend coding wanted -# behaviour in C and posting a patch :-). -# execi interval, shell Same as exec but with specific interval. -# command Interval can't be less than -# update_interval in configuration. -# fs_bar (height), (fs) Bar that shows how much space is used on -# a file system. height is the height in -# pixels. fs is any file on that file -# system. -# fs_free (fs) Free space on a file system available -# for users. -# fs_free_perc (fs) Free percentage of space on a file -# system available for users. -# fs_size (fs) File system size -# fs_used (fs) File system used space -# hr (height) Horizontal line, height is the height in -# pixels -# i2c (dev), type, n I2C sensor from sysfs (Linux 2.6). dev -# may be omitted if you have only one I2C -# device. type is either in (or vol) -# meaning voltage, fan meaning fan or temp -# meaning temperature. n is number of the -# sensor. See /sys/bus/i2c/devices/ on -# your local computer. -# kernel Kernel version -# loadavg (1), (2), (3) System load average, 1 is for past 1 -# minute, 2 for past 5 minutes and 3 for -# past 15 minutes. -# machine Machine, i686 for example -# mails Mail count in mail spool. You can use -# program like fetchmail to get mails from -# some server using your favourite -# protocol. See also new_mails. -# mem Amount of memory in use -# membar (height) Bar that shows amount of memory in use -# memmax Total amount of memory -# memperc Percentage of memory in use -# new_mails Unread mail count in mail spool. -# nodename Hostname -# outlinecolor (color) Change outline color -# pre_exec shell command Executes a shell command one time before -# torsmo displays anything and puts output -# as text. -# processes Total processes (sleeping and running) -# running_processes Running processes (not sleeping), -# requires Linux 2.6 -# shadecolor (color) Change shading color -# stippled_hr (space), Stippled (dashed) horizontal line -# (height) -# swapbar (height) Bar that shows amount of swap in use -# swap Amount of swap in use -# swapmax Total amount of swap -# swapperc Percentage of swap in use -# sysname System name, Linux for example -# time (format) Local time, see man strftime to get more -# information about format -# totaldown net Total download, overflows at 4 GB on -# Linux with 32-bit arch and there doesn't -# seem to be a way to know how many times -# it has already done that before torsmo -# has started. -# totalup net Total upload, this one too, may overflow -# updates Number of updates (for debugging) -# upspeed net Upload speed in kilobytes -# upspeedf net Upload speed in kilobytes with one -# decimal -# uptime Uptime -# uptime_short Uptime in a shorter format -# -# seti_prog Seti@home current progress -# seti_progbar (height) Seti@home current progress bar -# seti_credit Seti@hoome total user credit - -#seti_progbar - -# variable is given either in format $variable or in ${variable}. Latter -# allows characters right after the variable and must be used in network -# stuff because of an argument - -# stuff after 'TEXT' will be formatted on screen - -#${color grey}Mails: ${color}$mails${color grey} New: ${color}$new_mails${color grey} -#${color grey}Temperatures: -# CPU:$color ${i2c temp 1}°C${color grey} - MB:$color ${i2c temp 2}°C - -# feed parser -# $color${execi 900 ~/.conky/scripts/feed_parser/feed_parser.sh} - -TEXT -$nodename - $sysname on $machine -$stippled_hr -${execpi 3600 xconky battery } -${color grey}Uptime$color $uptime -${color grey}Swap Usage:$color $swap/$swapmax - $swapperc% ${swapbar 6} -${color grey}RAM Usage:$color $mem/$memmax - $memperc% ${membar 6} -${color grey}${memgraph 000000 7f8ed3 -t} -${color grey}CPU Usage:$color $cpu% ${cpubar 6} -${color grey}CPU Frequency:$color $freq Hz -${color grey}${cpugraph 000000 7f8ed3 -t} -${color grey}Load average:$color $loadavg -${color grey}${loadgraph 000000 7f8ed3} -${color grey}Disk I/O:$color $diskio -${color grey}${diskiograph 000000 7f8ed3} -$color$stippled_hr -${color grey}Networking: -${if_up eth0}${color grey} eth0: Up:$color ${upspeed eth0} k/s${color grey} - Down:$color ${downspeed eth0} k/s -${color grey}${downspeedgraph eth0 32,150 000000 7f8ed3 -l} $alignr${color grey}${upspeedgraph eth0 32,150 000000 7f8ed3 -l}${endif} -${if_up wlan0}${color grey} wlan0: Up:$color ${upspeed wlan0} k/s${color grey} - Down:$color ${downspeed wlan0} k/s -${color grey}${downspeedgraph wlan0 32,150 000000 7f8ed3 -l} $alignr${color grey}${upspeedgraph wlan0 32,150 000000 7f8ed3 -l}${endif} -${if_up ppp0}${color grey} ppp0: Up:$color ${upspeed ppp0} k/s${color grey} - Down:$color ${downspeed ppp0} k/s -${color grey}${downspeedgraph ppp0 32,150 000000 7f8ed3 -l} $alignr${color grey}${upspeedgraph ppp0 32,150 000000 7f8ed3 -l}${endif} -$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} -#${color grey}Fortune${hr 2}${color} -#${execi 240 fortune -s | fold -w50} -$color$stippled_hr - -${color grey}Processes:$color $processes ${color grey}Running:$color $running_processes -${color grey}Processes by mem usage${hr 2}${color} -${color} Name ${alignr} PID CPU% MEM% -${color} ${top_mem name 1} ${alignr} ${top_mem pid 1} ${top_mem cpu 1} ${top_mem mem 1} -${color} ${top_mem name 2} ${alignr} ${top_mem pid 2} ${top_mem cpu 2} ${top_mem mem 2} - ${top_mem name 3} ${alignr} ${top_mem pid 3} ${top_mem cpu 3} ${top_mem mem 3} - ${top_mem name 4} ${alignr} ${top_mem pid 4} ${top_mem cpu 4} ${top_mem mem 4} - diff --git a/modules/conky/weather.dot/weatherrc.sample b/modules/conky/weather.dot/weatherrc.sample deleted file mode 100644 index f62cc84..0000000 --- a/modules/conky/weather.dot/weatherrc.sample +++ /dev/null @@ -1,2 +0,0 @@ -[default] -defargs = sbsp -- cgit v1.2.3