1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-15 17:47:09 +00:00
Commit Graph

30 Commits

Author SHA1 Message Date
Brenden Matthews
ddef05d4eb Update version, copyright. 2012-05-03 16:34:44 -07:00
Pavel Labath
5c49c52a0b make convert.lua "bimodal"
it does The Right Thing(tm) both when called from conky and as standalone
2010-11-21 22:26:35 +01:00
Nikolas Garofil
5d28bed7db Support for old config syntax (Optional) 2010-11-19 14:27:18 +01:00
Nikolas Garofil
8bdaeaa09a Undo commit 8ea7b1
data/CMakeLists.txt makes sure that data/conky_no_x11.conf is only used for
builds without BUILD_X11 . out_to_x is not known in that case resulting in a
warning, out_to_console is already default here.
2010-11-18 16:31:32 +01:00
Pavel Labath
8ea7b11ebd Add out_to_x false to conky_no_x11.conf
this way, it will print to console even if conky was configured with X support
2010-11-18 16:08:24 +01:00
Nikolas Garofil
6ee9cbbce6 new config syntax for conky_no_x11.conf 2010-11-18 10:17:36 +01:00
Pavel Labath
8cb63b0c8b Update the default config file to match new syntax 2010-09-12 15:31:18 +02:00
Nikolas Garofil
e840dcdd5b When building without x11, also disable xdamage, own_window, xdbe, xft, imlib2, argb and remove x11-related options from the builtin config 2010-01-17 16:15:59 +01:00
Nikolas Garofil
287c38a0b9 Added support for builtin config in cmake 2010-01-17 03:00:51 +01:00
Brenden Matthews
b8a678728c Remove automake build system, fix defconfig.h. 2010-01-04 18:07:49 -08:00
Brenden Matthews
cf9e498b24 Update copyright notices. 2010-01-01 15:46:17 -08:00
Nikolas Garofil
ed21808597 Fix default config when built without x11 2009-11-16 21:42:55 +01:00
Cesare Tirabassi
81c691d15a add emacs indentation variables to source files in line with current vim settings 2009-07-28 23:44:22 +02:00
Brenden Matthews
04ee7dc2fc Add/fix vim modelines for automake stuff. 2009-07-27 14:49:19 -06:00
Brenden Matthews
f169e0e071 Actually apply c1cf1232e0. 2009-07-20 12:40:32 -06:00
Pavel Labath
7cbc8dc13f Include conky_no_x11.conf in the tarballs
otherwise, building with --enable-config-output --disable-x11 fails.
2009-06-10 17:57:41 +02:00
Nikolas Garofil
1a9d0bdccd Let fs_bar and fs_bar_free work in shell 2009-06-01 16:09:34 +02:00
Nikolas Garofil
faa9086168 Let cpubar work in shell 2009-06-01 15:07:24 +02:00
Nikolas Garofil
0b8b6ccbae Let swapbar work in shell 2009-06-01 13:48:04 +02:00
Nikolas Garofil
bfc791f08b Let membar work in shell 2009-06-01 12:19:25 +02:00
Nikolas Garofil
3762c5cb10 Use a builtin config without X11-support when compiled without it
also, make sure X isn't initialised when compiled without x11-support
2009-05-16 15:57:01 +02:00
Nikos Ntarmos
45ee67ae7e fs_free -> fs_used in conky.conf for consistency (feature request #2633000)
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-04-01 16:55:29 -06:00
Brenden Matthews
f05829ad9a Update copyright stuff, fix conky.conf weirdness. 2009-03-29 22:55:51 -06:00
Nikolas Garofil
1f51863616 fix use_spacer in default config (sf.net id #2638653) 2009-03-15 17:39:53 +01:00
Nikolas Garofil
4c25a9680e Added output_to_stderr 2009-02-10 09:43:20 +01:00
Brenden Matthews
dc3ed8df13 Removing old svn keywords. 2008-12-09 16:35:49 -07:00
Nikolas Garofil
312d3d6de8 Merge with conky1-extra, Changelog contains the changes
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1193 7f574dfc-610e-0410-a909-a81674777703
2008-06-21 20:37:58 +00:00
Brenden Matthews
801cf11545 * Added patch for the following (thanks larsko):
* New $loadgraph to show a graph of load averages,
* add "show_graph_scale" option to turn off/on the showing of the
current max value for the graph,
* minor code fixes,
* update nano and vim syntax highlighting stuff.

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1104 7f574dfc-610e-0410-a909-a81674777703
2008-04-13 04:10:35 +00:00
Philip Kovacs
622c190e37 Conky 1.4.9
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@990 7f574dfc-610e-0410-a909-a81674777703
2007-11-22 19:38:17 +00:00
Philip Kovacs
c08db2aba5 Externalize default config file: /conky/conky.conf
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@981 7f574dfc-610e-0410-a909-a81674777703
2007-10-23 21:52:11 +00:00