From 9b377706c89db24d975301d3a31af5450f36b0c8 Mon Sep 17 00:00:00 2001 From: Akamaru Date: Sun, 10 Jul 2016 14:19:51 +0200 Subject: [PATCH] RSS and WLAN removed & changed fs_used to fs_free + few fixes --- .conky/rss.pl | 63 --------------------------------------------------- .conkyrc | 35 +++++++++++++--------------- .gitignore | 1 + 3 files changed, 17 insertions(+), 82 deletions(-) delete mode 100644 .conky/rss.pl create mode 100644 .gitignore diff --git a/.conky/rss.pl b/.conky/rss.pl deleted file mode 100644 index 2a77ffe..0000000 --- a/.conky/rss.pl +++ /dev/null @@ -1,63 +0,0 @@ -#!/usr/bin/perl -w - -############################ -# Creator: Jeff Israel // modified by Akamaru (https://PonyWave.de) -# -# Script: ./simple-rss-reader-v3.pl -# Version: 3.001 -# -# Coded for for Wikihowto http://howto.wikia.com -# -# Description: This code downloads an RSS feed, -# extracts the lines, -# cleans them up lines, -# prints the pretty lines -# exits on max-lines -# Usage: -# .conkyrc: ${execi [time] /path/to/script/simple-rss-reader-v3.pl} -# -# Usage Example -# ${execi 300 /path/to/script/simple-rss-reader-v3.pl} -# - -use LWP::Simple; - - -############################ -# Configs -# - -#$rssPage = "http://tvrss.net/feed/combined/"; -$rssPage = "http://yagyuu.local/rss/atom.xml"; -$numLines = 5; -$maxTitleLenght = 55; - -########################### -# Code -# - -# Downloading RSS feed -my $pageCont = get($rssPage); - -# Spliting the page to lines -@pageLines = split(/\n/,$pageCont); - -# Parse each line, strip no-fun data, exit on max-lines -$numLines--; #correcting count for loop -$x = 0; -foreach $line (@pageLines) { - if($line =~ /\<title\>/){ # Is a good line? - #print "- $line\n"; - $lineCat = $line; - $lineCat =~ s/.*\<title\>//; - $lineCat =~ s/\<\/title\>.*//; - $lineCat =~ s/\[.{4,25}\]$//; # strip no-fun data ( [from blaaa] ) - $lineCat = substr($lineCat, 0, $maxTitleLenght); - print "- $lineCat \n"; - $x++; - } - if($x > $numLines) { - last; #exit on max-lines - } - -} \ No newline at end of file diff --git a/.conkyrc b/.conkyrc index 763839c..7da5c95 100644 --- a/.conkyrc +++ b/.conkyrc @@ -47,11 +47,14 @@ color4 ADADAD color5 636363 TEXT +${image ~/.conky/Naira.png -p 245,5 -s 75x75} +${image ~/.conky/Yagyuu.png -p 5,5 -s 75x75} ${color2}${font :Bold:size=12} $alignc ${time %H}:${time %M}:${time %S} Uhr ${color2}${font :Bold:size=12} $alignc ${time %d}. ${time %B} ${time %Y}${font :Bold:size=08} ${color2}$alignc${time %A} ${color2}$alignc Uptime $uptime ${color2}$alignc $sysname | $kernel | $nodename | $machine + ${color0}CPU & Memory $hr: ${color2}CPU Auslastung${color1}$alignr${cpubar 8,130} ${color2}$cpu%@${freq_g cpu}GHz ${color1}${cpugraph 15,320 000000 ff0000} @@ -66,23 +69,17 @@ ${color5}${top name 3}$alignr${top cpu 3} ${top mem 3} ${color5}${top name 4}$alignr${top cpu 4} ${top mem 4} ${color5}${top name 5}$alignr${top cpu 5} ${top mem 5} -${color2}Festplatten Größe Benutzt -${color2}Root${color1}(${fs_type /})${alignr}${color3}${fs_size /}>${color4}${fs_used /}${color1}${alignr}${fs_bar 8,75 /} ${color2}(${fs_used_perc /}%) -${color2}Glurak${color1}(${fs_type /home/akamaru/Festplatten/Glurak/})${alignr}${color3}${fs_size /home/akamaru/Festplatten/Glurak/}>${color4}${fs_used /home/akamaru/Festplatten/Glurak/}${color1}${alignr}${fs_bar 8,75 /home/akamaru/Festplatten/Glurak/} ${color2}(${fs_used_perc /home/akamaru/Festplatten/Glurak/}%) -${color2}Karnimani${color1}(${fs_type /home/akamaru/Festplatten/Karnimani/})${alignr}${color3}${fs_size /home/akamaru/Festplatten/Karnimani/}>${color4}${fs_used /home/akamaru/Festplatten/Karnimani/}${color1}${alignr}${fs_bar 8,75 /home/akamaru/Festplatten/Karnimani/} ${color2}(${fs_used_perc /home/akamaru/Festplatten/Karnimani/}%) -${color2}Mautzi${color1}(${fs_type /home/akamaru/Festplatten/Karnimani/})${alignr}${color3}${fs_size /home/akamaru/Festplatten/Mautzi/}>${color4}${fs_used /home/akamaru/Festplatten/Mautzi/}${color1}${alignr}${fs_bar 8,75 /home/akamaru/Festplatten/Mautzi/} ${color2}(${fs_used_perc /home/akamaru/Festplatten/Mautzi/}%) -${color2}Pikachu${color1}(${fs_type /home/akamaru/Festplatten/Pikachu/})${alignr}${color3}${fs_size /home/akamaru/Festplatten/Pikachu/}>${color4}${fs_used /home/akamaru/Festplatten/Pikachu/}${color1}${alignr}${fs_bar 8,75 /home/akamaru/Festplatten/Pikachu/} ${color2}(${fs_used_perc /home/akamaru/Festplatten/Pikachu/}%) -${color0}RSS $hr: -${color2}${execi 1 /home/akamaru/.conky/rss.pl} -${color0}Netzwerk $hr: -${color4}WLAN${color2} ${alignr}${color2}IP ${addr wlp3s0} -${color2}Download ${downspeed wlp3s0}/s ${alignr} $alignr Upload ${upspeed wlp3s0}/s -${color1}${downspeedgraph wlp3s0 15,140} ${alignr}${upspeedgraph wlp3s0 15,140} -${color2}Total Download ${totaldown wlp3s0} ${alignr}Total Upload ${totalup wlp3s0} +${color2}Festplatten Größe Frei +${color2}Root${color1}(${fs_type /})${alignr}${color3}${fs_size /}>${color4}${fs_free /}${color1}${alignr}${fs_bar 8,75 /} ${color2}(${fs_used_perc /}%) +${color2}Dragoran${color1}(${fs_type /home/akamaru/Festplatten/Dragoran/})${alignr}${color3}${fs_size /home/akamaru/Festplatten/Dragoran/}>${color4}${fs_free /home/akamaru/Festplatten/Dragoran/}${color1}${alignr}${fs_bar 8,75 /home/akamaru/Festplatten/Dragoran/} ${color2}(${fs_used_perc /home/akamaru/Festplatten/Dragoran/}%) +${color2}Glurak${color1}(${fs_type /home/akamaru/Festplatten/Glurak/})${alignr}${color3}${fs_size /home/akamaru/Festplatten/Glurak/}>${color4}${fs_free /home/akamaru/Festplatten/Glurak/}${color1}${alignr}${fs_bar 8,75 /home/akamaru/Festplatten/Glurak/} ${color2}(${fs_used_perc /home/akamaru/Festplatten/Glurak/}%) +${color2}Karnimani${color1}(${fs_type /home/akamaru/Festplatten/Karnimani/})${alignr}${color3}${fs_size /home/akamaru/Festplatten/Karnimani/}>${color4}${fs_free /home/akamaru/Festplatten/Karnimani/}${color1}${alignr}${fs_bar 8,75 /home/akamaru/Festplatten/Karnimani/} ${color2}(${fs_used_perc /home/akamaru/Festplatten/Karnimani/}%) +${color2}Mauzi${color1}(${fs_type /home/akamaru/Festplatten/Karnimani/})${alignr}${color3}${fs_size /home/akamaru/Festplatten/Mauzi/}>${color4}${fs_free /home/akamaru/Festplatten/Mauzi/}${color1}${alignr}${fs_bar 8,75 /home/akamaru/Festplatten/Mauzi/} ${color2}(${fs_used_perc /home/akamaru/Festplatten/Mauzi/}%) +${color2}Pikachu${color1}(${fs_type /home/akamaru/Festplatten/Pikachu/})${alignr}${color3}${fs_size /home/akamaru/Festplatten/Pikachu/}>${color4}${fs_free /home/akamaru/Festplatten/Pikachu/}${color1}${alignr}${fs_bar 8,75 /home/akamaru/Festplatten/Pikachu/} ${color2}(${fs_used_perc /home/akamaru/Festplatten/Pikachu/}%) + +${color0}Netzwerk $hr: +${color4}LAN${color2} ${alignr}${color2}IP ${addr enp2s0} +${color2}Download ${downspeed enp2s0}/s ${alignr} $alignr Upload ${upspeed enp2s0}/s +${color1}${downspeedgraph enp2s0 15,140} ${alignr}${upspeedgraph enp2s0 15,140} +${color2}Total Download ${totaldown enp2s0} ${alignr}Total Upload ${totalup enp2s0} -${color4}LAN${color2} ${alignr}${color2}IP ${addr enp4s0} -${color2}Download ${downspeed enp4s0}/s ${alignr} $alignr Upload ${upspeed enp4s0}/s -${color1}${downspeedgraph enp4s0 15,140} ${alignr}${upspeedgraph enp4s0 15,140} -${color2}Total Download ${totaldown enp4s0} ${alignr}Total Upload ${totalup enp4s0} -${image ~/.conky/Naira.png -p 245,5 -s 75x75} -${image ~/.conky/Yagyuu.png -p 5,5 -s 75x75} \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3997bea --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.db \ No newline at end of file