From c94bcc19de4aea8467bdda615d2a02e62c2681aa Mon Sep 17 00:00:00 2001
From: Dmitry Dementev <me@dementev.space>
Date: Sat, 21 Feb 2026 18:53:53 +0300
Subject: [PATCH] =?UTF-8?q?refactor(bash):=20=D1=80=D0=B5=D0=BE=D1=80?=
 =?UTF-8?q?=D0=B3=D0=B0=D0=BD=D0=B8=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82=D1=83=D1=80=D0=B0=20bash-?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D1=83=D1=80=D0=B0=D1=86?=
 =?UTF-8?q?=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Зачем: улучшение читаемости и модульности конфигурации bash.
Что: удалён монолитный .bashrc, создан модульный .bash_custom с секциями (настройки, PATH, алиасы, функции, модули), добавлена функция git для изоляции от прокси, оптимизирован порядок загрузки модулей.
Проверка: source ~/.bash_custom, проверить git, алиасы (ll, la), prompt.
---
 bash/.bash_custom |  81 +++++++++++++++++++++++++
 bash/.bashrc      | 147 ----------------------------------------------
 2 files changed, 81 insertions(+), 147 deletions(-)
 create mode 100644 bash/.bash_custom
 delete mode 100644 bash/.bashrc

diff --git a/bash/.bash_custom b/bash/.bash_custom
new file mode 100644
index 0000000..bdc6551
--- /dev/null
+++ b/bash/.bash_custom
@@ -0,0 +1,81 @@
+# ==============================================================================
+# 1. БАЗОВЫЕ НАСТРОЙКИ SHELL
+# ==============================================================================
+
+# Прерываем выполнение, если shell не интерактивный (например, скрипты)
+case $- in
+    *i*) ;;
+      *) return;;
+esac
+
+# Настройки истории команд
+HISTCONTROL=ignoreboth          # Игнорировать дубликаты и команды с пробелом в начале
+shopt -s histappend             # Дописывать историю, а не перезаписывать файл
+HISTSIZE=10000                  # Увеличиваем размер истории в памяти
+HISTFILESIZE=20000              # Увеличиваем размер истории в файле
+HISTTIMEFORMAT="%F %T "         # (Опционально) Добавляет дату и время к командам в history
+
+# Обновлять переменные LINES и COLUMNS после каждой команды (полезно при ресайзе окон)
+shopt -s checkwinsize
+
+# ==============================================================================
+# 2. ПЕРЕМЕННЫЕ ОКРУЖЕНИЯ И ПУТИ (PATH)
+# ==============================================================================
+
+# Собираем PATH в одном месте
+export PATH="/snap/bin:$PATH"
+export PATH="$HOME/.local/bin:$PATH"       # Для uv и других локальных бинарников
+export PATH="$HOME/.npm-global/bin:$PATH"  # Для глобальных npm пакетов
+
+# ==============================================================================
+# 3. АЛИАСЫ И УТИЛИТЫ
+# ==============================================================================
+
+# Включаем цвета для стандартных утилит
+if [ -x /usr/bin/dircolors ]; then
+    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+    alias ls='ls --color=auto'
+    alias grep='grep --color=auto'
+    alias fgrep='fgrep --color=auto'
+    alias egrep='egrep --color=auto'
+fi
+
+# Навигация
+alias ll='ls -alF'
+alias la='ls -A'
+alias l='ls -CF'
+
+# ==============================================================================
+# 4. ФУНКЦИИ И ИЗОЛЯЦИЯ
+# ==============================================================================
+
+# Изолируем Git от глобальных прокси
+git() {
+    http_proxy= https_proxy= HTTP_PROXY= HTTPS_PROXY= ALL_PROXY= all_proxy= command git "$@"
+}
+
+# ==============================================================================
+# 5. ПОДКЛЮЧЕНИЕ ВНЕШНИХ МОДУЛЕЙ И СЕКРЕТОВ
+# ==============================================================================
+
+# Автодополнение (Bash Autocompletion)
+if ! shopt -oq posix; then
+  if [ -f /usr/share/bash-completion/bash_completion ]; then
+    . /usr/share/bash-completion/bash_completion
+  elif [ -f /etc/bash_completion ]; then
+    . /etc/bash_completion
+  fi
+fi
+
+# NVM (Node Version Manager)
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
+
+# Пользовательские конфиги (идут в Stow)
+[ -f ~/.bash_aliases ] && source ~/.bash_aliases
+[ -f ~/.bash_functions ] && source ~/.bash_functions
+[ -f ~/.bash_prompt ] && source ~/.bash_prompt
+
+# ЛОКАЛЬНЫЕ СЕКРЕТЫ (НЕ ДОБАВЛЯТЬ В GIT/STOW!)
+[ -f ~/.env.secrets ] && source ~/.env.secrets
diff --git a/bash/.bashrc b/bash/.bashrc
deleted file mode 100644
index 1206f87..0000000
--- a/bash/.bashrc
+++ /dev/null
@@ -1,147 +0,0 @@
-# ~/.bashrc: executed by bash(1) for non-login shells.
-# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
-# for examples
-
-# If not running interactively, don't do anything
-case $- in
-    *i*) ;;
-      *) return;;
-esac
-
-# don't put duplicate lines or lines starting with space in the history.
-# See bash(1) for more options
-HISTCONTROL=ignoreboth
-
-# append to the history file, don't overwrite it
-shopt -s histappend
-
-# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
-HISTSIZE=1000
-HISTFILESIZE=2000
-
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
-shopt -s checkwinsize
-
-# If set, the pattern "**" used in a pathname expansion context will
-# match all files and zero or more directories and subdirectories.
-#shopt -s globstar
-
-# make less more friendly for non-text input files, see lesspipe(1)
-[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
-
-# set variable identifying the chroot you work in (used in the prompt below)
-if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
-    debian_chroot=$(cat /etc/debian_chroot)
-fi
-
-# set a fancy prompt (non-color, unless we know we "want" color)
-case "$TERM" in
-    xterm-color|*-256color) color_prompt=yes;;
-esac
-
-# uncomment for a colored prompt, if the terminal has the capability; turned
-# off by default to not distract the user: the focus in a terminal window
-# should be on the output of commands, not on the prompt
-#force_color_prompt=yes
-
-if [ -n "$force_color_prompt" ]; then
-    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
-	# We have color support; assume it's compliant with Ecma-48
-	# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
-	# a case would tend to support setf rather than setaf.)
-	color_prompt=yes
-    else
-	color_prompt=
-    fi
-fi
-
-if [ "$color_prompt" = yes ]; then
-    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
-else
-    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
-fi
-unset color_prompt force_color_prompt
-
-# If this is an xterm set the title to user@host:dir
-case "$TERM" in
-xterm*|rxvt*)
-    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
-    ;;
-*)
-    ;;
-esac
-
-# enable color support of ls and also add handy aliases
-if [ -x /usr/bin/dircolors ]; then
-    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-    alias ls='ls --color=auto'
-    #alias dir='dir --color=auto'
-    #alias vdir='vdir --color=auto'
-
-    alias grep='grep --color=auto'
-    alias fgrep='fgrep --color=auto'
-    alias egrep='egrep --color=auto'
-fi
-
-# colored GCC warnings and errors
-#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
-
-# some more ls aliases
-alias ll='ls -alF'
-alias la='ls -A'
-alias l='ls -CF'
-
-# Add an "alert" alias for long running commands.  Use like so:
-#   sleep 10; alert
-alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
-
-# Alias definitions.
-# You may want to put all your additions into a separate file like
-# ~/.bash_aliases, instead of adding them here directly.
-# See /usr/share/doc/bash-doc/examples in the bash-doc package.
-
-if [ -f ~/.bash_aliases ]; then
-    . ~/.bash_aliases
-fi
-
-# enable programmable completion features (you don't need to enable
-# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
-# sources /etc/bash.bashrc).
-if ! shopt -oq posix; then
-  if [ -f /usr/share/bash-completion/bash_completion ]; then
-    . /usr/share/bash-completion/bash_completion
-  elif [ -f /etc/bash_completion ]; then
-    . /etc/bash_completion
-  fi
-fi
-
-export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
-
-# Кастомный двухстрочный prompt
-[ -f "$HOME/.bash_prompt" ] && . "$HOME/.bash_prompt"
-
-export PATH="/snap/bin:$PATH"
-
-# uv
-export PATH="/home/dementev/.local/bin:$PATH"
-
-
-export PATH="$HOME/.npm-global/bin:$PATH"
-
-# Кастомные функции bash
-if [ -f ~/.bash_functions ]; then
-    source ~/.bash_functions
-fi
-
-# Приватные переменные окружения (секреты)
-if [ -f ~/.env.secrets ]; then
-    source ~/.env.secrets
-fi
-
-# Opencode MCP конфигурация (добавьте в ~/.env.secrets):
-# export CONTEXT7_API_KEY="ваш_ключ_от_context7"
-# export ZAI_API_KEY="ваш_ключ_от_z.ai"
-