Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-27 20:44:56 +00:00
Code Issues Releases Activity
3,036 Commits 5 Branches 46 Tags 22 MiB
9f6d727831
Commit Graph

79 Commits

Author SHA1 Message Date
Łukasz Stelmach
00481ee9a9 Read configuration from ~/.config/conky/conky.conf 
Try to load configuration from ~/.config/conky/conky.conf before
falling back to ~/.conkyrc and /etc/conky/conky.conf.
 2014-11-17 22:06:27 +01:00
Brenden Matthews
ddef05d4eb Update version, copyright. 2012-05-03 16:34:44 -07:00
Pavel Labath
75e147fa25 Remove timed_thread code as it is no longer used. 2011-03-26 21:04:07 +01:00
Brenden Matthews
cf9e498b24 Update copyright notices. 2010-01-01 15:46:17 -08:00
Brenden Matthews
3efe71520f Deprecate autotools, update docs to reflect cmake build system. 2010-01-01 14:08:57 -08:00
Brenden Matthews
8bd41caa51 Add creation functions for certain cairo structures. 2009-11-25 12:53:42 -08:00
Brenden Matthews
bb89efee5b Doc cleanup. 2009-08-01 13:15:53 -06:00
Brenden Matthews
be145bd55d Removed alias config option due to brokenness. 
The alias option was broken by fb8ccd7a05,
and it seems like trying to make it work again will only result in
breakage for env var substitution anyway.
 2009-07-31 00:33:06 -06:00
Brenden Matthews
ec517ecb26 Remove deprecated stuff from docs and conky.c (for 1.7.3). 2009-07-28 12:43:45 -06:00
Brenden Matthews
198d7e73b2 Update the doc date when check_docs.py is ran. 2009-07-20 17:32:56 -06:00
Brenden Matthews
c05c157ead Overhauled RSS and weather, added $curl. 
I've taken the curl stuff out of weather and RSS and moved it into it's
own entity.  It should be easier to create curl-based objects if needed
now.
 2009-07-19 23:43:36 -06:00
Brenden Matthews
670e9a0eb1 Multiline alignment support, some other misc stuff. 
Added support for X alignment across multi-lined objects (i.e., using
$alignr with $exec).  This may be a bit buggy.  Disabled OpenMP code
until GCC's implementation stabilizes (it's causing too many problems).
A couple Lua API changes.
 2009-07-18 13:46:36 -06:00
Brenden Matthews
69e27d28b3 Fix man page name. 2009-07-12 12:32:31 -06:00
Nikolas Garofil
9e6fb9c2fe Fix building without math but with X11 2009-07-12 00:51:17 +02:00
Nikolas Garofil
b5ad154f1d spelling: stable instead of stabe 2009-07-10 19:33:26 +02:00
Brenden Matthews
2fa5f97edb A whole bunch of changes, mostly Lua related. 
Improved Lua API (lua_read_parse has been removed in favour of the
conky_parse() Lua API call).  The docs have been improved to reflect the
recent Lua API stuff as well.  Introduced new Lua Cairo and Imlib2
bindings, which require the tolua++ tool.  Fixed some other
miscellaneous doc related things.
 2009-07-09 22:47:41 -06:00
Nikolas Garofil
59f678ecb6 added some extra info about the needed libs for compiling to docs.xml and added the url of the wiki to docs.xml 2009-07-07 15:02:29 +02:00
Brenden Matthews
34db4eb49b Add note about -a opts, bump doc date. 2009-06-06 18:12:25 -06:00
Brenden Matthews
f295e2dc9f Doc correction. 2009-06-06 18:03:22 -06:00
Brenden Matthews
0e21a804ee Couple minor lua changes. 2009-05-16 14:55:05 -06:00
Phil Sutter
a07a082d76 add documentation about --print-config 2009-05-12 01:58:41 +02:00
Phil Sutter
16d551b208 add system-wide config to FILES section 2009-05-12 01:31:47 +02:00
Brenden Matthews
cd2fc39cad Bump docs. 2009-05-01 16:53:57 -06:00
Brenden Matthews
f05829ad9a Update copyright stuff, fix conky.conf weirdness. 2009-03-29 22:55:51 -06:00
Brenden Matthews
21e9964c5a Update docs for $if_running. 2009-03-15 22:14:07 -06:00
Brenden Matthews
9684e6b36f Removing svn ebuild, changing svn references to git. 2008-12-08 23:12:58 -07:00
Brenden Matthews
2135d7ca4b Regenerating docs. 2008-12-07 01:28:36 -07:00
Brenden Matthews
4be537a020 * Added $if_mpd_playing patch (thanks tarpman) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1267 7f574dfc-610e-0410-a909-a81674777703
 2008-10-08 11:44:27 +00:00
Brenden Matthews
7ea81e1913 add $mixer docs 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1262 7f574dfc-610e-0410-a909-a81674777703
 2008-09-29 01:37:33 +00:00
Brenden Matthews
f968843514 remove extra quote that snuck in to the changelog 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1248 7f574dfc-610e-0410-a909-a81674777703
 2008-09-11 15:56:48 +00:00
Brenden Matthews
4644bc3e23 * Conky 1.6.1 released 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1237 7f574dfc-610e-0410-a909-a81674777703
 2008-08-14 17:16:31 +00:00
Kevin Lyles
c72a564cea Removed all trailing whitespace 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1156 7f574dfc-610e-0410-a909-a81674777703
 2008-06-15 18:38:33 +00:00
Brenden Matthews
a7da3b17bc docs; small code simplification 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1119 7f574dfc-610e-0410-a909-a81674777703
 2008-05-06 22:41:28 +00:00
Brenden Matthews
011f03b50d docs 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1097 7f574dfc-610e-0410-a909-a81674777703
 2008-04-01 21:37:49 +00:00
Brenden Matthews
e6ad00d26c Conky 1.5.1 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1092 7f574dfc-610e-0410-a909-a81674777703
 2008-04-01 04:11:14 +00:00
Brenden Matthews
be2cd44e6d doc cleanup 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1090 7f574dfc-610e-0410-a909-a81674777703
 2008-03-31 04:56:39 +00:00
Brenden Matthews
a1452f5db4 * Applied 12 patches: 
1) sysfs battery support (for Linux >=2.6.24) (thanks Kapil)
        2) Improved audacious support patch (thanks Miroslav)
        3) tp_smapi support patch for IBM laptops (thanks Phil)
        4) user info patch (thanks Roland)
        5) added conky build info patch (thanks Roland)
        6) added if_up patch (thanks Phil)
        7) added reload on SIGHUP patch (thanks Jonas)
        8) added pad percentages patch (thanks Jonas)
        9) added fs_type patch (thanks Ryan)
        10) added xmms2 fixes patch (thanks Lassi)
        11) fix sysfs crash patch (thanks Phil)
        12) multiple ip patch ($addrs)
    * Added more alignment support (top_middle, bottom_middle, middle_left,
    and middle_right).


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1010 7f574dfc-610e-0410-a909-a81674777703
 2008-03-18 00:23:16 +00:00
Kevin Lyles
3d26a4880e Reformatted all code 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1007 7f574dfc-610e-0410-a909-a81674777703
 2008-02-20 20:30:45 +00:00
Philip Kovacs
238fa198f0 clean up audacious legacy code; adjust ebuilds 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@989 7f574dfc-610e-0410-a909-a81674777703
 2007-11-17 04:13:20 +00:00
Philip Kovacs
dd572d3d24 Fix compilation error with --disable-x11 (bug #1830373). 
Bump doc stylesheet from 4.3 to 4.4.



git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@987 7f574dfc-610e-0410-a909-a81674777703
 2007-11-14 21:41:08 +00:00
Philip Kovacs
c69e618c55 fix man page error sf #1813483 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@972 7f574dfc-610e-0410-a909-a81674777703
 2007-10-17 20:18:29 +00:00
Toni Spets
ff3d0b015e Updated docs to include RSS and wireless. README has not been built. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@899 7f574dfc-610e-0410-a909-a81674777703
 2007-08-07 22:42:30 +00:00
Philip Kovacs
1c35f432e5 Conky 1.5.0 -- client/server prototype 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@818 7f574dfc-610e-0410-a909-a81674777703
 2006-12-23 06:01:16 +00:00
Philip Kovacs
15fd6d6586 removed all mldonkey and seti code -- totally broken 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@727 7f574dfc-610e-0410-a909-a81674777703
 2006-11-05 00:23:18 +00:00
Philip Kovacs
8927efc62e remove infopipe support 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@719 7f574dfc-610e-0410-a909-a81674777703
 2006-11-04 00:25:55 +00:00
Philip Kovacs
87953b122b removal of xmms/bmp / addition of audacious/infopipe 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@713 7f574dfc-610e-0410-a909-a81674777703
 2006-11-03 20:54:52 +00:00
Brenden Matthews
98f3aa9208 iconv support 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@631 7f574dfc-610e-0410-a909-a81674777703
 2006-05-13 19:51:26 +00:00
Brenden Matthews
adbacc9f25 Changed $font behavior so that the font persists past the next newline. It can be set back to the default with $font with no args. (closes bug 1478676 on sf.net) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@628 7f574dfc-610e-0410-a909-a81674777703
 2006-05-09 23:08:23 +00:00
Brenden Matthews
c9502198c9 powerbook battery patch 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@622 7f574dfc-610e-0410-a909-a81674777703
 2006-04-23 21:35:31 +00:00
Brenden Matthews
090f757823 - added patch from peter tarjan for ibm acpi\ 
- updated xft docs

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@620 7f574dfc-610e-0410-a909-a81674777703
 2006-04-15 18:00:39 +00:00