diff options
Diffstat (limited to '')
| -rw-r--r-- | .config/conky/artix-logo.png | bin | 24245 -> 0 bytes | |||
| -rw-r--r-- | .config/conky/conkyrc | 130 | ||||
| -rwxr-xr-x | .local/bin/conky/cover.sh | 67 | ||||
| -rwxr-xr-x | .local/bin/conky/getif.sh | 31 | ||||
| -rwxr-xr-x | .local/bin/conky/net.sh | 48 |
5 files changed, 0 insertions, 276 deletions
diff --git a/.config/conky/artix-logo.png b/.config/conky/artix-logo.png Binary files differdeleted file mode 100644 index aaac8da..0000000 --- a/.config/conky/artix-logo.png +++ /dev/null diff --git a/.config/conky/conkyrc b/.config/conky/conkyrc deleted file mode 100644 index abe8b24..0000000 --- a/.config/conky/conkyrc +++ /dev/null @@ -1,130 +0,0 @@ -# vim ft=sh - -conky.config = { - alignment = 'left', - background = false, - own_window = true, - own_window_class = 'Desktop', - own_window_type = 'override', - own_window_hints = 'undecorated,below,sticky,skip_taskbar,skip_pager', - own_window_transparent = false, - own_window_argb_visual = true, - own_window_argb_value = 255, - own_window_color = 'FF0000', - double_buffer = true, - use_spacer = 'left', - use_xft = true, - xinerama_head = 1, - xftalpha = 1, - font = 'Terminess Nerd Font:style=Regular:size=12', - font2 = 'Terminess Nerd Font:style=Bold:size=12', - font1 = 'ConkySymbols:size=20', - template0 = '\\n', - if_up_strictness = address, - format_human_readable = true, - update_interval = 1, - uppercase = false, - override_utf8_locale = true, - stippled_borders = 0, - border_width = 1, - border_inner_margin = 8, - border_outer_margin = 0, - draw_borders = false, - draw_outline = false, - draw_shades = false, - default_shade_color = AAAAAA, - default_outline_color = AAAAAA, - default_bar_height = 8, - default_bar_width = 280, - draw_graph_borders = true, - show_graph_scale = false, - show_graph_range = false, - alignment = 'top_left', - minimum_width = 390, - maximum_width = 390, - maximum_height = 1440, - maximum_size = 390, - gap_x = 1, - gap_y = 1, - net_avg_samples = 2, - cpu_avg_samples = 4, - short_units = false, - pad_percents = 2, - text_buffer_size = 256, - out_to_console = false, - out_to_stderr = false, - extra_newline = false, - default_color = 'red', - color0 = '#ebdbb2', - color1 = '#fb4934', - color2 = '#98971a', - color3 = '#d79921', - color4 = '#458588', - color5 = '#d3869b', - color6 = '#8ec07c', - color9 = '#83a598' -} - -conky.text = [[ -${color0}${alignc}${time %A %e %B %Y - %Hh%M} -${alignc}${offset 20}${color9}${font2}Terminal: ${color0}${font}${nodename_short} -${alignc}${offset 20}${color9}${font2}OS: ${color0}${font}${sysname} - ${execi 300 lsb_release -ds} -${alignc}${offset 20}${color9}${font2}Kernel: ${color0}${font}${kernel} -${alignc}${offset 20}${color9}${font2}Uptime: ${color0}${font}${uptime_short}${font}${if_match "${nodename_short}" == "po-rbo"}${image ~/.config/conky/popos-logo.png -p 5,10 -s 75x75 -n}${endif}${if_match "${nodename_short}" == "mother"}${image ~/.config/conky/artix-logo.png -p 5,10 -s 75x75 -n}${if_mpd_playing} -${color0}${hr}${font} -${color0}${goto 130}${mpd_artist} -${goto 130}${scroll wait 30 3 5 ${mpd_title}} -${goto 130}${mpd_date} - ${mpd_album} -${goto 130}${mpd_elapsed}/${mpd_length} ${mpd_bar} -${execi 5 ~/.local/bin/conky/cover.sh >/dev/null 2>&1}${image /tmp/conkyCover.png -p 10,115 -n}${endif}${endif} -${color3}${hr} -${color3}${font ConkySymbols:size=18}f${font :size=15:bold}${voffset -5} CPU${color0}${font}${goto 115}${if_match "${nodename_short}" == "mother"}Intel i7-4790${endif}${if_match "${nodename_short}" == "po-rbo"}Intel i7-12700H${endif} @ ${freq_g}GHz${alignr}${font :bold:}${cpu}%${font} -${color3}${offset 3}${cpugraph cpu1 30,93 000000 DDAA00} ${cpugraph cpu2 30,93 000000 DDAA00} ${cpugraph cpu3 30,93 000000 DDAA00} ${cpugraph cpu4 30,93 000000 DDAA00} ${voffset 12} ${color0} ${goto 19}CPU 1: ${cpu cpu1}% ${goto 115}CPU 2: ${cpu cpu2}% ${goto 210}CPU 3: ${cpu cpu3}% ${voffset -29} ${goto 307}CPU 4: ${cpu cpu4}% -${color3}${offset 3}${cpugraph cpu5 30,93 000000 DDAA00} ${cpugraph cpu6 30,93 000000 DDAA00} ${cpugraph cpu7 30,93 000000 DDAA00} ${cpugraph cpu8 30,93 000000 DDAA00} ${voffset 12} ${color0} ${goto 19}CPU 5: ${cpu cpu5}% ${goto 115}CPU 6: ${cpu cpu6}% ${goto 210}CPU 7: ${cpu cpu7}% ${voffset -29} ${goto 307}CPU 8: ${cpu cpu8}%${if_match "${nodename_short}" == "po-rbo"} -${color3}${offset 3}${cpugraph cpu9 30,93 000000 DDAA00} ${cpugraph cpu10 30,93 000000 DDAA00} ${cpugraph cpu11 30,93 000000 DDAA00} ${cpugraph cpu12 30,93 000000 DDAA00} ${voffset 12} ${color0} ${goto 19}CPU 9: ${cpu cpu9}% ${goto 115}CPU 10: ${cpu cpu10}% ${goto 210}CPU 11: ${cpu cpu11}% ${voffset -29} ${goto 307}CPU 12: ${cpu cpu12}% -${color3}${offset 3}${cpugraph cpu13 30,93 000000 DDAA00} ${cpugraph cpu14 30,93 000000 DDAA00} ${cpugraph cpu15 30,93 000000 DDAA00} ${cpugraph cpu16 30,93 000000 DDAA00} ${voffset 12} ${color0} ${goto 19}CPU 13: ${cpu cpu13}% ${goto 115}CPU 14: ${cpu cpu14}% ${goto 210}CPU 15: ${cpu cpu15}% ${voffset -29} ${goto 307}CPU 16: ${cpu cpu16}% -${color3}${offset 3}${cpugraph cpu17 30,93 000000 DDAA00} ${cpugraph cpu18 30,93 000000 DDAA00} ${cpugraph cpu19 30,93 000000 DDAA00} ${cpugraph cpu20 30,93 000000 DDAA00} ${voffset 12} ${color0} ${goto 19}CPU 17: ${cpu cpu17}% ${goto 115}CPU 18: ${cpu cpu18}% ${goto 210}CPU 19: ${cpu cpu19}% ${voffset -29} ${goto 307}CPU 20: ${cpu cpu20}%${endif} -${color2}${hr}${font} -${color2}${font ConkySymbols:size=18}j${font :size=15:bold}${voffset -5} MEMORY${color0}${font}${goto 150}$mem / $memmax${alignr}${font :bold:}${memperc}%${font} -${color0}${font2}${offset 5}Top Processes ${alignr}${offset -5}CPU%${offset 5}MEM% -${color2}${memgraph 110,390 000000 98971a}${voffset -124}${font} -${color0}${offset 5}${top_mem name 1} ${alignr 10}${offset -13}${top_mem cpu 1}${offset 15}${top_mem mem 1} -${color0}${offset 5}${top_mem name 2} ${alignr 10}${offset -13}${top_mem cpu 2}${offset 15}${top_mem mem 2} -${color0}${offset 5}${top_mem name 3} ${alignr 10}${offset -13}${top_mem cpu 3}${offset 15}${top_mem mem 3} -${color0}${offset 5}${top_mem name 4} ${alignr 10}${offset -13}${top_mem cpu 4}${offset 15}${top_mem mem 4} -${color0}${offset 5}${top_mem name 5} ${alignr 10}${offset -13}${top_mem cpu 5}${offset 15}${top_mem mem 5}${if_match "${nodename_short}" == "mother"} -${color0}${hr}${font} -${color0}${font ConkySymbols:size=18}n${font :size=12:bold}${voffset -5} GPU${font}${goto 90}${nvidia modelname} @ ${nvidia gpufreq}MHz${alignr}${font :bold:}${nvidia gpuutil}%${font} -${color tomato}${offset 3}${nvidiagraph gpuutil 30,190 000000 FF6347} ${nvidiagraph mem 30,190 000000 FF6347} ${voffset 13} ${goto 25}${color0}GPU Usage: ${nvidia gpuutil}%${goto 215}${voffset -29}VRAM Usage: ${nvidia memutil}% -${color tomato}${offset 3}${nvidiagraph fanlevel 30,190 000000 FF6347} ${nvidiagraph temp 30,190 000000 FF6347} ${voffset 13} ${goto 25}${color0}Fan level: ${nvidia fanlevel}%${goto 215}${voffset -29}Temperature: ${nvidia temp}°C${endif} -${color4}${hr}${font} -${color4}${font ConkySymbols:size=18}k${font :size=15:bold}${voffset -5} FILE SYSTEMS${color0}${alignr}NVMe ${fs_used_perc /}%${if_match "${nodename_short}" == "mother"} | HDD ${fs_used_perc /var/hdd}%${endif}${font} -${voffset 5}${color4}${font2}NVMe ${goto 70}${fs_bar 8,200 /} ${color0}${font}${alignr}${fs_free /} / ${fs_size /}${if_match "${nodename_short}" == "mother"} -${color4}${font2}HDD ${goto 70}${fs_bar 8,200 /var/hdd} ${color0}${font}${alignr} ${fs_free /var/hdd} / ${fs_size /var/hdd}${if_existing /home/jozan/exthdd} -${color4}${font2}EXT ${goto 70}${fs_bar 8,200 /home/jozan/exthdd} ${color0}${font}${alignr}${fs_free /home/jozan/exthdd} / ${fs_size /home/jozan/exthdd}${endif}${if_existing /home/jozan/ceres} -${color4}${font2}CERES ${goto 70}${fs_bar 8,200 /home/jozan/ceres} ${color0}${font}${alignr}${fs_free /home/jozan/ceres} / ${fs_size /home/jozan/ceres}${endif}${endif}${if_match "${nodename_short}" == "po-rbo"} -${color4}${font2}STOC1 ${goto 70}${fs_bar 8,200 /home/r_bousset/stoc1} ${color0}${font}${alignr}${fs_free /home/r_bousset/stoc1} / ${fs_size /home/r_bousset/stoc1}${endif} -${color4}${offset 3}${diskiograph_read nvme0n1 30,190 000000 458588} ${diskiograph_write nvme0n1 30,190 000000 458588} ${voffset 13} ${goto 25}${color0}NVMe R: ${diskio_read nvme0n1}${goto 215}NVMe W: ${diskio_write nvme0n1}${voffset -29}${font}${if_match "${nodename_short}" == "mother"} -${color4}${offset 3}${diskiograph_read sdb1 30,190 000000 458588} ${diskiograph_write sdb1 30,190 000000 458588} ${voffset 13} ${goto 25}${color0}HDD R: ${diskio_read sdb1}${goto 215}HDD W: ${diskio_write sdb1}${voffset -29}${font}${endif} -${color5}${hr}${font} -${color5}${font ConkySymbols:size=18}i${font :size=15:bold} ${voffset -5}NETWORK${color0}${alignr}${execpi 5 ~/.local/bin/conky/net.sh}${if_match "${nodename_short}" == "mother"} -${color2}${offset 3}${downspeedgraph eth1 50,190 000000 81B562 128000000}${goto 205} ${color2}${upspeedgraph eth1 50,190 000000 4682B4 128000000} -${color0}${voffset -60}${offset 10}Download${goto 210}Upload${offset 10} -${offset 10} ${downspeed eth1} ${goto 210}${upspeed eth1}${endif}${if_match "${nodename_short}" == "po-rbo"} -${color2}${offset 3}${downspeedgraph enx34298f762de7 50,190 000000 98971a 128000000} ${color4}${upspeedgraph enx34298f762de7 50,190 000000 458588 128000000} -${color0}${voffset -60}${offset 10}Download${goto 210}Upload${offset 10} -${offset 10} ${downspeed enx34298f762de7} ${goto 210}${upspeed enx34298f762de7}${endif} -${color1}${hr}${font} -${color1}${font ConkySymbols:size=18:bold}l${font :size=15:bold:} ${voffset -5}TEMPERATURES ${goto 150}${font}${color0}${if_match "${nodename_short}" == "mother"} -${color1}${execbar sensors 2>/dev/null | grep CPUTIN | awk '{print $2}'} -${color LightBlue}${execbar sensors 2>/dev/null | grep fan1 | awk 'NR==1{print $2/35}'} -${color0}GPU: ${hwmon 3 temp 1}°C ${goto 150}Junc: ${hwmon 3 temp 2}°C${goto 260}GPU Fan${alignr}${hwmon 3 fan 1} RPM -${color EE4444}${execbar sensors 2>/dev/null | grep edge | awk '{print $2}'} -${color LightBlue}${execbar sensors 2>/dev/null | grep fan1 | awk 'NR==2{print $2/35}'} -${color0}Mobo: ${hwmon 2 temp 1}°C ${goto 110}Int.Fan: ${hwmon 2 fan 5} RPM${goto 260}Exh.Fan${alignr}${hwmon 2 fan 7} RPM -${color EE4444}${execbar sensors 2>/dev/null | grep SYSTIN | awk '{print $2}'} -${color LightBlue}${execbar sensors 2>/dev/null | grep fan2 | awk '{print $2/35}'} -${endif}${if_match "${nodename_short}" == "po-rbo"} -${voffset 5}${color1}${font2}CPU ${goto 70}${execbar sensors 2>/dev/null | grep Package | awk '{print $4}'} ${alignr}${color0}${font}${hwmon 5 temp 1}°C -${color1}${font2}NVMe ${goto 70}${color1}${execbar sensors 2>/dev/null | grep Composite | awk '{print $2}'} ${alignr}${color0}${font}${hwmon 3 temp 1}°C${endif} -]] diff --git a/.local/bin/conky/cover.sh b/.local/bin/conky/cover.sh deleted file mode 100755 index d9c9e8c..0000000 --- a/.local/bin/conky/cover.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh -# -# cover.sh - Download cover from Last.fm and overlay with image -# -# Florian <floriandejonckheere.be> -# -# bug: it detects the artist change twice - -## CONFIGURATION ## -# Folder for cached album art -# Don't use ~, as conky will treat it as a regular directory name -# CACHE="$HOME/.cache/covers" -# API Key for Last.fm -# APIKEY="b25b959554ed76058ac220b7b2e0a026" -# Log file, only for debugging purposes -# LOG=/tmp/conky-mpd.log -TMP=/tmp/conkympd.tmp - -# Check for vital commands -# CMD="mpc curl convert" -# for CHECK in $CMD; do -# [ ! "$CHECK" ] && echo "Command $CHECK not found. Exiting." && exit 1 -# done -# [ ! -d "$CACHE" ] && mkdir -p "$CACHE" - -playing="$(mpc --format '%artist% - %album%' | head -1)" - -[ ! -f $TMP ] && touch $TMP -[ "$(cat $TMP)" = "$playing" ] && exit 0 -# [ "$(cat $TMP)" = "$playing" ] && echo "Same artist/album" >> $LOG && exit 0 -# echo "Artist/album changed: $playing" >> $LOG - -#[ -f "/tmp/conkyCover.png" ] && rm "/tmp/conkyCover.png" -cp "$HOME"/.config/conky-mpd/nocover.png /tmp/conkyCover.png -# echo "NoCover" >> $LOG - -filedir="$(dirname "$XDG_MUSIC_DIR/$(mpc --format %file% | head -n1)")" -coverfile="$(find "$filedir" -maxdepth 1 -type f \( -iname 'cover.jpg' -o -iname 'cover.png' -o -iname 'folder.jpg' -o -iname 'folder.png' -o -iname '*.jpg' -o -iname '*.png' \) -print -quit)" -#COVER="$CACHE/$ARTIST - $ALBUM.jpg" -## Is cover cached? -#if [ ! -f "$COVER" ]; then -## Nope. Download. -# echo "Downloading cover for $ARTIST - $ALBUM" >> $LOG -# # Download XML info -# curl --data-urlencode artist="$ARTIST" --data-urlencode album="$ALBUM" "http://ws.audioscrobbler.com/2.0/?method=album.getinfo&api_key=$APIKEY" -o /tmp/lastfm.xml &> /dev/null -# echo "Exit: $?. Downloaded $(wc -l /tmp/lastfm.xml | cut -d' ' -f1) bytes." >> $LOG -# # Strip XML and download mega large cover to cache -# curl $(sed -n 's|<image size="mega">\(.*\)<\/image>|\1|p' /tmp/lastfm.xml) -o "$COVER" &> /dev/null -# echo "Exit: $?" >> $LOG -# echo "Downloaded to $COVER." >> $LOG -#fi -# Copy cache for processing -# echo "Copying $coverfile." >> $LOG -# cp "$COVER" /tmp/cover.jpg -# Downscale to fit overlay -# convert /tmp/cover.jpg -resize 366 /tmp/cover.png >> $LOG -## Enlarge canvas to fit overlay -#convert /tmp/cover.png -background none -extent 500x455-84-44 /tmp/cover.png >> $LOG -## Overlay overlay over cover -#convert /tmp/cover.png $HOME/.config/conky-mpd/case.png -composite /tmp/cover.png >> $LOG -## Resize for immediate use -# convert /tmp/cover.png -resize 120 /tmp/conkyCover.png >> $LOG -convert "$coverfile" -resize 100 /tmp/conkyCover.png # >> $LOG -## Set current artist -echo "$playing" > $TMP -#rm /tmp/cover.jpg /tmp/cover.png - diff --git a/.local/bin/conky/getif.sh b/.local/bin/conky/getif.sh deleted file mode 100755 index a4aff49..0000000 --- a/.local/bin/conky/getif.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -# ifconfig | command grep '^[a-z]' | awk '{print $1}' | sed '{/lo/d;s/://;}' - -case "$(hostname -s)" in - mother) - if_main="eth1" - if_alt="eth0" - ;; - po-rbo) - if_main="enx4ce1734c425a" - if_alt="wlp1s0" - ;; - mars) - if_main="em0" - if_alt="wlan0" - exit - ;; -esac - -if grep up "/sys/class/net/$if_main/operstate" >/dev/null 2>&1 && ! [ -z $(ifconfig $if_main 2>/dev/null | awk '/inet / {print $2}') ]; then - : -elif grep up "/sys/class/net/$if_alt/operstate" >/dev/null 2>&1 && ! [ -z $(ifconfig $if_alt 2>/dev/null | awk '/inet / {print $2}') ]; then - if_main=$if_alt -else - echo '${font1}NETWORK ${hr}${font} -${color #928374}No network${font}' - exit -fi - -echo -n $if_main diff --git a/.local/bin/conky/net.sh b/.local/bin/conky/net.sh deleted file mode 100755 index 4baf43b..0000000 --- a/.local/bin/conky/net.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh - -case "$(hostname -s)" in - mother) - if_main="eth1" - if_alt="eth0" - ;; - po-rbo) - if_main="enx34298f762de7" - if_alt="wlp1s0" - if_vpnssl="vpn0" - ;; - mars) - if_main="em0" - if_alt="wlan0" - exit - ;; -esac - -if_wg="wg0" -if [ -e "/sys/class/net/$if_wg/operstate" ] && ! [ -z $(ifconfig $if_wg 2>/dev/null | awk '/inet / {print $2}') ]; then - : -else - if_wg="" -fi - -if grep up "/sys/class/net/$if_main/operstate" >/dev/null 2>&1 && ! [ -z $(ifconfig $if_main 2>/dev/null | awk '/inet / {print $2}') ]; then - : -elif grep up "/sys/class/net/$if_alt/operstate" >/dev/null 2>&1 && ! [ -z $(ifconfig $if_alt 2>/dev/null | awk '/inet / {print $2}') ]; then - if_main=$if_alt -else - : -fi - -if [ -z $if_vpnssl ]; then - : -elif ! ip a | grep $if_vpnssl | grep UP >/dev/null 2>&1; then - if_vpnssl="" -fi - -echo $if_main'${font}' -[ -z $if_wg ] || echo '${color5}${font2}WireGuard ${color0}${font}ON${font}' -[ -z $if_wg ] || echo '${color5}${font2}WG IP ${color0}${font}${goto 80}${addr '$if_wg'}${font}' -[ -z $if_vpnssl ] || echo '${color5}${font2}Forti VPN-SSL ${color0}${font}ON${font}' -[ -z $if_vpnssl ] || echo '${color5}${font2}VPN IP ${color0}${font}${goto 80}${addr '$if_vpnssl'}${font}' -echo '${voffset 3}${color5}${font2}LAN IP ${color0}${font}${goto 80}${addr '$if_main'}${font}' -echo '${color5}${font2}DNS IP ${color0}${font}${goto 80}${nameserver 0}${if_match "${nameserver 1}" != ""}, ${nameserver 1}${endif}${font}' -echo '${color5}${font2}WAN IP ${color0}${font}${goto 80}${execi 15 curl -s https://ifconfig.me || echo No WAN}${font}' |
