From 158cf82261323364f2b0ff33efcc6257fe66521a Mon Sep 17 00:00:00 2001
From: fedora <a_mirre@utb.cz>
Date: Wed, 15 May 2019 03:26:14 +0200
Subject: [PATCH] Slightly rewrote conkyrc to match conky.lua

---
 conky/conkyrc | 159 +++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 130 insertions(+), 29 deletions(-)

diff --git a/conky/conkyrc b/conky/conkyrc
index 75e5667..ec44659 100644
--- a/conky/conkyrc
+++ b/conky/conkyrc
@@ -1,9 +1,11 @@
 #background no
-#font Sans:size=9
-xftfont Sans:size=9
+#xftfont Sans:size=9
+#xftfont LiberationSans:size=9
+#xftfont DejaVuSansMono:size=9
+xftfont Bitstream Vera Sans Mono:size=9
 use_xft yes
 xftalpha 0.9
-update_interval 3
+update_interval 2
 update_interval_on_battery 5.0
 total_run_times 0
 own_window yes
@@ -20,32 +22,35 @@ draw_outline no
 draw_borders no
 draw_graph_borders no
 default_color white
-default_shade_color black
-default_outline_color black
-  #color0 = '#999999',
-	#color1 = '#cccccc',
-	#color2 = '#ff0000',
-	#color3 = '#00ff00',
-	#color4 = '#0000ff',
-	#color5 = '#ffcc00',
-	#color6 = '#ccff00',
-	#color7 = '#0099cc',
-	#color8 = '#cc9900',
-  #color9 = '#333333',
+#default_shade_color black
+#default_outline_color black
+    #color0 = '999999'
+	#color1 = 'cccccc'
+	#color2 = 'ff0000'
+	#color3 = '00ff00'
+	#color4 = '0000ff'
+	#color5 = 'ffcc00'
+	#color6 = 'ccff00'
+	#color7 = '0099cc'
+	#color8 = 'cc9900'
+    #color9 = '333333'
 alignment top_right
 gap_x 13
 gap_y 15
 no_buffers yes
 #diskio_avg_samples 3
 uppercase no
-cpu_avg_samples 3
+cpu_avg_samples 2
 override_utf8_locale yes
 
+
 TEXT
 ${texeci 1337 cat /etc/fedora-release}
-#fedora release 30 (Thirty)
+#fedora release 29 (Twenty Nine)
 
+#${color white}System ${hr 1}${color}
 host: ${nodename} \
+#${goto 130}
 ${kernel} \
 ${alignr}load: ${alignr}$loadavg
 uptime: ${uptime} \
@@ -69,6 +74,7 @@ ${goto 255}CPU3: ${cpu cpu3}% \
 ${goto 370}CPU4: ${cpu cpu4}%
 # ${cpubar 4 cpu4}
 
+#${time %c}
 / ${goto 70}${fs_used_perc /}% = ${fs_used /} / ${fs_size /} \
 #${fs_bar 3 /}
 ${goto 260}ram ${alignr}$memperc% = $mem / $memmax
@@ -78,13 +84,46 @@ ${goto 260}ram ${alignr}$memperc% = $mem / $memmax
 ${goto 260}swap ${alignr}$swapperc% = $swap/ $swapmax
 #${swapbar 3, 260}
 #
+#${color white}filesystems ${hr 1}${color}
 ${if_mounted /run/media/fedora/data}data \
+#(${fs_type /run/media/fedora/data})
 ${goto 70} ${fs_used_perc /run/media/fedora/data}% = \
 ${fs_used /run/media/fedora/data} / \
 ${fs_size /run/media/fedora/data}
 #${fs_bar 3 /run/media/fedora/data}
 ${endif}
 #
+#
+### orig
+#/ ${alignr} ${fs_used_perc /}% = ${fs_used /} / ${fs_size /}
+##${fs_bar 3 /}
+#/home ${alignr} ${fs_used_perc /home}% = ${fs_used /home} / ${fs_size /home}
+##${fs_bar 3 /home}
+##
+#${if_mounted /run/media/fedora/data}data \
+##(${fs_type /run/media/fedora/data})
+#${alignr} ${fs_used_perc /run/media/fedora/data}% = \
+#${alignr}${fs_used /run/media/fedora/data} / \
+#${fs_size /run/media/fedora/data}
+##${fs_bar 3 /run/media/fedora/data}
+#${endif}
+###
+#
+#${if_mounted /run/media/fedora/8289-15F4}/run/media/fedora/8289-15F4 \
+## file system
+#(${fs_type /run/media/fedora/8289-15F4}) \
+#${alignr}${fs_used_perc /run/media/fedora/8289-15F4}% = \
+#${alignr}${fs_used /run/media/fedora/8289-15F4} / \
+#${fs_size /run/media/fedora/8289-15F4}
+## ${fs_bar 3 /run/media/fedora/8289-15F4}
+#${endif}
+#
+#/dev/sda: Read ${diskio_read sda} |  Write ${diskio_write sda} \
+${alignr}/dev/sdb: Read ${diskio_read sdb} |  Write ${diskio_write sdb}
+#
+#${color}processes: $processes
+#${hr}
+#
 top cpu ${goto 130} pid ${goto 180} cpu% \
 ${goto 260}top mem${alignr}pid   mem%
 ${color0}${top name 1}${goto 125}${top pid 1}${goto 175}${top cpu 1}  \
@@ -98,20 +137,40 @@ ${color0}${goto 260}${top_mem name 4}${alignr}${top_mem pid 4}${top_mem mem 4}
 ${color0}${top name 5}${goto 125}${top pid 5}${goto 175}${top cpu 5}  \
 ${color0}${goto 260}${top_mem name 5}${alignr}${top_mem pid 5}${top_mem mem 5}
 #
+#Highest MEM $alignr PID     CPU%    MEM%
+#${top_mem name 1}$alignr${top pid 1}   ${top_mem cpu 1}     ${top_mem mem 1}
+#${top_mem name 2}$alignr${top pid 2}   ${top_mem cpu 2}     ${top_mem mem 2}
+#${top_mem name 3}$alignr${top pid 3}   ${top_mem cpu 3}     ${top_mem mem 3}
+#${top_mem name 4}$alignr${top pid 4}   ${top_mem cpu 4}     ${top_mem mem 4}
+#${top_mem name 5}$alignr${top pid 5}   ${top_mem cpu 5}     ${top_mem mem 5}
+#
+#Highest CPU $alignr PID      CPU%    MEM%
+#${top name 1}$alignr${top pid 1}    ${top cpu 1}     ${top mem 1}
+#${top name 2}$alignr${top pid 2}    ${top cpu 2}     ${top mem 2}
+#${top name 3}$alignr${top pid 3}    ${top cpu 3}     ${top mem 3}
+#${top name 4}$alignr${top pid 4}    ${top cpu 4}     ${top mem 4}
+#${top name 5}$alignr${top pid 5}    ${top cpu 5}     ${top mem 5}
+#
+#############
+#
 ${if_up wlp3s0}\
 
-${color #009999}wlp3s0 \
+#${color white}net stat
+${color 009999}wlp3s0 \
 ${goto 77}${color 6699ff}Q: ${color white}${wireless_link_qual_perc wlp3s0}% \
-${goto 150}${color #00cc88} ${addr wlp3s0} \
-${color #6699ff}${alignr}ap mac: ${color #9966ff}${wireless_ap wlp3s0}
-${color #6699ff}gw: ${color #00cc88}${gw_ip} \
+${goto 150}${color 00cc88} ${addr wlp3s0} \
+${color 6699ff}${alignr}ap mac: ${color 9966ff}${wireless_ap wlp3s0}
+${color 6699ff}gw: ${color 00cc88}${gw_ip} \
 #get the external ip using opendns
-${goto 150}${color #00cc88} ${texeci 30 dig +short myip.opendns.com @208.67.222.222} \
-${color #6699ff}${alignr}mac: ${color #9966ff}${texeci 30 ifconfig wlp3s0 | grep ether | sed '{s/ *......//;s/..txque..*//}'}
+#${goto 135}${color #00cc88} ${texeci 30 wget https://duckduckgo.com/?q=my+ip&t=ffab&ia=answer}
+${goto 150}${color 00cc88} ${texeci 30 dig +short myip.opendns.com @208.67.222.222} \
+#${color #6699ff}${alignr}mac: ${color 9966ff}${texeci 30 ifconfig wlp3s0 | grep ether | sed '{s/ *......//;s/..txque..*//;h;y/abcdef/ABCDEF/}'}
+${color 6699ff}${alignr}mac: ${color 9966ff}${texeci 30 ifconfig wlp3s0 | grep ether | sed '{s/ *......//;s/..txque..*//}'}
 ${color 6699ff}channel: ${color 9966ff}${wireless_channel wlp3s0}    \
 ${color 6699ff}freq: ${color0}${wireless_freq wlp3s0}    \
 ${color 6699ff}mode: ${color 9966ff}${wireless_mode wlp3s0}  \
 ${alignr}${color 6699ff}essid: ${color 9966ff}${wireless_essid wlp3s0}
+#${color 6699ff}bitrate: ${color 9966ff}${wireless_bitrate wlp3s0}
 #
 ${color white}total ${totaldown wlp3s0}\
 ${goto 135}down ${downspeed wlp3s0}\
@@ -119,18 +178,35 @@ ${goto 225}↓↑${goto 270}up ${upspeed wlp3s0}\
 ${alignr}total ${totalup wlp3s0}
 ${downspeedgraph wlp3s0 25,225 9966ff 6699ff -l} · \
 ${alignr}${upspeedgraph wlp3s0 25,225 9966ff 6699ff -l}
+#total ${totaldown wlp3s0} ${alignr}total ${totalup wlp3s0}
+#
+#${color}ip addr ${goto 115} inbound: ${tcp_portmon 1 32767 count}    outbound: #${tcp_portmon 32768 61000 count}    all: ${tcp_portmon 1 65535 count} ${alignr}dest port
+#${tcp_portmon 1 65535 rip  0}${alignr 1}${tcp_portmon 1 65535 rport  0}
+#${tcp_portmon 1 65535 rip  1}${alignr 1}${tcp_portmon 1 65535 rport  1}
+#${tcp_portmon 1 65535 rip  2}${alignr 1}${tcp_portmon 1 65535 rport  2}
+#${tcp_portmon 1 65535 rip  3}${alignr 1}${tcp_portmon 1 65535 rport  3}
+#${tcp_portmon 1 65535 rip  4}${alignr 1}${tcp_portmon 1 65535 rport  4}
+#${tcp_portmon 1 65535 rip  5}${alignr 1}${tcp_portmon 1 65535 rport  5}
+#${tcp_portmon 1 65535 rip  6}${alignr 1}${tcp_portmon 1 65535 rport  6}
+#${tcp_portmon 1 65535 rip  7}${alignr 1}${tcp_portmon 1 65535 rport  7}
+#${tcp_portmon 1 65535 rip  8}${alignr 1}${tcp_portmon 1 65535 rport  8}
+#${tcp_portmon 1 65535 rip  9}${alignr 1}${tcp_portmon 1 65535 rport  9}
 ${endif}\
 #
 ###################
 ${if_up enp0s25}\
+#${color white}net stat
 #
-${color #009999}enp0s25 \
-${goto 140}${color #00cc88} ${addr enp0s25} \
-${color #6699ff}${alignr}mac: ${color #9966ff}${texeci 300 ifconfig enp0s25 | grep ether | sed '{s/ *......//;s/..txque..*//}'}
-${color #6699ff}gw: ${color #00cc88}${gw_ip} \
+${color 009999}enp0s25 \
+${goto 140}${color 00cc88} ${addr enp0s25} \
+#${color #6699ff}${alignr}mac: ${color #9966ff}${texeci 300 ifconfig enp0s25 | grep ether | sed '{s/ *......//;s/..txque..*//;h;y/abcdef/ABCDEF/}'}
+${color 6699ff}${alignr}mac: ${color 9966ff}${texeci 300 ifconfig enp0s25 | grep ether | sed '{s/ *......//;s/..txque..*//}'}
+${color 6699ff}gw: ${color 00cc88}${gw_ip} \
 #get the external ip using opendns
-${goto 140}${color #00cc88} ${texeci 15 dig +short myip.opendns.com @208.67.222.222} \
-${alignr}${color #6699ff}dns: ${color #9966ff}${texeci 30 cat /etc/resolv.conf | grep nameserver | sed '{s/ *nameserver *//;s///}' | head -1}
+#${goto 135}${color 00cc88} ${texeci 30 wget https://duckduckgo.com/?q=my+ip&t=ffab&ia=answer}
+${goto 140}${color 00cc88} ${texeci 15 dig +short myip.opendns.com @208.67.222.222} \
+${alignr}${color 6699ff}dns: ${color 9966ff}${texeci 30 cat /etc/resolv.conf | grep nameserver | sed '{s/ *nameserver *//;s///}' | head -1}
+#${nameserver 0}
 ${color white}total ${totaldown enp0s25}\
 ${goto 135}down ${downspeed enp0s25}\
 ${goto 225}↓↑${goto 270}up ${upspeed enp0s25}\
@@ -138,6 +214,7 @@ ${alignr}total ${totalup enp0s25}
 ${downspeedgraph enp0s25 25,225 9966ff 6699ff -l} · \
 ${alignr}${upspeedgraph enp0s25 25,225 9966ff 6699ff -l}
 #
+#total ${totaldown enp0s25} ${alignr}total ${totalup enp0s25}
 ${endif}\
 ${if_gw}\
 ${color}rhost ${goto 115} inbound: ${tcp_portmon 1 32767 count}    outbound: ${tcp_portmon 32768 61000 count}    all: ${tcp_portmon 1 65535 count} ${alignr}rport
@@ -152,3 +229,27 @@ ${tcp_portmon 1 65535 rip  7}${alignr 1}${tcp_portmon 1 65535 rport  7}
 ${tcp_portmon 1 65535 rip  8}${alignr 1}${tcp_portmon 1 65535 rport  8}
 ${tcp_portmon 1 65535 rip  9}${alignr 1}${tcp_portmon 1 65535 rport  9}
 ${endif}
+#
+#
+#
+#
+# Port(s)${alignr}#Connections
+# ${color}Inbound: ${tcp_portmon 1 32767 count}    Outbound: ${tcp_portmon 32768 61000 count}${alignr}   ALL: ${tcp_portmon 1 65535 count}
+#Inbound Connection ${alignr} Local Port/Service${color}
+# ${tcp_portmon 1 32767 rhost 0} ${alignr} ${tcp_portmon 1 32767 lservice 0}
+# ${tcp_portmon 1 32767 rhost 1} ${alignr} ${tcp_portmon 1 32767 lservice 1}
+# ${tcp_portmon 1 32767 rhost 2} ${alignr} ${tcp_portmon 1 32767 lservice 2}
+## ${tcp_portmon 1 32767 rhost 3} ${alignr} ${tcp_portmon 1 32767 lservice 3}
+## ${tcp_portmon 1 32767 rhost 4} ${alignr} ${tcp_portmon 1 32767 lservice 4}
+#Outbound Connection ${alignr} Remote Port/Service${color}
+# ${tcp_portmon 32768 61000 rhost 0} ${alignr} ${tcp_portmon 32768 61000 rservice 0}
+# ${tcp_portmon 32768 61000 rhost 1} ${alignr} ${tcp_portmon 32768 61000 rservice 1}
+# ${tcp_portmon 32768 61000 rhost 2} ${alignr} ${tcp_portmon 32768 61000 rservice 2}
+# ${tcp_portmon 32768 61000 rhost 3} ${alignr} ${tcp_portmon 32768 61000 rservice 3}
+#${tcp_portmon 32768 61000 rhost 4} ${alignr} ${tcp_portmon 32768 61000 rservice 4}
+#${endif}\
+# Inbound: ${color white}${tcp_portmon 1 32767 count}                Outbound: ${tcp_portmon 32768 61000 count}${alignr}Total: ${tcp_portmon 1 65535 count}
+#
+# Process  Remote Host        L-Port       R-Port
+#
+#${texeci 10 netstat -ap | grep 'ESTABLISHED' | sed -r 's|.*[0-9.]+:([0-9]*)\s*([^:]+):([a-zA-Z]+)[^/]+/([a-zA-Z0-9]*)|\4 \2 \1 \3|' | awk '{printf("%-14s %-20s %5s %7s\n",$1,$2,$3,$4)}'}