File structure changes, clock color updates, minor layout changes, etc.

.lua/scripts/haunted.lua → .conky/scripts/haunted.lua

@@ -1,18 +1,19 @@
 --[[
 Infinity by Harshit (2012)
-Based on: Clock Rings by londonali1010 (2009)
+Based on: Ring Meters by londonali1010 (2009)
 
 This script draws percentage meters as rings, and also draws clock hands if you want! It is fully customisable; all options are described in the script. This script is based off a combination of my clock.lua script and my rings.lua script.
 
 IMPORTANT: if you are using the 'cpu' function, it will cause a segmentation fault if it tries to draw a ring straight away. The if statement on line 145 uses a delay to make sure that this doesn't happen. It calculates the length of the delay by the number of updates since Conky started. Generally, a value of 5s is long enough, so if you update Conky every 1s, use update_num>5 in that if statement (the default). If you only update Conky every 2s, you should change it to update_num>3; conversely if you update Conky every 0.5s, you should use update_num>10. ALSO, if you change your Conky, is it best to use "killall conky; conky" to update it, otherwise the update_num will not be reset and you will get an error.
 
 To call this script in Conky, use the following (assuming that you save this script to ~/scripts/rings.lua):
-	lua_load ~/scripts/haunted.lua
+	lua_load ~/.conky/scripts/haunted.lua
 	lua_draw_hook_pre ring_stats
 	
 Changelog:
-+ v1.0.0 -- Original release (07/06/2012)
++ v1.0.0 -- (Haunted) Original release (07/06/2012)
 + v1.1.0 -- EJW: Updated to fix some errors in Ubuntu 12.10 and on desktops.
++ [All further changes tracked in the git repository.]
 ]]
 
 settings_table = {
@@ -78,37 +79,41 @@ settings_table = {
 		max=100,
 		bg_colour=0xffffff,
 		bg_alpha=0,
-		fg_colour=0xffffff,
+		fg_colour=0x46a646,
 		fg_alpha=0.1,
 		x=165, y=170,
 		radius=70,
 		thickness=5,
 		start_angle=60,
 		end_angle=120
 	},
---[[ EJW: Uncomment if you have a battery.  
+--[[ EJW: Chose one of the following: CPU2 or Battery. --]]
 	{
+		name='cpu',
+		arg='cpu2',
+--[[ Uncomment for battery (comment out CPU2 if used)
 		name='battery_percent',
 		arg='BAT1',
+--]]
 		max=100,
 		bg_colour=0xffffff,
 		bg_alpha=0.1,
-		fg_colour=0xebff46,
+		fg_colour=0x468626,
 		fg_alpha=0.6,
 		x=165, y=170,
 		radius=72,
 		thickness=11,
 		start_angle=122,
 		end_angle=210
 	},
-]]
 	{
-		name='memperc',
+--		name='memperc',
+		name='swap',
 		arg='',
 		max=100,
 		bg_colour=0xffffff,
 		bg_alpha=0.1,
-		fg_colour=0x46a646,
+		fg_colour=0xe83737,
 		fg_alpha=0.8,
 		x=165, y=170,
 		radius=83.5,
@@ -122,7 +127,7 @@ settings_table = {
 		max=31,
 		bg_colour=0xffffff,
 		bg_alpha=0.1,
-		fg_colour=0xebff46,
+		fg_colour=0xFFA300,
 		fg_alpha=0.8,
 		x=165, y=170,
 		radius=70,
@@ -136,7 +141,7 @@ settings_table = {
 		max=12,
 		bg_colour=0xffffff,
 		bg_alpha=0.1,
-		fg_colour=0xf4732d,
+		fg_colour=0x6f6f6f,
 		fg_alpha=0.8,
 		x=165, y=170,
 		radius=76,
@@ -158,29 +163,27 @@ settings_table = {
 		start_angle=-90,
 		end_angle=30
 	},
---[[ EJW: This causes errors in Ubuntu 12.10
 		{
-		name='',
-		arg='',
+		name='fs_used_perc',
+		arg='/',
 		max=100,
 		bg_colour=0xb7b7b7,
 		bg_alpha=0.2,
-		fg_colour=0x2c2c2c,
+		fg_colour=0x4a89a7,
 		fg_alpha=1.0,
 		x=165, y=170,
 		radius=116,
 		thickness=17,
 		start_angle=82,
 		end_angle=180
 	},
-]]
 	{
 		name='fs_used_perc',
 		arg='/home',
 		max=100,
 		bg_colour=0xffffff,
 		bg_alpha=0.5,
-		fg_colour=0xffffff,
+		fg_colour=0x46a646,
 		fg_alpha=0.6,
 		x=165, y=170,
 		radius=95,
@@ -193,18 +196,13 @@ settings_table = {
 
 clock_r=125
 
-
-
 clock_x=165
 clock_y=170
 
-
-
 clock_colour=0xffffff
 clock_alpha=0.5
 
 
-
 --show_seconds=true
 show_seconds=false
 

.conkyrc

@@ -11,12 +11,14 @@
 #	b7b7b7 (light grey)
 #	6f6f6f (medium grey)
 #	2c2c2c (dark grey)
-#	4a89a7 (teal / blue)
-#	e83737 (red)
-#	ebff46 (yellow)
-#	46a646 (green)
-#	f4732d (orange)
-#	FFA300 (bright orange)
+#
+#	4a89a7 (blue)		hardware / memory / root
+#	468626 (blue alt)	
+#	e83737 (red)		swap
+#	46a646 (green)		user / cpu / home
+#	f4732d (orange)		network
+#	ebff46 (yellow)		network
+#	FFA300 (br. orange)	text highlights
 #
 #	Changelog:
 #	 + v1.0.1:	Initial version by Harshit Yadav
@@ -61,7 +63,7 @@ own_window_hints undecorate,sticky,skip_taskbar,skip_pager,below
 # Allow conky to handle transparency (with percentages) with a compositor
 # From http://blog.mmassonnet.info/2011/08/xfce-48-with-conky.html)
 #own_window yes
-#own_window_type desktop
+#window_own_type desktop
 #own_window_hints undecorated,below,sticky,skip_taskbar,skip_pager	# make it behave like it belongs to the desktop
 #own_window_argb_visual yes	# true transparency, a compositor has to be active
 #own_window_argb_value 70	# make the background semi-transparent
@@ -106,7 +108,7 @@ temperature_unit fahrenheit
 
 
 ## Lua: load clock rings.
-lua_load ~/.lua/scripts/haunted.lua
+lua_load ~/.conky/scripts/haunted.lua
 lua_draw_hook_pre clock_rings
 
 
@@ -311,21 +313,21 @@ ${offset 120}${voffset 223}${color 4a89a7}${font Santana:size=8:style=Bold}root$
 ${offset 120}${voffset 12}${color 46a646}${font Santana:size=8:style=Bold}home$color${font Santana:size=8} : ${offset 7}${fs_used /home}/${fs_size /home}$font
 ${offset 120}${voffset 12}${color e83737}${font Santana:size=8:style=Bold}swap$color${font Santana:size=8} : ${offset 10}${swap} / ${swapfree}$font
 # "Home" node (kernel, etc.)
-${offset 578}${voffset -108}$color${font Santana:size=9:style=Bold}Linux ${kernel} kernel
-${offset 580}${voffset 0}${color 4a89a7}${font Santana:size=8}Uptime : ${offset 9}$color${uptime}
+${offset 583}${voffset -108}$color${font Santana:size=9:style=Bold}Linux ${kernel} kernel
+${offset 585}${voffset 0}${color 4a89a7}${font Santana:size=8}Uptime : ${offset 9}$color${uptime}
 # "User" node (whoami, top process, etc.)
-${offset 828}${voffset -78}$color${font Santana:size=9:style=Bold}${exec whoami}@${nodename}
-${offset 830}${voffset 0}$color${font Santana:size=8}${color 46a646}Top (cpu) :  ${offset 9}$color${top name 5} ${top cpu 5}
-${offset 830}${voffset 0}$color${font Santana:size=8}${color 46a646}Top (RAM) : ${offset 9}$color${top_mem name 5} ${top_mem mem 5}
-${offset 830}${voffset 0}${color 6f6f6f}CPU Usage (${cpu}%) :
-${offset 830}${voffset -2}$color${font Santana:size=8}${color 2c2c2c}${cpugraph 32,200 2c2c2c 46a646}
+${offset 833}${voffset -78}$color${font Santana:size=9:style=Bold}${exec whoami}@${nodename}
+${offset 835}${voffset 0}$color${font Santana:size=8}${color 46a646}Top (cpu) :  ${offset 9}$color${top name 5} ${top cpu 5}
+${offset 835}${voffset 0}$color${font Santana:size=8}${color 46a646}Top (RAM) : ${offset 9}$color${top_mem name 5} ${top_mem mem 5}
+${offset 835}${voffset 0}${color 6f6f6f}CPU Usage (${cpu}%) :
+${offset 835}${voffset -2}$color${font Santana:size=8}${color 2c2c2c}${cpugraph 32,200 2c2c2c 46a646}
 # "Network" node (IP, connections, etc.)
-${offset 708}${voffset 88}$color${font Santana:size=9:style=Bold}IP Address : ${addr eth0}
-${offset 710}${voffset 0}$color${font Santana:size=8}TCP Connections : ${tcp_portmon 1 65535 count}
-${offset 710}${voffset 0}${font Santana:size=8}${color f4732d}Down : ${offset 9}$color${downspeed eth0}/s ${offset 8}${color ebff46}Up : ${offset 9}$color${upspeed eth0} /s
-${offset 710}${voffset 0}${color 6f6f6f}${font Santana:size=8}Interface eth0 Usage :
-${offset 710}${voffset -2}$color${font Santana:size=8}${color 2c2c2c}${downspeedgraph eth0 32,200 b7b7b7 f4732d}
-${offset 710}${voffset -5}${color 2c2c2c}${upspeedgraph eth0 32,200 b7b7b7 ebff46}
+${offset 713}${voffset 88}$color${font Santana:size=9:style=Bold}IP Address : ${addr eth0}
+${offset 715}${voffset 0}$color${font Santana:size=8}TCP Connections : ${tcp_portmon 1 65535 count}
+${offset 715}${voffset 0}${font Santana:size=8}${color f4732d}Down : ${offset 9}$color${downspeed eth0}/s ${offset 8}${color ebff46}Up : ${offset 9}$color${upspeed eth0} /s
+${offset 715}${voffset 0}${color 6f6f6f}${font Santana:size=8}Interface eth0 Usage :
+${offset 715}${voffset -2}$color${font Santana:size=8}${color 2c2c2c}${downspeedgraph eth0 32,200 b7b7b7 f4732d}
+${offset 715}${voffset -5}${color 2c2c2c}${upspeedgraph eth0 32,200 b7b7b7 ebff46}
 # Positioning eset for static text examples below
 ${voffset -158}
 # Static text example: Logo

README.md

@@ -3,12 +3,10 @@
 
 ## About
 
-InfinitySVG is a theme for the "conky" system monitor for X. It is mostly based on the Infinity theme by Harshit Yadav.
+InfinitySVG is a theme for the "conky" system monitor for X. It is based on the Infinity theme by Harshit Yadav.
 
 ![InfinitySVG screenshot](https://github.com/circumjacence/ConkyInfinitySVG/raw/master/images/InfinitySVG-screencap-960w.png)
 
-For Harshit Yadav's original theme, please see: [Infinity on Deviantart.com](http://harshit1990.deviantart.com/art/Infinity-306921086)
-
 
 ## Acknowledgements
 
@@ -21,9 +19,9 @@ As best I can tell, the following people had a hand in the creation of this them
 	- [https://github.com/somerandomdude/Iconic](https://github.com/somerandomdude/Iconic)
 - Original Infinity theme by:	Harshit Yadav
 	- [http://harshit1990.deviantart.com/art/Infinity-306921086](http://harshit1990.deviantart.com/art/Infinity-306921086)
-- Includes lua code: Clock Rings by londonali1010 (2009)
+- Includes lua code: Ring Meters by londonali1010 (2009)
 	- [http://londonali1010.deviantart.com/](http://londonali1010.deviantart.com/)
-
+	- [http://londonali1010.deviantart.com/gallery/#/d2ciqev](http://londonali1010.deviantart.com/gallery/#/d2ciqev)
 
 ## Installation Instructions
 
@@ -34,34 +32,23 @@ As best I can tell, the following people had a hand in the creation of this them
 
 2. Extract the InfinitySVG tar file into its own directory somewhere.
 
-3. Copy .conkyrc, .lua, and .conky to your home directory:
-	- cp --archive .conkyrc ~/
-	- cp --archive .conky ~/
-	- cp --archive .lua ~/
+3. Copy .conkyrc, and .conky/ to your home directory:
+	- cp .conkyrc ~/
+	- cp -r .conky ~/
 
 4. Open ~/.conkyrc in your favorite editor and adjust the screen resolution:
 	- minimum_size 1920 1080
 
-5. (optional) This theme uses Compiz for partial transparency of the conky output. If you are **not** using a compositing window-manager such as compiz, you can make the conky window transparent by altering the following settings in ~/.conkyrc (if you are using compiz, skip this step and use step 9 instead).
-
-		# Allow conky to handle transparency
-		own_window_type conky
-		own_window_transparent yes
-		
-		# Allow compiz to handle transparency (you will need to add Conky to compiz)
-		# own_window_type normal
-		# own_window_transparent no
+5. (optional) By default setup assumes we will set up Compiz manually for partial transparency of the conky output (step 9 below). If you are **not** using a compositing window-manager such as compiz, you can make the conky window transparent by altering the "own_window_type" and "own_window_transparent" settings in ~/.conkyrc.  Included in .conkyrc are three examples: manual with Compiz, automatic with a compositor, and automatic using conky directly.  Uncomment as desired if you wish to change this.
 
-6. (optional) Check haunted.lua for any additional adjustments required for your screen resolution.
+6. (optional) Check .conky/scripts/haunted.lua for any additional adjustments required for your screen resolution.
 
 7. Now you are ready to run conky.  Open a terminal and run the following:
-
 		chmod a+x ~/.conky/startconky.sh
 		sh ~/.conky/startconky.sh
 		(Conky will start after 5 seconds.)
 
 8. Add ~/.conky/startconky.sh as a startup application.
-
 	- Ubuntu: Dash > (search) Startup Applications > Add
 	- Other: see your location documentation to add this as a startup application.
 
@@ -80,19 +67,17 @@ As best I can tell, the following people had a hand in the creation of this them
 11. Extras - Included in extras/terminator/config is a config file for the "Terminator" terminal program.  This sets up Terminator with a color scheme that matches this Conky theme.  To install it, back up your existing terminator configuration (~/.config/terminator/config) and copy in the one from extras/terminator/config.  ** If you have your own terminator config, you may wish to manually merge the title colors and profile colors from the supplied file into your own configuration.
 
 12. Other notes:
-	- The following scripts were written separately and currently are not used. You can delete them if you wish:
-
-		- cpu
-		- mail
-		- mem
-		- rings
-		- weather
+	- The following scripts were written separately and currently are not used, but are included for example.
+		- .conky/examples/cpu
+		- .conky/examples/mail
+		- .conky/examples/mem
+		- .conky/examples/rings
+		- .conky/examples/weather
+		- .conky/examples/rings
 		
 	- For testing:  if you are testing changes to your background or the configuration files, you can skip using startconky.sh, and simply run conky directly.  In the distribution .conkyrc it is set to run in the background (via: background yes).  This means you'll need to run "killall conky;conky" to restart it.
 	- A few random items in .conkyrc you might want to look at:
-
 		- update_interval 5.0 (update interval in seconds)
 		- default_color b7b7b7 (color of most of the text and graph outlines)
 		- At the very bottom are a few examples of static text (a logo and multi-line text) that can be uncommented
-