mirror of
https://github.com/Llewellynvdm/conky.git
synced 2024-11-16 18:15:17 +00:00
Use a builtin config without X11-support when compiled without it
also, make sure X isn't initialised when compiled without x11-support
This commit is contained in:
parent
2c35099b82
commit
3762c5cb10
53
data/conky_no_x11.conf
Normal file
53
data/conky_no_x11.conf
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
# Conky, a system monitor, based on torsmo
|
||||||
|
#
|
||||||
|
# Any original torsmo code is licensed under the BSD license
|
||||||
|
#
|
||||||
|
# All code written since the fork of torsmo is licensed under the GPL
|
||||||
|
#
|
||||||
|
# Please see COPYING for details
|
||||||
|
#
|
||||||
|
# Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
|
||||||
|
# Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
|
||||||
|
# All rights reserved.
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
#
|
||||||
|
|
||||||
|
background no
|
||||||
|
cpu_avg_samples 2
|
||||||
|
net_avg_samples 2
|
||||||
|
no_buffers yes
|
||||||
|
out_to_console no
|
||||||
|
out_to_stderr no
|
||||||
|
update_interval 1.0
|
||||||
|
uppercase no
|
||||||
|
use_spacer none
|
||||||
|
|
||||||
|
TEXT
|
||||||
|
${scroll 16 $nodename - $sysname $kernel on $machine | }
|
||||||
|
Uptime: $uptime
|
||||||
|
Frequency (in MHz): $freq
|
||||||
|
Frequency (in GHz): $freq_g
|
||||||
|
RAM Usage: $mem/$memmax - $memperc%
|
||||||
|
Swap Usage: $swap/$swapmax - $swapperc%
|
||||||
|
CPU Usage: $cpu%
|
||||||
|
Processes: $processes Running: $running_processes
|
||||||
|
File systems:
|
||||||
|
/ ${fs_used /}/${fs_size /}
|
||||||
|
Networking:
|
||||||
|
Up: ${upspeed eth0} - Down: ${downspeed eth0}
|
||||||
|
Name PID CPU% MEM%
|
||||||
|
${top name 1} ${top pid 1} ${top cpu 1} ${top mem 1}
|
||||||
|
${top name 2} ${top pid 2} ${top cpu 2} ${top mem 2}
|
||||||
|
${top name 3} ${top pid 3} ${top cpu 3} ${top mem 3}
|
||||||
|
${top name 4} ${top pid 4} ${top cpu 4} ${top mem 4}
|
@ -35,7 +35,11 @@ endif
|
|||||||
conky_DEPENDENCIES = $(config_output)
|
conky_DEPENDENCIES = $(config_output)
|
||||||
BUILT_SOURCES = $(config_output)
|
BUILT_SOURCES = $(config_output)
|
||||||
CLEANFILES = $(config_output)
|
CLEANFILES = $(config_output)
|
||||||
|
if BUILD_X11
|
||||||
$(config_output): ../data/conky.conf
|
$(config_output): ../data/conky.conf
|
||||||
|
else
|
||||||
|
$(config_output): ../data/conky_no_x11.conf
|
||||||
|
endif
|
||||||
sh ../text2c.sh $< $@ defconfig
|
sh ../text2c.sh $< $@ defconfig
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -7548,9 +7548,11 @@ static void load_config_file(const char *f)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
CONF("text") {
|
CONF("text") {
|
||||||
|
#ifdef X11
|
||||||
if(output_methods & TO_X) {
|
if(output_methods & TO_X) {
|
||||||
X11_initialisation();
|
X11_initialisation();
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
if (global_text) {
|
if (global_text) {
|
||||||
free(global_text);
|
free(global_text);
|
||||||
|
Loading…
Reference in New Issue
Block a user