Merge branch 'master' of https://notabug.org/envrm/shellrc

etc/shell/bash/aliases

@@ -48,7 +48,7 @@ alias dirs="dirs -v"							#noindex
 alias ping="pingp --nolegend"						#noindex
 alias gq="geeqie . &"							#noindex
 alias emerge="emerge --ask"						#noindex
-alias eww='emerge --update --newuse --deep --with-bdeps=y --complete-graph=y --keep-going=y -av -t @world' #noindex
+alias eww='emerge --update --newuse --deep --with-bdeps=y --complete-graph=y --keep-going=y -av --verbose-conflicts -t @world' #noindex
 alias xlock="i3lock -i $SHELLRC/etc/wm/locker.png"			#noindex
 
 #- Замена стандартных путей для конфигурационных файлов

etc/soft/packages.list

@@ -21,4 +21,5 @@ xst https://github.com/gnotclub/xst
 nerd-fonts https://github.com/ryanoasis/nerd-fonts
 ufed
 cpg, mvg https://github.com/mrdrogdrog/advcpmv
+convmv