Merge branch 'master' of https://code.envrm.info/src/shellrc

etc/X/xbindkeysrc.GenuineIntel

@@ -1,6 +1,6 @@
 # xbindkeysrc.GehuineIntel
 #
-# Изменён: Сб 18 янв 2020 17:58:28
+# Изменён: Пт 14 фев 2020 13:30:11
 #
 
 #ACPI#{{{
@@ -40,11 +40,14 @@
 	m:0x10 + c:107
         Mod2 + Print
 
-#"calculator"
-#Mod4 + equal
+"calculator"
+	Alt + c
 
 "writeup"
-        Mod4 + e
+        Alt + e
+
+"www"
+        Alt + n
 
 #}}}
 

etc/shell/bash/bashrc_linux

@@ -16,5 +16,14 @@ path++ /bin:/usr/bin:/usr/local/bin                       PATH
 # export LS_COLORS=$($BASHRC/ls_colors_generator.py)
 export LS_COLORS=$(cat $BASHRC/ls_colors_generated)
 
-PS1="$PROMPT_COLOR┌─[$yellow\h$PROMPT_COLOR]─(${yellow}\j${PROMPT_COLOR})$PROMPT_SHH─[$yellow\w$PROMPT_COLOR]\n$PROMPT_COLOR└─[$PROMPT_COLOR\t]\$ $rstc"
+PS1_JOBS="${PROMPT_COLOR}┌─(${yellow}\j${PROMPT_COLOR})"
+PS1_HOST="─[${yellow}\h${PROMPT_COLOR}]${PROMPT_SHH}"
+PS1_CWD="─[${red}${VIFM_SHELL}${yellow}\w${PROMPT_COLOR}]\n"
+
+PS1_LINE1="${PS1_JOBS}${PS1_HOST}${PS1_CWD}"
+PS1_LINE2="${PROMPT_COLOR}─[${PROMPT_COLOR}\t]\$ $rstc"
+
+PS1="${PS1_LINE1}${PS1_LINE2}"
+
+unset PS1_JOBS PS1_HOST PS1_CWD PS1_LINE1 PS1_LINE2
 

etc/shell/bash/inputrc

@@ -43,8 +43,7 @@ set convert-meta Off
 set output-meta On
 
 #Горизонтальная сортировка автодополнения
-# set print-completions-horizontally On
-set horizontal-scroll-mode On
+set print-completions-horizontally On
 
 #Игнорирование регистра при автодополнении
 set completion-ignore-case On
@@ -81,10 +80,6 @@ set match-hidden-files Off
 #Автоматическая подстановка директорий в cd
 # set autocd on
 
-set editing-mode vi
-set keymap vi-command
-set show-mode-in-prompt off
-
 # Color files by types
 set colored-stats On
 # Append char to indicate type
@@ -94,3 +89,12 @@ set mark-symlinked-directories On
 # Color the common prefix in menu-complete
 set menu-complete-display-prefix On
 
+#### VI MODE
+
+set editing-mode vi
+set keymap vi-command
+set show-mode-in-prompt on
+
+set vi-ins-mode-string "\1\e[32;1m\2└─\1\e[34;1m\2(I)\1\e[0m\2"
+set vi-cmd-mode-string "\1\e[32;1m\2└─\1\e[31;1m\2[N]\1\e[0m\2"
+

etc/soft/git/gitconfig

@@ -52,7 +52,7 @@
 	# ----[ COMMON ]--------------------------------------------------------
 
 	br = branch   #noindex
-	st = status   #noindex
+	st = -c color.status=always status --branch --short  #noindex
 	df = diff     #noindex
 
 	# Коммит

etc/soft/vifm/vifmrc

@@ -55,6 +55,8 @@ set statusline="  %t %T%= %1* 廬%A %2*  %u:%-g %3*%7E %4* %5*%14d %6*
 
 set slowfs=curlftpfs
 
+let $VIFM_SHELL = 'VIFM: '
+
 source ~/.vifm/marks
 source ~/.vifm/filetypes
 source ~/.vifm/commands