From 55deb10213819885fef9f9ac847450f6f42dc77e Mon Sep 17 00:00:00 2001 From: Maxim Likhachev Date: Sat, 23 Feb 2019 17:30:56 +0500 Subject: [PATCH 1/4] =?UTF-8?q?nvim=20=D0=BF=D0=BE=20=D1=83=D0=BC=D0=BE?= =?UTF-8?q?=D0=BB=D1=87=D0=B0=D0=BD=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- etc/shell/bash/bashrc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/shell/bash/bashrc b/etc/shell/bash/bashrc index 9cf2134..5b23cca 100755 --- a/etc/shell/bash/bashrc +++ b/etc/shell/bash/bashrc @@ -1,6 +1,6 @@ #!/bin/bash #################################################################### # -# Изменён: Ср 09 янв 2019 19:36:28 +# Изменён: Пн 28 янв 2019 21:13:14 # ################################################################################ @@ -29,8 +29,8 @@ export GUILE_HISTORY="$SHELLRC/var/shell/guile.history" #История guile export GUILE_AUTO_COMPILE=0 #Запрет на автокомпиляцию export PAGER=less #Страничный просмотрщик -export VISUAL=vim #Стандартный редактор -export EDITOR=vim #Стандартный редактор +export VISUAL=nvim #Стандартный редактор +export EDITOR=nvim #Стандартный редактор export HELPSRC=() From b6d44e6a815ddd36654348721bff986ac6d9d823 Mon Sep 17 00:00:00 2001 From: Maxim Likhachev Date: Sat, 23 Feb 2019 18:11:50 +0500 Subject: [PATCH 2/4] root PATH: fix --- etc/shell/bash/bashrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/etc/shell/bash/bashrc b/etc/shell/bash/bashrc index 61791b0..63dd068 100755 --- a/etc/shell/bash/bashrc +++ b/etc/shell/bash/bashrc @@ -1,6 +1,6 @@ #!/bin/bash #################################################################### # -# Изменён: Сб 23 фев 2019 17:31:37 +# Изменён: Сб 23 фев 2019 18:10:48 # ################################################################################ @@ -173,6 +173,7 @@ if [ $UID -eq 0 ]; then PROMPT_COLOR='\033[1;31m' export HOME=/root + path++ $INIT_PATH PATH path++ /sbin PATH path++ /usr/sbin PATH path++ /usr/local/sbin PATH From 547bb9b9c8a999d4cea6237cec8ccffdf968650b Mon Sep 17 00:00:00 2001 From: Maxim Likhachev Date: Tue, 5 Mar 2019 13:26:10 +0300 Subject: [PATCH 3/4] macos: add Applications in PATH --- etc/shell/bash/aliases_macos | 1 + etc/shell/bash/bashrc_macos | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/etc/shell/bash/aliases_macos b/etc/shell/bash/aliases_macos index 9fd53db..08a31c7 100644 --- a/etc/shell/bash/aliases_macos +++ b/etc/shell/bash/aliases_macos @@ -2,4 +2,5 @@ alias ls='ls -lGhpv --color=always --group-directories-first' #noindex alias lsl='ls -L' #noindex alias lst='ls -al --time-style=+%D | grep $(\date +%D)' #noindex +alias vcat='bat --theme GitHub -n' #noindex diff --git a/etc/shell/bash/bashrc_macos b/etc/shell/bash/bashrc_macos index 194eed1..bba5108 100644 --- a/etc/shell/bash/bashrc_macos +++ b/etc/shell/bash/bashrc_macos @@ -1,4 +1,4 @@ -PATH="/usr/local/opt/coreutils/libexec/gnubin/:$PATH" +PATH="/usr/local/opt/coreutils/libexec/gnubin/:/Applications/:$PATH" [[ -f $BASHRC/aliases_macos ]] && MACOS_ALIASES="$BASHRC/aliases_macos" \ && . $MACOS_ALIASES \ From c0142b7ab81ee29147d38d50bfd0ff36e890013e Mon Sep 17 00:00:00 2001 From: Maxim Likhachev Date: Tue, 5 Mar 2019 13:42:45 +0300 Subject: [PATCH 4/4] =?UTF-8?q?ealiases:=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA?= =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B2?= =?UTF-8?q?=D1=81=D0=B5=D1=85=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2=20?= =?UTF-8?q?=D1=81=20=D0=BF=D1=81=D0=B5=D0=B2=D0=B4=D0=BE=D0=BD=D0=B8=D0=BC?= =?UTF-8?q?=D0=B0=D0=BC=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- etc/shell/bash/aliases | 5 ++++- etc/shell/bash/bashrc | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/etc/shell/bash/aliases b/etc/shell/bash/aliases index 23b2aea..c50c97a 100755 --- a/etc/shell/bash/aliases +++ b/etc/shell/bash/aliases @@ -96,7 +96,10 @@ nh() { } #- Правка псевдонимов в Vim -alias ealias="$EDITOR $ALIASES" #noindex +function ealias() { #noindex + $EDITOR ${HELPSRC[*]} +} + #- Перезагрузка конфигов баша alias reload=". ~/.bashrc" #noindex #- Перезагрузка конфигов X.org diff --git a/etc/shell/bash/bashrc b/etc/shell/bash/bashrc index 63dd068..1ebc130 100755 --- a/etc/shell/bash/bashrc +++ b/etc/shell/bash/bashrc @@ -1,6 +1,6 @@ #!/bin/bash #################################################################### # -# Изменён: Сб 23 фев 2019 18:10:48 +# Изменён: вт 05 мар 2019 13:35:59 # ################################################################################ @@ -29,8 +29,8 @@ export GUILE_HISTORY="$SHELLRC/var/shell/guile.history" #История guile export GUILE_AUTO_COMPILE=0 #Запрет на автокомпиляцию export PAGER=less #Страничный просмотрщик -export VISUAL=nvim #Стандартный редактор -export EDITOR=nvim #Стандартный редактор +export VISUAL="nvim -p" #Стандартный редактор +export EDITOR="nvim -p" #Стандартный редактор export HELPSRC=()