Добавить файл .zshenv для настройки ZDOTDIR

Обновить конфигурацию Zsh: изменить настройки плагинов, улучшить привязку клавиш и добавить историю команд
Добавить порт для хоста vps в конфигурации SSH
2026-01-07 11:02:14 +03:00 · 2026-01-06 23:40:15 +03:00 · 2026-01-06 19:19:52 +03:00 · 2026-01-06 19:19:28 +03:00
12 changed files with 2168 additions and 38 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,14 @@
 */Thumbs.db
 */.zcompdump

+# SSH Keys
+*/.ssh/id_*
+*/.ssh/known_hosts*
+
+# Lock files
+*/.lock
+*/.pid
+*/.pid.lock
+*/.sock
+
+
--- a/.stow-local-ignore
+++ b/.stow-local-ignore
@@ -1,4 +1,4 @@
 ^/README\.md
 ^/\.git
 ^/\.gitignore
-^/archive
+^/\archive
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -9,20 +9,20 @@
  "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
  "conform.nvim": { "branch": "master", "commit": "cde4da5c1083d3527776fee69536107d98dae6c9" },
  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
-  "gitsigns.nvim": { "branch": "main", "commit": "20ad4419564d6e22b189f6738116b38871082332" },
+  "gitsigns.nvim": { "branch": "main", "commit": "5813e4878748805f1518cee7abb50fd7205a3a48" },
  "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
  "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
  "mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" },
  "menu": { "branch": "main", "commit": "7a0a4a2896b715c066cfbe320bdc048091874cc6" },
  "minty": { "branch": "main", "commit": "aafc9e8e0afe6bf57580858a2849578d8d8db9e0" },
-  "nvim-autopairs": { "branch": "master", "commit": "7a2c97cccd60abc559344042fefb1d5a85b3e33b" },
-  "nvim-cmp": { "branch": "main", "commit": "d78fb3b64eedb701c9939f97361c06483af575e0" },
+  "nvim-autopairs": { "branch": "master", "commit": "d9e44e54384e5b0f3536339c65484f2e41b528e3" },
+  "nvim-cmp": { "branch": "main", "commit": "d97d85e01339f01b842e6ec1502f639b080cb0fc" },
  "nvim-lspconfig": { "branch": "master", "commit": "2010fc6ec03e2da552b4886fceb2f7bc0fc2e9c0" },
-  "nvim-tree.lua": { "branch": "master", "commit": "1eda2569394f866360e61f590f1796877388cb8a" },
-  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
+  "nvim-tree.lua": { "branch": "master", "commit": "eb33612bff2fb31f54946fb5dcadc89e905e81ec" },
+  "nvim-treesitter": { "branch": "main", "commit": "d3218d988f72ed34414959c9ccd802d393432d6e" },
  "nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" },
  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "telescope.nvim": { "branch": "master", "commit": "3a12a853ebf21ec1cce9a92290e3013f8ae75f02" },
+  "telescope.nvim": { "branch": "master", "commit": "e69b434b968a33815e2f02a5c7bd7b8dd4c7d4b2" },
  "ui": { "branch": "v3.0", "commit": "bea2af0a76c1098fac0988ad296aa028cad2a333" },
  "volt": { "branch": "main", "commit": "620de1321f275ec9d80028c68d1b88b409c0c8b1" },
  "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
--- a/ssh/.ssh/config.d/20-selfhost.conf
+++ b/ssh/.ssh/config.d/20-selfhost.conf
@@ -1,6 +1,7 @@
 # 20 - SelfHost
 Host vps vps-ada
    HostName ada-dev.ru
+    Port 4822
    User ada
    IdentityFile ~/.ssh/id_ed25519_homelab

--- a/ssh/.ssh/config.d/30-corporate.conf
+++ b/ssh/.ssh/config.d/30-corporate.conf
@@ -1,7 +1,7 @@
 # 40 - Corporate (PAO IL)

 Host ada-alt
-    HostName 192.168.122.102
+    HostName 10.215.233.64
    User ada-alt
    IdentityFile ~/.ssh/id_ed25519
    # UpdateHostKeys yes
--- a/zsh/.config/zsh/.p10k.zsh
+++ b/zsh/.config/zsh/.p10k.zsh
@@ -1,9 +1,8 @@
-# Generated by Powerlevel10k configuration wizard on 2025-12-07 at 18:23 MSK.
+# Generated by Powerlevel10k configuration wizard on 2026-01-06 at 23:39 MSK.
 # Based on romkatv/powerlevel10k/config/p10k-rainbow.zsh, checksum 49619.
 # Wizard options: nerdfont-v3 + powerline, small icons, rainbow, unicode,
-# angled separators, sharp heads, sharp tails, 2 lines, disconnected, left frame,
-# lightest-ornaments, sparse, many icons, fluent, transient_prompt,
-# instant_prompt=verbose.
+# slanted separators, slanted heads, slanted tails, 2 lines, disconnected, left frame,
+# light-ornaments, sparse, many icons, fluent, transient_prompt, instant_prompt=verbose.
 # Type `p10k configure` to generate another config.
 #
 # Config for Powerlevel10k with powerline prompt style with colorful background.
@@ -143,9 +142,9 @@

  # Connect left prompt lines with these symbols. You'll probably want to use the same color
  # as POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_FOREGROUND below.
-  typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX='%244F╭─'
-  typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_PREFIX='%244F├─'
-  typeset -g POWERLEVEL9K_MULTILINE_LAST_PROMPT_PREFIX='%244F╰─'
+  typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX='%242F╭─'
+  typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_PREFIX='%242F├─'
+  typeset -g POWERLEVEL9K_MULTILINE_LAST_PROMPT_PREFIX='%242F╰─'
  # Connect right prompt lines with these symbols.
  typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_SUFFIX=
  typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_SUFFIX=
@@ -161,7 +160,7 @@
  if [[ $POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR != ' ' ]]; then
    # The color of the filler. You'll probably want to match the color of POWERLEVEL9K_MULTILINE
    # ornaments defined above.
-    typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_FOREGROUND=244
+    typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_FOREGROUND=242
    # Start filler from the edge of the screen if there are no left segments on the first line.
    typeset -g POWERLEVEL9K_EMPTY_LINE_LEFT_PROMPT_FIRST_SEGMENT_END_SYMBOL='%{%}'
    # End filler on the edge of the screen if there are no right segments on the first line.
@@ -169,24 +168,24 @@
  fi

  # Separator between same-color segments on the left.
-  typeset -g POWERLEVEL9K_LEFT_SUBSEGMENT_SEPARATOR='\uE0B1'
+  typeset -g POWERLEVEL9K_LEFT_SUBSEGMENT_SEPARATOR='\u2571'
  # Separator between same-color segments on the right.
-  typeset -g POWERLEVEL9K_RIGHT_SUBSEGMENT_SEPARATOR='\uE0B3'
+  typeset -g POWERLEVEL9K_RIGHT_SUBSEGMENT_SEPARATOR='\u2571'
  # Separator between different-color segments on the left.
-  typeset -g POWERLEVEL9K_LEFT_SEGMENT_SEPARATOR='\uE0B0'
+  typeset -g POWERLEVEL9K_LEFT_SEGMENT_SEPARATOR='\uE0BC'
  # Separator between different-color segments on the right.
-  typeset -g POWERLEVEL9K_RIGHT_SEGMENT_SEPARATOR='\uE0B2'
+  typeset -g POWERLEVEL9K_RIGHT_SEGMENT_SEPARATOR='\uE0BA'
  # To remove a separator between two segments, add "_joined" to the second segment name.
  # For example: POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(os_icon context_joined)

  # The right end of left prompt.
-  typeset -g POWERLEVEL9K_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL='\uE0B0'
+  typeset -g POWERLEVEL9K_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL='\uE0BC'
  # The left end of right prompt.
-  typeset -g POWERLEVEL9K_RIGHT_PROMPT_FIRST_SEGMENT_START_SYMBOL='\uE0B2'
+  typeset -g POWERLEVEL9K_RIGHT_PROMPT_FIRST_SEGMENT_START_SYMBOL='\uE0BA'
  # The left end of left prompt.
-  typeset -g POWERLEVEL9K_LEFT_PROMPT_FIRST_SEGMENT_START_SYMBOL='\uE0B2'
+  typeset -g POWERLEVEL9K_LEFT_PROMPT_FIRST_SEGMENT_START_SYMBOL='\uE0BA'
  # The right end of right prompt.
-  typeset -g POWERLEVEL9K_RIGHT_PROMPT_LAST_SEGMENT_END_SYMBOL='\uE0B0'
+  typeset -g POWERLEVEL9K_RIGHT_PROMPT_LAST_SEGMENT_END_SYMBOL='\uE0BC'
  # Left prompt terminator for lines without any segments.
  typeset -g POWERLEVEL9K_EMPTY_LINE_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL=

--- a/zsh/.config/zsh/.zcompdump
+++ b/zsh/.config/zsh/.zcompdump
--- a/zsh/.config/zsh/.zhistory
+++ b/zsh/.config/zsh/.zhistory
--- a/zsh/.config/zsh/.zsh_history
+++ b/zsh/.config/zsh/.zsh_history
@@ -0,0 +1,2 @@
+stow -t ~ */
+ls
--- a/zsh/.config/zsh/config/keybindings.zsh
+++ b/zsh/.config/zsh/config/keybindings.zsh
@@ -28,20 +28,12 @@ bindkey '^[^[[C' forward-word          # Alt+Right - вперёд на слов
 bindkey '^[^[[D' backward-word         # Alt+Left - назад на слово

 # ═══ История команд ════════════════════════════════════════
-# Обычная навигация по истории (без фильтрации)
-bindkey '^P' up-history                # Ctrl+P - предыдущая команда (без фильтра)
-bindkey '^N' down-history              # Ctrl+N - следующая команда (без фильтра)

-# Стрелки вверх/вниз - с фильтрацией по началу строки
-bindkey '^[[A' up-line-or-search       # Up - предыдущая команда (с фильтром)
-bindkey '^[[B' down-line-or-search     # Down - следующая команда (с фильтром)
+bindkey '^P' up-history                # Ctrl+P - просто вверх
+bindkey '^N' down-history              # Ctrl+N - просто вниз

-# Поиск в истории (если загружен history-substring-search)
-if (( $+functions[history-substring-search-up] )); then
-    # Alt+Up/Down для поиска подстроки в истории
-    bindkey '^[[1;3A' history-substring-search-up      # Alt+Up
-    bindkey '^[[1;3B' history-substring-search-down    # Alt+Down
-fi
+# Оставляем Alt+Стрелки для чего-то другого или удаляем,
+# если они дублируют функционал.

 # ═══ Автодополнение ════════════════════════════════════════
 bindkey '^I' complete-word             # Tab - автодополнение
--- a/zsh/.config/zsh/config/plugins.zsh
+++ b/zsh/.config/zsh/config/plugins.zsh
@@ -39,8 +39,15 @@ export ZSH_AUTOSUGGEST_STRATEGY=(history completion)
 export ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=20

 # ═══ История ═══════════════════════════════════════════════
-# zsh-history-substring-search - поиск в истории
-zinit ice wait lucid
+zinit ice wait"0" lucid atload'
+  # Привязываем стрелки к плагину (теперь они не будут глючить)
+  bindkey "$terminfo[kcuu1]" history-substring-search-up
+  bindkey "$terminfo[kcud1]" history-substring-search-down
+
+  # Настройка цветов (по желанию)
+  HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND="fg=magenta,bold"
+  HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND="fg=red,bold"
+'
 zinit light zsh-users/zsh-history-substring-search

 # ═══ FZF ═══════════════════════════════════════════════════
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -0,0 +1 @@
+export ZDOTDIR="${HOME}/.config/zsh"
Author	SHA1	Message	Date
Dmitry	7b53ccee14	Добавить файл .zshenv для настройки ZDOTDIR	2026-01-07 11:02:14 +03:00
Dmitry	bdb4cbeb01	Обновить конфигурацию Zsh: изменить настройки плагинов, улучшить привязку клавиш и добавить историю команд	2026-01-06 23:40:15 +03:00
Dmitry	1b779aa71e	Добавить порт для хоста vps в конфигурации SSH	2026-01-06 19:19:52 +03:00
Dmitry	dcd32e2afd	Refactor code structure for improved readability and maintainability	2026-01-06 19:19:28 +03:00