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

etc/shell/bash/bashrc_linux

@@ -4,6 +4,7 @@ path++ $SHELLRC/etc/shell/cw/def                               PATH
 path++ $SHELLRC/bin/app:$SHELLRC/bin/dmenu:$SHELLRC/bin/musca:$SHELLRC/bin/exec PATH
 
 path++ $SHELLRC/bin:$SHELLRC/bin/scripts PATH
+path++ $HOME/.local/bin                  PATH
 path++ /bin:/usr/bin:/usr/local/bin      PATH
 
 # Настройки оболочки

etc/soft/git/gitconfig

@@ -43,7 +43,7 @@
 	co = checkout
 
 	lf = log --source --graph --stat --date=iso --pretty=medium --decorate=full
-	ls = log --graph --pretty=format:'%Cred%h%Creset - %Cgreen[%cd]%Creset ::%C(yellow)%d%Creset %s %C(bold blue)<%an>%Creset' --abbrev-commit --date=short
+	ls = log --graph --pretty=format:'%Cred%h%Creset - %Cgreen[%cd]%Creset ::%C(yellow)%d%Creset %s %C(bold blue)<%ae>%Creset' --abbrev-commit --date=short
 	ll = !git --no-pager log -1 HEAD && echo
 	lu = !git --no-pager log --left-right --pretty=format:'%C(yellow)%h%Creset - %Cgreen[%cd]%Creset :: %s %C(bold blue)%Creset' --abbrev-commit --graph --color --date=short origin/master...HEAD | nl
 

etc/soft/vifm/filetypes

@@ -24,7 +24,8 @@ filetype *.txt nvim %f
 " img
 filextype *.bmp,*.jpg,*.jpeg,*.png,*.gif sxiv %c %d/
 filextype *.svg sensible-browser %f &
-fileviewer *.jpg,*.png lsimg %d/%f %q %pc
+" fileviewer *.jpg,*.png lsimg %d/%f %q %pc
+fileviewer *.jpg,*.png exiv2 %f
 
 " audio
 filextype *.mp3,*.wav,*.flac,*.ogg,*.m4a vlc %f &