Merge laptop && PC

etc/shell/bash/bashrc

@@ -1,6 +1,6 @@
 #!/bin/bash ####################################################################
 #
-# Изменён: Чт 12 апр 2018 17:03:57
+# Изменён: Чт 12 апр 2018 18:25:11
 #
 ################################################################################
 
@@ -57,6 +57,9 @@ export TMP="/tmp"				#Директория временных файлов
 
 export JAVA_HOME="/usr/lib/jvm/oracle-jdk-bin-1.8/"
 
+#Настройки nnn
+export NN_USE_EDITOR=1
+
 #Настройки cw
 export NOCOLOR_PIPE=1
 #export CW_INVERT=1

etc/soft/conky/conkyrc.AuthenticAMD

@@ -1,6 +1,6 @@
 background yes
 use_xft yes 
-xftfont DejaVu Sans Mono:size=9
+xftfont DejaVuSansMono Nerd Font Mono:size=9
 xftalpha 1
 update_interval 2.0
 total_run_times 0
@@ -40,19 +40,28 @@ TEXT
 	| cut -f 2- -d ' ' \
 	| sed -e :a -e '$b;N;s/\n/ | /;ba' \
 	| sed 's/- //g;s/\*/✻/g'
-} ]${offset 55}\
+} ]${offset 75}\
 ${if_mounted /}$color /: ${color brown}${fs_free /}${endif}\
 ${if_mounted /home}$color | home: ${color brown}${fs_free /home/maks}${endif}\
 ${if_mounted /mnt/DATA}$color | data: ${color brown}${fs_free /mnt/DATA}${endif}\
 ${if_mounted /mnt/WINDOWS}$color | windows: ${color brown}${fs_free /mnt/WINDOWS}${endif}\
 ${if_mounted /mnt/FLASH}$color | flash: ${color brown}${fs_free /mnt/FLASH}${endif}\
 #${if_mpd_playing}${offset 50}${color darkgreen}[$mpd_smart - $mpd_length/$mpd_percent%]$color${endif}
-${goto 1050}\
+$alignr\
-${color darkred} ${execi 86400 dates >/dev/null && echo "[✻] " || echo ""}$color\
+${color darkred} ${execi 86400 dates >/dev/null && echo " " || echo ""}$color\
-${if_match ${battery_percent BAT0} <= 20}${color red}${endif}\
+\
+${if_match ${battery_percent BAT0} <= 20}\
+${color red} \
+${else}${if_match ${battery_percent BAT0} <= 60}\
+${color brown} \
+${else}\
+${color darkgreen} \
+${endif}\
+${endif}\
 ${battery_percent BAT0}%$color |\
-${color darkred}$color ${execi 60 cat $MD/new}$color | \
+\
+${color darkred}$color  ${execi 60 cat $MD/new}$color | \
 ${color darkblue}[${execi 2 SHELL=/bin/sh skb 1}]$color | \
-${color darkgreen}${execi 5 amixer get Master | grep -o '\[..*%\]' -m 1}$color | \
+${color darkgreen}墳 ${execi 5 amixer get Master | grep -o '\[..*%\]' -m 1 | sed 's/\[\|\]//g'}$color | \
-${color black}${time %H:%M} (${time %d.%m.%Y}) 
+${color black} ${time %H:%M} |  ${time %d/%m}