Convert config to new format

2 files changed, 280 insertions, 272 deletions

diff --git a/conky.dot.link/weather/conkyrc b/conky.dot.link/weather/conkyrc
index c0302d3..d0e3869 100644
--- a/conky.dot.link/weather/conkyrc
+++ b/conky.dot.link/weather/conkyrc
@@ -1,94 +1,97 @@
-#
-# conky configuration for weather information
-#
+conky.config = {
 
-# set to yes if you want conky to be forked in the background
-background yes
+-- conky configuration for weather information
 
-# 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 yes
+-- set to yes if you want conky to be forked in the background
+	background = true,
 
-# Xft font when Xft is enabled
-#xftfont courier-12
-xftfont Terminus:size=8
+-- 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-*-*-*-*-*-*-*
 
-# Text alpha when using Xft
-#xftalpha 0.8
+-- Use Xft?
+	use_xft = true,
 
-# mail spool
-#mail_spool $MAIL
+-- Xft font when Xft is enabled
+--xftfont courier-12
+	font = 'Terminus:size=8',
 
-# Update interval in seconds
-update_interval 5.0
+-- Text alpha when using Xft
+--xftalpha 0.8
 
-# 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
+-- mail spool
+--mail_spool $MAIL
 
-# Use double buffering (reduces flicker, may not work for everyone)
-double_buffer yes
+-- Update interval in seconds
+	update_interval = 5.0,
 
-# Minimum size of text area
-#minimum_size 280 5
+-- Create own window instead of using desktop (required in nautilus)
+	own_window = true,
+	own_window_type = 'override',
+	own_window_transparent = true,
+	own_window_hints = 'undecorate,sticky,skip_taskbar,skip_pager,below',
 
-# Draw shades?
-#draw_shades yes
+-- Use double buffering (reduces flicker, may not work for everyone)
+	double_buffer = true,
 
-# Draw outlines?
-#draw_outline no
+-- Minimum size of text area
+--minimum_size 280 5
 
-# Draw borders around text
-#draw_borders yes
+-- Draw shades?
+--draw_shades yes
 
-# Stippled borders?
-#stippled_borders 8
+-- Draw outlines?
+--draw_outline no
 
-# border margins
-#border_margin 4
+-- Draw borders around text
+--draw_borders yes
 
-# border width
-#border_width 1
+-- Stippled borders?
+--stippled_borders 8
 
-# Default colors and also border colors
-#default_color white
-#default_shade_color black
-#default_outline_color black
+-- border margins
+--border_margin 4
 
-# Text alignment, other possible values are commented
-alignment top_left
-#alignment top_right
-#alignment bottom_left
-#alignment bottom_right
+-- border width
+--border_width 1
 
-# Gap between borders of screen and text
-#gap_x 30
-#gap_y 25
-gap_x 20
-gap_y 30
+-- Default colors and also border colors
+--default_color white
+--default_shade_color black
+--default_outline_color black
 
-# Subtract file system buffers from used memory?
-no_buffers yes
+-- Text alignment, other possible values are commented
+	alignment = 'top_left',
+--alignment top_right
+--alignment bottom_left
+--alignment bottom_right
 
-# set to yes if you want all text to be in uppercase
-uppercase no
+-- Gap between borders of screen and text
+--gap_x 30
+--gap_y 25
+	gap_x = 20,
+	gap_y = 30,
 
-# increase buffer size
-text_buffer_size 400
+-- Subtract file system buffers from used memory?
+	no_buffers = true,
 
-# stuff after 'TEXT' will be formatted on screen
+-- set to yes if you want all text to be in uppercase
+	uppercase = false,
 
-TEXT
+-- increase buffer size
+	text_buffer_size = 400,
+
+-- stuff after 'TEXT' will be formatted on screen
+
+};
+
+conky.text = [[
 Weather
 $stippled_hr
 ${execi 3600 weather-query weather}
@@ -124,3 +127,4 @@ ${voffset -165}${goto 490}${execpi 3600 weather-query brweather --option=LUA1T}
 
 
 
+]];
diff --git a/conkyrc.dot.link b/conkyrc.dot.link
index b4772f5..665123a 100644
--- a/conkyrc.dot.link
+++ b/conkyrc.dot.link
@@ -1,208 +1,211 @@
-#
-# 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 yes
-
-# Xft font when Xft is enabled
-#xftfont courier-12
-xftfont Terminus:size=8
-
-# 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
-
-# Size of buffer used for intermediary text: individual lines, $exec vars etc
-#text_buffer_size 512
-
-# 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
+conky.config = {
+
+-- 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 = true,
+
+-- 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 = true,
+
+-- Xft font when Xft is enabled
+--xftfont courier-12
+	font = 'Terminus:size=8',
+
+-- 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 = false,
+
+-- Use double buffering (reduces flicker, may not work for everyone)
+	double_buffer = true,
+
+-- 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 = true,
+
+-- set to yes if you want all text to be in uppercase
+	uppercase = false,
+
+-- Size of buffer used for intermediary text: individual lines, $exec vars etc
+--text_buffer_size 512
+
+-- 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}
+
+};
+
+conky.text = [[
 $nodename - $sysname on $machine
 $stippled_hr
 ${execpi 3600 xconky battery }
@@ -248,3 +251,4 @@ ${color} ${top_mem name 2} ${alignr} ${top_mem pid 2} ${top_mem cpu 2} ${top_mem
  ${top_mem name 4} ${alignr} ${top_mem pid 4} ${top_mem cpu 4} ${top_mem mem 4}
 
 #${exec ~/apps/scripts/reminders }
+]];