From 85a7bb836a4bc8b707c4ffdfa51e0a64d1083dac Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 28 Mar 2026 23:35:19 +0300 Subject: [PATCH] backup: 2026-03-28 23:35 --- ssh/.ssh/config.d/00-globals.conf | 6 +++--- zsh/.config/zsh/.p10k.zsh | 18 +++++++++--------- zsh/.config/zsh/.zshrc | 3 +++ zsh/.config/zsh/config/aliases.zsh | 14 ++++++++++++++ 4 files changed, 29 insertions(+), 12 deletions(-) diff --git a/ssh/.ssh/config.d/00-globals.conf b/ssh/.ssh/config.d/00-globals.conf index b6f1145..6b0d154 100644 --- a/ssh/.ssh/config.d/00-globals.conf +++ b/ssh/.ssh/config.d/00-globals.conf @@ -2,9 +2,9 @@ Host * # Переиспользование соединений (быстрее) - ControlMaster auto - ControlPath ~/.ssh/sockets/%C - ControlPersist 10m + # ControlMaster auto + # ControlPath ~/.ssh/sockets/%C + # ControlPersist 10m # Автоматически добавлять ключи в агент AddKeysToAgent yes diff --git a/zsh/.config/zsh/.p10k.zsh b/zsh/.config/zsh/.p10k.zsh index 09d8eb8..f5ad8ba 100644 --- a/zsh/.config/zsh/.p10k.zsh +++ b/zsh/.config/zsh/.p10k.zsh @@ -1,4 +1,4 @@ -# Generated by Powerlevel10k configuration wizard on 2026-02-21 at 19:50 MSK. +# Generated by Powerlevel10k configuration wizard on 2026-03-25 at 15:40 MSK. # Based on romkatv/powerlevel10k/config/p10k-lean.zsh, checksum 02674. # Wizard options: nerdfont-v3 + powerline, small icons, unicode, lean, 2 lines, # disconnected, left frame, lightest-ornaments, sparse, many icons, fluent, @@ -58,14 +58,14 @@ nodenv # node.js version from nodenv (https://github.com/nodenv/nodenv) nvm # node.js version from nvm (https://github.com/nvm-sh/nvm) nodeenv # node.js environment (https://github.com/ekalinin/nodeenv) - # node_version # node.js version - # go_version # go version (https://golang.org) - # rust_version # rustc version (https://www.rust-lang.org) - # dotnet_version # .NET version (https://dotnet.microsoft.com) - # php_version # php version (https://www.php.net/) + node_version # node.js version + go_version # go version (https://golang.org) + rust_version # rustc version (https://www.rust-lang.org) + dotnet_version # .NET version (https://dotnet.microsoft.com) + php_version # php version (https://www.php.net/) # laravel_version # laravel php framework version (https://laravel.com/) - # java_version # java version (https://www.java.com/) - # package # name@version from package.json (https://docs.npmjs.com/files/package.json) + java_version # java version (https://www.java.com/) + package # name@version from package.json (https://docs.npmjs.com/files/package.json) rbenv # ruby version from rbenv (https://github.com/rbenv/rbenv) rvm # ruby version from rvm (https://rvm.io) fvm # flutter version management (https://github.com/leoafarias/fvm) @@ -728,7 +728,7 @@ typeset -g POWERLEVEL9K_RANGER_FOREGROUND=178 # Custom icon. # typeset -g POWERLEVEL9K_RANGER_VISUAL_IDENTIFIER_EXPANSION='⭐' - + ####################[ yazi: yazi shell (https://github.com/sxyazi/yazi) ]##################### # Yazi shell color. typeset -g POWERLEVEL9K_YAZI_FOREGROUND=178 diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc index f85491e..154de66 100644 --- a/zsh/.config/zsh/.zshrc +++ b/zsh/.config/zsh/.zshrc @@ -54,3 +54,6 @@ export NVM_DIR="$HOME/.config/nvm" # . "$HOME/.local/share/../bin/env" + +# To customize prompt, run `p10k configure` or edit ~/.dotfiles/zsh/.config/zsh/.p10k.zsh. +[[ ! -f ~/.dotfiles/zsh/.config/zsh/.p10k.zsh ]] || source ~/.dotfiles/zsh/.config/zsh/.p10k.zsh diff --git a/zsh/.config/zsh/config/aliases.zsh b/zsh/.config/zsh/config/aliases.zsh index c774f78..05b9d54 100644 --- a/zsh/.config/zsh/config/aliases.zsh +++ b/zsh/.config/zsh/config/aliases.zsh @@ -130,9 +130,23 @@ alias ns='npm start' alias nt='npm test' # ═══ Утилиты ═══════════════════════════════════════════════ +alias reload='source ~/.config/zsh/.zshrc' +alias path='echo $PATH | tr ":" "\n"' +alias h='history' +alias c='clear' +alias x='exit' +alias rsend='sudo rsync -avhP --stats' +alias wakemac='ssh vps "wakeonlan -i 192.168.1.255 FC:34:97:E1:08:E9"' + alias zshrc='${EDITOR} ~/.config/zsh/.zshrc' alias reload='source ~/.config/zsh/.zshrc' alias path='echo $PATH | tr ":" "\n"' + +# Использовать bat вместо cat, если установлен +if command -v bat &>/dev/null; then + alias cat='bat' +fi + alias h='history' alias c='clear' alias x='exit'