redo conky

diff --git a/conkyrc b/conkyrc
index 2b496dd421af245e322dfc4abcd1630cbf270842..4b9413f177b4d259f0d2a0e28f4fa8e4fca03b4a 100644 (file)
--- a/conkyrc
+++ b/conkyrc
@@ -1,12 +1,12 @@
 alignment top_left
-gap_x 0
+gap_x 8
 gap_y 30
 border_width 0
 border_inner_margin 8
 
-minimum_size 180 1080
-maximum_width 180
-maximum_heigth 1080
+minimum_size 320 1080
+maximum_width 320
+maximum_height 1080
 
 default_bar_size 92 6
 
@@ -14,7 +14,7 @@ format_human_readable
 
 use_xft yes
 override_utf8_locale yes
-xftfont Droid Sans:size=9
+xftfont Droid Sans:style=Bold:size=10
 text_buffer_size 2048
 
 own_window yes
@@ -49,50 +49,65 @@ uppercase no
 use_spacer none
 
 TEXT
-${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}
+${image ~/.conky/logo.png -p 0,15 -s 19x19}
+${font Droid Sans:style=Bold:size=24}${alignr}${time %R}
+${font Droid Sans:style=Bold:size=12}${color 75D1FF}DATE${color 1B71CC}$hr${color}${font}
+${font Droid Sans:style=Bold:size=12}${alignr}${time %a, %e %b %Y}${font}
+${font Droid Sans:style=Bold:size=12}${color 75D1FF}SYSTEM${color 1B71CC}$hr${color}${font}
+Kernel: ${alignr}${kernel}
+Uptime: ${alignr}${uptime}
 # |--Updates
-${goto 40}Updates: ${alignr}${font Droid Sans:style=Bold:size=9}${execi 10800 pacman -Qu | wc -l}${font} Packages
+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}
+${font Droid Sans:style=Bold:size=12}${color 75D1FF}CPU${color 1B71CC}$hr${color}${font}
+${exec grep "model name" /proc/cpuinfo | uniq | cut -d':' -f2}
+Core 0 @ ${color 75D1FF}${alignr 65}${cpu cpu1}%${alignr}${cpubar cpu1 7,150}${color}
+Core 1 @ ${color 75D1FF}${alignr 65}${cpu cpu2}%${alignr}${cpubar cpu2 7,150}${color}
+Core 2 @ ${color 75D1FF}${alignr 65}${cpu cpu3}%${alignr}${cpubar cpu3 7,150}${color}
+Core 3 @ ${color 75D1FF}${alignr 65}${cpu cpu4}%${alignr}${cpubar cpu4 7,150}${color}
+
 # |--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}
+${font Droid Sans:style=Bold:size=12}${color 75D1FF}MEMORY${color 1B71CC}$hr${color}${font}
+RAM${alignr}$memperc%
+${mem}/${memmax}${alignr}${color 75D1FF}${membar 8,150}${color}
 # |--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}
+SWAP${alignr}${swapperc}%
+${swap}/${swapmax}${alignr}${color 75D1FF}${swapbar 8,150}${color}
+
 # |--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}
+${font Droid Sans:style=Bold:size=12}${color 75D1FF}TOP${color 1B71CC}$hr${color}${font}
+${color AAAAAA}PROCESS${alignr 90}CPU${alignr}RAM${color}
+${top name 1}${alignr 80}${top cpu 1}${alignr}${top mem 1}
+${top name 2}${alignr 80}${top cpu 2}${alignr}${top mem 2}
+${top name 3}${alignr 80}${top cpu 3}${alignr}${top mem 3}
+${top name 4}${alignr 80}${top cpu 4}${alignr}${top mem 4}
+${top name 5}${alignr 80}${top cpu 5}${alignr}${top mem 5}
+
 #############
 # - 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 enp3s0}${font} ${alignr}${upspeedgraph enp3s0 8,50 EEEEEE}
-${goto 20}Overall: ${font Droid Sans:style=Bold:size=9}${totalup enp3s0}${font}
-${voffset 4}${goto 20}Download: ${font Droid Sans:style=Bold:size=9}${downspeed enp3s0}${font} ${alignr}${downspeedgraph enp3s0 8,50 EEEEEE}
-${goto 20}Overall: ${font Droid Sans:style=Bold:size=9}${totaldown enp3s0}${font}
-${voffset 4}${goto 20}Local IP: ${alignr}${font Droid Sans:style=Bold:size=9}${addr enp3s0}${font}
-${goto 20}Public IP: ${alignr}${font Droid Sans:style=Bold:size=9}${execi 1800 ~/bin/whatsmyip}${font}
+${font Droid Sans:style=Bold:size=12}${color 75D1FF}NETWORK${color 1B71CC}$hr${color}${font}
+Public IP: ${alignr}${execi 1800 ~/bin/whatsmyip}${if_up enp3s0}
+Local IP: ${alignr}${addr enp3s0}
+Upload: ${upspeedf enp3s0}KiB/s${alignr}${color 75D1FF}${upspeedgraph enp3s0 20,150}${color}
+${voffset -20}Overall: ${totalup enp3s0}
+Download: ${downspeedf enp3s0}KiB/s${alignr}${color 75D1FF}${downspeedgraph enp3s0 20,150}${color}
+${voffset -20}Overall: ${totaldown enp3s0}${endif}${if_up wlp3s0}
+Local IP: ${alignr}${addr wlp3s0}
+Upload: ${upspeedf wlp3s0}KiB/s${alignr}${color 75D1FF}${upspeedgraph wlp3s0 20,150}${color}
+${voffset -20}Overall: ${totalup wlp3s0}
+Download: ${downspeedf wlp3s0}KiB/s${alignr}${color 75D1FF}${downspeedgraph wlp3s0 20,150}${color}
+${voffset -20}Overall: ${totaldown wlp3s0}${endif}
+
 ##########
 # - HD - #
 ##########
-${voffset 4}${font Droid Sans:style=Bold:size=9}HD $hr${font}
+${font Droid Sans:style=Bold:size=12}${color 75D1FF}HDD${color 1B71CC}$hr${color}${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}
+Root: ${fs_used_perc /}%${goto 100}${alignr}${color 75D1FF}${fs_bar 7,150 /}${color}
+Free: ${fs_free /} ${alignr 1}Used: ${fs_used /}
+Home: ${fs_used_perc /home}%${goto 100}${alignr}${color 75D1FF}${fs_bar 7,150 /home}${color}
+Free: ${fs_free /home} ${alignr 1}Used: ${fs_used /home}
+${if_mounted /mnt/Skaro}Skaro: ${fs_used_perc /mnt/Skaro}%${goto 100}${alignr}${color 75D1FF}${fs_bar 7,150 /mnt/Skaro}${color}
+Free: ${fs_free /mnt/Skaro} ${alignr 1}Used: ${fs_used /mnt/Skaro}${endif}