From 517e2619448f20c3f7a1199e9c307bcaa9a34b32 Mon Sep 17 00:00:00 2001
From: Joe <rrbo@proton.me>
Date: Mon, 6 Feb 2023 18:00:21 +0100
Subject: up
---
.config/conkyrc | 36 +++++++++++++++++++-----------------
.local/bin/conky/net.sh | 5 ++---
2 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/.config/conkyrc b/.config/conkyrc
index 4ac738a..ca0cf8c 100644
--- a/.config/conkyrc
+++ b/.config/conkyrc
@@ -20,7 +20,7 @@ conky.config = {
update_interval = 1.5,
uppercase = false,
override_utf8_locale = true,
- stippled_borders = 1,
+ stippled_borders = 0,
border_width = 1,
draw_borders = false,
draw_graph_borders = true,
@@ -29,9 +29,9 @@ conky.config = {
show_graph_scale = false,
show_graph_range = false,
alignment = 'top_right',
- minimum_width = 365,
+ minimum_width = 400,
minimum_height = 1440,
- maximum_width = 365,
+ maximum_width = 400,
gap_x = 0,
gap_y = 40,
net_avg_samples = 2,
@@ -47,19 +47,21 @@ conky.config = {
conky.text = [[
${color #928374}${alignc}${time %A %e %B %Y - %Hh%M}
-${hr}
+${color #ebdbb2}SYSTEM ${hr}
${color #928374}Terminal: ${font1}${color #ebdbb2}${nodename_short}${font}
${color #928374}OS: ${font1}${color #ebdbb2}${sysname}${font}
${color #928374}Kernel: ${font1}${color #ebdbb2}${kernel}${font}
${color #928374}Uptime: ${font1}${color #ebdbb2}${uptime}${font}
-${hr}${if_mpd_playing}
-${font1}${color #ebdbb2}${goto 140}${mpd_artist}
-${goto 140}${scroll wait 25 3 1 ${mpd_title}}
-${goto 140}${mpd_elapsed}/${mpd_length} ${mpd_bar}
-${execi 5 ~/.local/bin/conky/cover.sh >/dev/null 2>&1}${image /tmp/conkyCover.png -p 20,150 -n}
-${hr}${endif}${if_up enx4ce1734c425a}
-${font2}${color #ebdbb2}${alignc}${execi 1800 curl wttr.in/Lyon?T0 --silent --max-time 3}${font}
-${hr}${endif}
+${if_mpd_playing}MPD ${hr}
+
+${font1}${color #ebdbb2}${goto 130}${mpd_artist}
+${goto 130}${scroll wait 30 3 1 ${mpd_title}}
+${goto 130}${mpd_elapsed}/${mpd_length} ${mpd_bar}
+${execi 5 ~/.local/bin/conky/cover.sh >/dev/null 2>&1}${image /tmp/conkyCover.png -p 0,150 -n}${font}
+
+${endif}${if_up enx4ce1734c425a}WEATHER ${hr}
+${font2}${color #ebdbb2}${alignc}${execi 1800 curl wttr.in/Lyon?T0 --silent --max-time 3}${font}${endif}
+CPU ${hr}
${color #928374}CPU: ${font1}${color #ebdbb2} ${freq_g} GHz ${color #ebdbb2}${cpu}%
${offset 4}${cpugraph bfbfbf c0c0c0}
${color #928374}1:${color #ebdbb2} ${cpu cpu0}% ${cpubar cpu0}${color #ebdbb2}
@@ -68,20 +70,20 @@ ${color #928374}3:${color #ebdbb2} ${cpu cpu2}% ${cpubar cpu2}${color #ebdbb2}
${color #928374}4:${color #ebdbb2} ${cpu cpu3}% ${cpubar cpu3}${color #ebdbb2}
${color #928374}5:${color #ebdbb2} ${cpu cpu4}% ${cpubar cpu4}${color #ebdbb2}
${color #928374}6:${color #ebdbb2} ${cpu cpu5}% ${cpubar cpu5}${color #ebdbb2}${font}
-${hr}
+RAM ${hr}
${color #928374}RAM: ${font1}${color #ebdbb2}${mem} / ${memmax} ${color #ebdbb2}${memperc}% ${membar 4}${font}
${offset 4}${memgraph bfbfbf c0c0c0}
${color #928374}SWAP: ${font1}${color #ebdbb2}${swap} / ${swapmax} ${color #ebdbb2}${swapperc}% ${swapbar 4}${font}
-${hr}
+DISK ${hr}
${color #928374}SSD: ${font1}${color #ebdbb2}${fs_free_perc /}% ${fs_bar 6 /}${font}
-${hr}
-${color #928374}Process:${color #928374}${alignr}PID CPU MEM
+PROC ${hr}
+${color #928374}Process:${color #928374}${alignr}PID CPU MEM
${font1}${color #ebdbb2}${top_mem name 1} ${alignr}${top_mem pid 1} ${top_mem cpu 1} ${top_mem mem_res 1}
${font1}${color #928374}${top_mem name 2} ${alignr}${top_mem pid 2} ${top_mem cpu 2} ${top_mem mem_res 2}
${font1}${color #ebdbb2}${top_mem name 3} ${alignr}${top_mem pid 3} ${top_mem cpu 3} ${top_mem mem_res 3}
${font1}${color #928374}${top_mem name 4} ${alignr}${top_mem pid 4} ${top_mem cpu 4} ${top_mem mem_res 4}${font}
${color #928374}---------
${color #928374}Processes: ${font1}${color #ebdbb2}${processes}${font}
-${hr}
+NETWORK ${hr}
${execp ~/.local/bin/conky/net.sh}
]]
diff --git a/.local/bin/conky/net.sh b/.local/bin/conky/net.sh
index ab9b543..09e4fb6 100755
--- a/.local/bin/conky/net.sh
+++ b/.local/bin/conky/net.sh
@@ -31,10 +31,9 @@ ${color #928374}---------
${color #928374}LAN IP: ${font1}${color #ebdbb2}${addr '$if_main'}${font}
${color #928374}DNS IP: ${font1}${color #ebdbb2}${nameserver 0}${font}
${color #928374}WAN IP: ${color #ebdbb2}${font1}${execi 300 curl -s https://ifconfig.me || echo No WAN}${font}
-${hr}
+${color #928374}---------
${color #928374}Speed: ${font1}down: ${color #ebdbb2}${font1}${downspeed '$if_main'} ${color #928374}- up: ${color #ebdbb2}${font1}${upspeed '$if_main'}${font}
${color #928374}Down: ${color #ebdbb2}${downspeedgraph '$if_main' bfbfbf c0c0c0 125829120}
-${color #928374}Up: ${color #ebdbb2}${upspeedgraph '$if_main' bfbfbf c0c0c0 125829120}
-${hr}'
+${color #928374}Up: ${color #ebdbb2}${upspeedgraph '$if_main' bfbfbf c0c0c0 125829120}'
# ${color #928374}VPN IP: ${font1}${color #ebdbb2}${addr proton0}${font}
--
cgit v1.2.3