Compare commits

..

No commits in common. "c10193bd139a3fe380265041117a16c8e3d2b9b7" and "e4c6dbeaa060d30177c6380ca0a24287104d32ae" have entirely different histories.

3 changed files with 17 additions and 12 deletions

View file

@ -1,5 +1,5 @@
alias mountws='sshfs greg@greg.workstreams.ch:/home/greg/ work/ws-dev/'
alias mountcloud='umount /home/raghnarok/work/ragcloud1/; sshfs debian@trolliet.info:/home/debian/ work/ragcloud1/'
alias mountcloud='sshfs debian@trolliet.info:/home/debian/ work/ragcloud1/'
alias syncMusic='rsync -av --delete /media/ragnas/music/ /media/HDD2/music_bck/'
alias syncHome='rsync -av --delete /media/ragnas/raghnarok/ /media/HDD1/raghnarok_bck/'

View file

@ -218,6 +218,3 @@ export PATH="$HOME/.cargo/bin:$PATH"
export PATH="$HOME/.local/bin:$PATH":
export EDITOR='vim'
# Install Ruby Gems to ~/gems
export GEM_HOME="$HOME/gems"
export PATH="$HOME/gems/bin:$PATH"

View file

@ -47,7 +47,8 @@ conky.text = [[
##############################################
#DATE
##############################################
#${color0}${font sans-serif:bold:size=8}DATE ${hr 2}$color
${color0}${font sans-serif:bold:size=8}DATE ${hr 2}$color
${alignc}${voffset 10}${alignc}${font Trebuchet MS:size=28}${time %H:%M:%S}${font}
${alignc}${alignc}${font Trebuchet MS:size=8}${time %a %d %b %Y}
#${alignc}Volume: ${exec ~/.config/conky/conky-volume.sh}%
@ -72,17 +73,20 @@ Core0: ${freq 0} Mhz ${exec sensors|grep 'Core 0'|awk '{print $3}'|cut -d "." -
${cpugraph cpu0 25,160 ff33ff 991f00} ${alignr}${cpugraph cpu1 25,160 ff33ff 991f00}
Core2: ${freq 2} Mhz ${exec sensors|grep 'Core 2'|awk '{print $3}'|cut -d "." -f 1} C ${alignr}Core3: ${freq 3} Mhz ${exec sensors|grep 'Core 3'|awk '{print $3}'|cut -d "." -f 1} C
${cpugraph cpu2 25,160 ff33ff 991f00} ${alignr}${cpugraph cpu3 25,160 ff33ff 991f00}
${top name 1} ${goto 120} ${top cpu 1} % ${goto 165}| ${top name 5} $alignr ${top cpu 5} %
${top name 2} ${goto 120} ${top cpu 2} % ${goto 165}| ${top name 6} $alignr ${top cpu 6} %
${top name 3} ${goto 120} ${top cpu 3} % ${goto 165}| ${top name 7} $alignr ${top cpu 7} %
${top name 4} ${goto 120} ${top cpu 4} % ${goto 165}| ${top name 8} $alignr ${top cpu 8} %
${top name 1}${alignr}${top cpu 1} %
${top name 2}${alignr}${top cpu 2} %
${top name 3}${alignr}${top cpu 3} %
${top name 4}${alignr}${top cpu 4} %
${top name 5}${alignr}${top cpu 5} %
##############################################
#MEMORY
##############################################
${color0}${font sans-serif:bold:size=8}MEMORY ${hr 2}$color
${font sans-serif:normal:size=8}Ram: $mem / $memmax ${goto 142}$memperc%${goto 175}Swap: $swap / $swapmax $alignr $swapperc%
${membar 8,160} ${alignr} ${swapbar 8,160}
${font sans-serif:normal:size=8}Ram: $alignc $mem / $memmax $alignr $memperc%
$membar
${font sans-serif:normal:size=8}Swap: $alignc $swap / $swapmax $alignr $swapperc%
$swapbar
${top_mem name 1}${alignr}${top mem 1} %
${top_mem name 2}${alignr}${top mem 2} %
${top_mem name 3}${alignr}${top mem 3} %
@ -111,11 +115,15 @@ ${fs_bar /media/ragnas/music/}
#NETWORK
##############################################
${color0}${font sans-serif:bold:size=8}NETWORK ${hr 2}$color
${font sans-serif:normal:size=8}Private ${if_existing /proc/net/route enp0s31f6}${addr enp0s31f6}${else}${if_existing /proc/net/route enp0s31f6}${addr enp0s31f6}${else}Network disconnected${endif}${endif} $alignr Public v4 ${execi 600 curl -s ipv4.icanhazip.com}
${font sans-serif:normal:size=8}Private ${if_existing /proc/net/route enp0s31f6}${addr enp0s31f6}${else}${if_existing /proc/net/route enp0s31f6}${addr enp0s31f6}${else}Network disconnected${endif}${endif}
Public v4 ${execi 600 curl -s ipv4.icanhazip.com}
Public v6 ${execi 600 curl -s ipv6.icanhazip.com}
Down: ${downspeed enp0s31f6}/s $alignr Up: ${upspeed enp0s31f6}/s
Total: ${totaldown enp0s31f6} $alignr Total: ${totalup enp0s31f6}
${downspeedgraph enp0s31f6 25,160 99cc33 006600}$alignr${upspeedgraph enp0s31f6 25,160 ffcc00 ff0000}
#${color0}${font sans-serif:bold:size=8}GEOIP ${hr 2}$color
##############################################
##############################################
#MUSIC
#Credit to Reddit user: /u/Rioku_jk