update conkyrc

diff --git a/Makefile b/Makefile
index 306bd978517faf6d41a0b81a41673fee1075a45a..3de276edfb1d6183a2fda8311bbc7672a041e2d1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ APATH := $(realpath .)
 RPATH := $(subst $(wildcard ~/),,$(APATH))
 
 FILES := bin
 RPATH := $(subst $(wildcard ~/),,$(APATH))
 
 FILES := bin

-DOTFILES := aliasesrc bash* conkyrc flexget vim* zsh*
+DOTFILES := aliasesrc bash* conky* flexget vim* zsh*

 
 .PHONY: install $(FILES) $(DOTFILES)
 install: $(FILES) $(DOTFILES)
 
 .PHONY: install $(FILES) $(DOTFILES)
 install: $(FILES) $(DOTFILES)

diff --git a/conky/logo.png b/conky/logo.png
new file mode 100644 (file)
index 0000000..a9fcc6c
Binary files /dev/null and b/conky/logo.png differ

diff --git a/conkyrc b/conkyrc
index 8736f35a3d797aa7aa8a5be95994713a60074ede..d8071214aec381e876cef5bf2c39d6565767d266 100644 (file)
--- a/conkyrc
+++ b/conkyrc
@@ -1,77 +1,98 @@
-# 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-2010 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/>.
-#
-

 alignment top_left
 alignment top_left

-background no
-border_width 1
-cpu_avg_samples 2
-default_color white
-default_outline_color white
-default_shade_color white
+gap_x 1950
+gap_y 400
+border_width 0
+border_inner_margin 8
+
+minimum_size 180 300
+maximum_width 180
+maximum_height 560
+
+default_bar_size 92 6
+
+format_human_readable
+
+use_xft yes
+override_utf8_locale yes
+xftfont Droid Sans:size=9
+text_buffer_size 2048
+
+own_window yes
+own_window_argb_visual yes
+own_window_argb_value 128
+own_window_class Conky
+#own_window_hints undecorate,sticky,skip_taskbar,skip_pager,above
+own_window_transparent no
+own_window_type override
+

 draw_borders no
 draw_graph_borders yes
 draw_outline no
 draw_borders no
 draw_graph_borders yes
 draw_outline no

-draw_shades no
-use_xft yes
-xftfont DejaVu Sans Mono:size=12
-gap_x 5
-gap_y 60
-minimum_size 5 5
+draw_shades yes
+default_color white
+default_outline_color white
+default_shade_color 000000
+
+background no
+cpu_avg_samples 2

 net_avg_samples 2
 net_avg_samples 2

+extra_newline no

 no_buffers yes
 no_buffers yes

+double_buffer yes

 out_to_console no
 out_to_stderr no
 out_to_console no
 out_to_stderr no

-extra_newline no
-own_window yes
-own_window_class Conky
-own_window_type desktop
+show_graph_range no
+show_graph_scale no

 stippled_borders 0
 stippled_borders 0

-update_interval 1.0
+update_interval 2

 uppercase no
 use_spacer none
 uppercase no
 use_spacer none

-show_graph_scale no
-show_graph_range no

 
 TEXT
 
 TEXT

-${scroll 16 $nodename - $sysname $kernel on $machine | }
-$hr
-${color grey}Uptime:$color $uptime
-${color grey}Frequency (in MHz):$color $freq
-${color grey}Frequency (in GHz):$color $freq_g
-${color grey}RAM Usage:$color $mem/$memmax - $memperc% ${membar 4}
-${color grey}Swap Usage:$color $swap/$swapmax - $swapperc% ${swapbar 4}
-${color grey}CPU Usage:$color $cpu% ${cpubar 4}
-${color grey}Processes:$color $processes  ${color grey}Running:$color $running_processes
-$hr
-${color grey}File systems:
- / $color${fs_used /}/${fs_size /} ${fs_bar 6 /}
-${color grey}Networking:
-Up:$color ${upspeed eth0} ${color grey} - Down:$color ${downspeed eth0}
-$hr
-${color grey}Name              PID   CPU%   MEM%
-${color lightgrey} ${top name 1} ${top pid 1} ${top cpu 1} ${top mem 1}
-${color lightgrey} ${top name 2} ${top pid 2} ${top cpu 2} ${top mem 2}
-${color lightgrey} ${top name 3} ${top pid 3} ${top cpu 3} ${top mem 3}
-${color lightgrey} ${top name 4} ${top pid 4} ${top cpu 4} ${top mem 4}
+${font Droid Sans:style=Bold:size=9}SYSTEM $hr${font}
+${image ~/.conky/logo.png -p 0,15 -s 19x19}${goto 40}Kernel:  ${alignr}${kernel}
+${goto 40}Uptime: ${alignr}${uptime}
+# |--Updates
+${goto 40}Updates: ${alignr}${font Droid Sans:style=Bold:size=9}${execi 10800 pacman -Qu | wc -l}${font} Packages
+# |--CPU
+${voffset 6}${font Droid Sans:style=Bold:size=9}CPU${font}${offset -20}${voffset 10}${cpubar cpu0 4,18}
+${voffset -23}${goto 40}Core 1: ${font Droid Sans:style=Bold:size=9}${cpu cpu1}%${font} ${alignr}${cpubar cpu1 7,70 EEEEEE}
+${voffset 1}${goto 40}Core 2: ${font Droid Sans:style=Bold:size=9}${cpu cpu2}%${font} ${alignr}${cpubar cpu2 7,70 EEEEEE}
+${voffset 1}${goto 40}Core 3: ${font Droid Sans:style=Bold:size=9}${cpu cpu3}%${font} ${alignr}${cpubar cpu3 7,70 EEEEEE}
+${voffset 1}${goto 40}Core 4: ${font Droid Sans:style=Bold:size=9}${cpu cpu4}%${font} ${alignr}${cpubar cpu4 7,70 EEEEEE}
+${voffset 1}${goto 40}Core 5: ${font Droid Sans:style=Bold:size=9}${cpu cpu5}%${font} ${alignr}${cpubar cpu5 7,70 EEEEEE}
+${voffset 1}${goto 40}Core 6: ${font Droid Sans:style=Bold:size=9}${cpu cpu6}%${font} ${alignr}${cpubar cpu6 7,70 EEEEEE}
+# |--MEM
+${voffset 6}${font Droid Sans:style=Bold:size=9}RAM${font}${goto 40}RAM: ${font Droid Sans:style=Bold:size=9}$memperc%${font}
+${voffset 6}${offset 1}${voffset -8}${membar 4,18}${voffset 4}${goto 40}${voffset -2}Free: ${font Droid Sans:style=Bold:size=9}${memeasyfree}${font} ${goto 110}Used: ${font Droid Sans:style=Bold:size=9}${mem}${font}
+# |--SWAP
+${voffset 5}${font Droid Sans:style=Bold:size=9}SWP${font}${goto 40}Swap: ${font Droid Sans:style=Bold:size=9}${swapperc}%${font}
+${voffset 4}${offset 1}${voffset -7}${swapbar 4,18}${voffset 4}${goto 40}Free: ${font Droid Sans:style=Bold:size=9}$swapmax${font} ${goto 110}Used: ${font Droid Sans:style=Bold:size=9}$swap${font}
+# |--PROC
+${voffset 4}${font Droid Sans:style=Bold:size=9}TOP${font}${voffset 0}${goto 126}CPU${alignr}RAM
+${voffset -1}${goto 40}${top name 1}${font Droid Sans:style=Bold:size=8} ${goto 120}${top cpu 1}${alignr }${top mem 1}${font}
+${voffset -1}${goto 40}${top name 2}${font Droid Sans:style=Bold:size=8} ${goto 120}${top cpu 2}${alignr }${top mem 2}${font}
+${voffset -1}${goto 40}${top name 3}${font Droid Sans:style=Bold:size=8} ${goto 120}${top cpu 3}${alignr }${top mem 3}${font}
+${voffset -1}${goto 40}${top name 4}${font Droid Sans:style=Bold:size=8} ${goto 120}${top cpu 4}${alignr }${top mem 4}${font}
+${voffset -1}${goto 40}${top name 5}${font Droid Sans:style=Bold:size=8} ${goto 120}${top cpu 5}${alignr }${top mem 5}${font}
+#############
+# - NETWORK - #
+###############
+${voffset 4}${font Droid Sans:style=Bold:size=9}NETWORK $hr${font}
+${voffset 4}${goto 20}Upload: ${font Droid Sans:style=Bold:size=9}${upspeed wlan0}${font} ${alignr}${upspeedgraph wlan0 8,50 EEEEEE}
+${goto 20}Overall: ${font Droid Sans:style=Bold:size=9}${totalup eth0}${font}
+${voffset 4}${goto 20}Download: ${font Droid Sans:style=Bold:size=9}${downspeed wlan0}${font} ${alignr}${downspeedgraph wlan0 8,50 EEEEEE}
+${goto 20}Overall: ${font Droid Sans:style=Bold:size=9}${totaldown wlan0}${font}
+${voffset 4}${goto 20}Local IP: ${alignr}${font Droid Sans:style=Bold:size=9}${addr eth0}${font}
+${goto 20}Public IP: ${alignr}${font Droid Sans:style=Bold:size=9}${execi 10800 ~/.public_ip}${font}
+##########
+# - HD - #
+##########
+${voffset 4}${font Droid Sans:style=Bold:size=9}HD $hr${font}
+# |--HD default
+  ${voffset 4}${goto 20}Root: ${font Droid Sans:style=Bold:size=9}${fs_used_perc /}%${font}${goto 100}${alignr}${fs_bar 6,68 /}
+  ${offset 7}Free: ${font Droid Sans:style=Bold:size=9}${fs_free /}${font} ${alignr 1}Used: ${font Droid Sans:style=Bold:size=9}${fs_used /}${font}
+  ${voffset 4}${goto 20}Home: ${font Droid Sans:style=Bold:size=9}${fs_used_perc /home}%${font}${goto 100}${alignr}${fs_bar 6,68 /home}
+  ${offset 7}Free: ${font Droid Sans:style=Bold:size=9}${fs_free /home}${font} ${alignr 1}Used: ${font Droid Sans:style=Bold:size=9}${fs_used /home}${font}
+  ${voffset 4}${goto 20}Skaro: ${font Droid Sans:style=Bold:size=9}${fs_used_perc /mnt/Skaro}%${font}${goto 100}${alignr}${fs_bar 6,68 /mnt/Skaro}
+  ${offset 7}Free: ${font Droid Sans:style=Bold:size=9}${fs_free /mnt/Skaro}${font} ${alignr 1}Used: ${font Droid Sans:style=Bold:size=9}${fs_used /mnt/Skaro}${font}