From e4454cc3c4e761878df22eb5aa8279b08e9c136d Mon Sep 17 00:00:00 2001 From: Maxim Likhachev Date: Tue, 18 Feb 2020 14:48:58 +0300 Subject: [PATCH 1/4] xbindkeys: ++writeup, www --- etc/X/xbindkeysrc.GenuineIntel | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/etc/X/xbindkeysrc.GenuineIntel b/etc/X/xbindkeysrc.GenuineIntel index 151e70f..b4396fa 100644 --- a/etc/X/xbindkeysrc.GenuineIntel +++ b/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 #}}} From a0623df37f32451978ac5f69fd44b1eaf7348bc2 Mon Sep 17 00:00:00 2001 From: Maxim Likhachev Date: Tue, 18 Feb 2020 14:50:18 +0300 Subject: [PATCH 2/4] =?UTF-8?q?bash:=20=D0=9D=D0=B0=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=BE=D0=B5=D0=BD=20=D0=B8=D0=BD=D0=B4=D0=B8=D0=BA=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=20=D1=80=D0=B5=D0=B6=D0=B8=D0=BC=D0=B0=20vi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- etc/shell/bash/bashrc_linux | 2 +- etc/shell/bash/inputrc | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/etc/shell/bash/bashrc_linux b/etc/shell/bash/bashrc_linux index 1b0de4d..68b9f87 100644 --- a/etc/shell/bash/bashrc_linux +++ b/etc/shell/bash/bashrc_linux @@ -16,5 +16,5 @@ 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="$PROMPT_COLOR┌─(${yellow}\j${PROMPT_COLOR})─[$yellow\h$PROMPT_COLOR]$PROMPT_SHH─[$yellow\w$PROMPT_COLOR]\n$PROMPT_COLOR─[$PROMPT_COLOR\t]\$ $rstc" diff --git a/etc/shell/bash/inputrc b/etc/shell/bash/inputrc index 8ab3278..f5ef703 100644 --- a/etc/shell/bash/inputrc +++ b/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" + From dc43f48ee5bf0938f5f6439650935618f1114e0f Mon Sep 17 00:00:00 2001 From: Maxim Likhachev Date: Tue, 18 Feb 2020 15:10:02 +0300 Subject: [PATCH 3/4] =?UTF-8?q?bash,=20vifm:=20=D0=98=D0=BD=D0=B4=D0=B8?= =?UTF-8?q?=D0=BA=D0=B0=D1=86=D0=B8=D1=8F=20vifm-=D0=BE=D0=B1=D0=BE=D0=BB?= =?UTF-8?q?=D0=BE=D1=87=D0=BA=D0=B8=20=D0=B2=20prompt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- etc/shell/bash/bashrc_linux | 11 ++++++++++- etc/soft/vifm/vifmrc | 2 ++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/etc/shell/bash/bashrc_linux b/etc/shell/bash/bashrc_linux index 68b9f87..3b660e5 100644 --- a/etc/shell/bash/bashrc_linux +++ b/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}\j${PROMPT_COLOR})─[$yellow\h$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 diff --git a/etc/soft/vifm/vifmrc b/etc/soft/vifm/vifmrc index e79104a..38f515c 100644 --- a/etc/soft/vifm/vifmrc +++ b/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 From 184c5d3ce1efd3c3aa2c833b21e60d75ecb83ba0 Mon Sep 17 00:00:00 2001 From: Maxim Likhachev Date: Tue, 18 Feb 2020 15:34:00 +0300 Subject: [PATCH 4/4] =?UTF-8?q?git:=20st=20--=20=D0=BA=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BA=D0=B8=D0=B9=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D1=81?= =?UTF-8?q?=D1=82=D0=B0=D1=82=D1=83=D1=81=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- etc/soft/git/gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/soft/git/gitconfig b/etc/soft/git/gitconfig index 0345cc2..60a3c71 100644 --- a/etc/soft/git/gitconfig +++ b/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 # Коммит