diff --git a/.chezmoiignore b/.chezmoiignore new file mode 100644 index 0000000..6493b70 --- /dev/null +++ b/.chezmoiignore @@ -0,0 +1,7 @@ +configs/ +bootstrap.sh +CLAUDE.md +AGENTS.md +README.md +.gitignore +.claude/ diff --git a/.gitignore b/.gitignore index fda2358..1fd8f3a 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,8 @@ micro/.config/micro/backups micro/.config/micro/buffers +**/settings_backup.json + +# override global gitignore — these belong in dotfiles +!CLAUDE.md +!AGENTS.md diff --git a/.stow-local-ignore b/.stow-local-ignore deleted file mode 100644 index d38a825..0000000 --- a/.stow-local-ignore +++ /dev/null @@ -1,5 +0,0 @@ -^/README\.md -^/\.git -^/\.gitignore -^/configs$ -^/nixos$ diff --git a/AGENTS.md b/AGENTS.md new file mode 100644 index 0000000..7731091 --- /dev/null +++ b/AGENTS.md @@ -0,0 +1,81 @@ +# AGENTS.md + +This file provides guidance to Codex (Codex.ai/code) when working with code in this repository. + +## Репозиторий + +Dotfiles под управлением **GNU Stow**. Каждый каталог верхнего уровня — это stow-пакет. `stow -t ~ /` создаёт симлинки из пакета в `$HOME`, сохраняя структуру подкаталогов. + +Исключения (не разворачиваются через stow): `configs/`, `nixos/` — это утилитарные каталоги вне stow-конвенции, описаны в `.stow-local-ignore`. + +## Развёртывание + +```bash +# Все пакеты сразу +stow -t ~ */ + +# Один пакет +stow -t ~ zsh + +# Проверить без применения (dry run) +stow -n -t ~ zsh + +# Удалить симлинки пакета +stow -D -t ~ zsh +``` + +Быстрый старт на новой машине — `bootstrap.sh` (устанавливает зависимости + запускает stow + меняет shell на zsh). + +## Структура пакетов + +| Пакет | Что настраивает | +|---|---| +| `zsh/` | Zsh: `.zshenv` → `ZDOTDIR=~/.config/zsh`, модульный `.zshrc` + 8 файлов в `config/` | +| `git/` | `.gitconfig`, `.gitignore_global` | +| `ssh/` | `~/.ssh/config` (Include-based) + `config.d/` с нумерованными секциями | +| `tmux/` | `.tmux.conf` (базовый) + `.tmux.conf.local` (кастомизации) | +| `nvim/` | LazyVim-конфиг с `init.lua` и `lua/config/` | +| `alacritty/` | Терминал alacritty (запасной) | +| `kitty/` | Основной терминал: Nord, вкладки, сплиты, kitty graphics protocol | +| `zed/` | Редактор Zed | +| `restic/` | Resticprofile: бэкапы на Яндекс.Диск через rclone | +| `fastfetch/` | Системный fetch | +| `micro/` | Редактор micro | +| `vim/` | `.vimrc` | + +## SSH-конфиг + +Конфиги разбиты по файлам с числовым префиксом (приоритет — чем меньше, тем раньше): +- `00-globals.conf` — глобальные дефолты +- `10-local.conf` — локальная сеть +- `20-selfhost.conf` — self-hosted сервисы +- `30-corporate.conf` — рабочие хосты +- `40-proxy.conf` — proxy jump / socks + +## Zsh-конфиг + +Загрузочный порядок: `.zshenv` → `ZDOTDIR` → `.zshrc` → `config/*.zsh`: +1. `env.zsh` — переменные окружения +2. `options.zsh` — опции shell +3. `plugins.zsh` — плагины через zinit +4. `completion.zsh` — автодополнение +5. `aliases.zsh` — алиасы +6. `functions.zsh` — функции +7. `keybindings.zsh` — горячие клавиши +8. `prompt.zsh` — промпт (starship / p10k) + +Машинно-специфичные настройки кладутся в `config/local.zsh` (не в репозитории). + +## Restic-бэкапы + +Профили в `restic/.config/resticprofile/profiles.yaml`. Хранилище — Яндекс.Диск через rclone remote `yadisk`. Пароль репозитория — `pass.txt` (в репозитории, не публичен). + +```bash +resticprofile -n dotfiles backup # бэкап конфигов +resticprofile snapshots # список снимков +resticprofile -n dotfiles check # проверка целостности +``` + +## Коммиты + +Стиль коммитов: `backup: YYYY-MM-DD HH:MM` для плановых бэкапов. Для изменений конфигов — обычные описательные сообщения. diff --git a/CLAUDE.md b/CLAUDE.md new file mode 100644 index 0000000..b508f97 --- /dev/null +++ b/CLAUDE.md @@ -0,0 +1,95 @@ +# CLAUDE.md + +This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository. + +## Репозиторий + +Dotfiles под управлением **chezmoi**. Исходники в `~/dotfiles`, chezmoi разворачивает их в `$HOME`. + +Файлы именуются по chezmoi-конвенции: +- `dot_` префикс → `.` в имени файла/папки (`dot_zshenv` → `~/.zshenv`) +- `private_` префикс → права 700 (`private_dot_ssh/` → `~/.ssh/`) +- `encrypted_` + суффикс `.age` → расшифровывается при apply (`encrypted_pass.txt.age` → `pass.txt`) + +Каталог `configs/` — служебные конфиги вне chezmoi (danted, awg, telemt), не разворачиваются. + +## Развёртывание + +```bash +chezmoi apply # применить изменения +chezmoi diff # посмотреть что изменится +chezmoi status # краткий статус +chezmoi add ~/.some/file # начать отслеживать новый файл +chezmoi re-add # синхронизировать source после ручных правок в ~ +``` + +На новой машине — `bootstrap.sh` (устанавливает зависимости + запускает `chezmoi apply`). + +## Шифрование + +age-ключ: `~/.config/chezmoi/key.txt` (вне репо, хранить в безопасном месте). +Конфиг chezmoi: `~/.config/chezmoi/chezmoi.toml`. + +Зашифровать файл: +```bash +age -r age1a7wrnp3gw725pmhgffm6kurephmad9220g057mrwgvkrr5xcws7qg5z2xk \ + -o dot_config/resticprofile/encrypted_pass.txt.age \ + dot_config/resticprofile/pass.txt +``` + +## SSH-ключи + +Ключи хранятся в self-hosted Bitwarden (`pass.ada-dev.ru`): +```bash +bw config server https://pass.ada-dev.ru +bw login +bw get item <название ключа> | jq -r '.sshKey.privateKey' > ~/.ssh/id_ed25519 +``` + +## SSH-конфиг + +`private_dot_ssh/config` + `config.d/` с числовым префиксом (чем меньше — тем выше приоритет): +- `00-globals.conf` — глобальные дефолты +- `10-local.conf` — локальная сеть +- `20-selfhost.conf` — self-hosted сервисы +- `30-corporate.conf` — рабочие хосты +- `40-proxy.conf` — proxy jump / socks + +## Zsh-конфиг + +`dot_config/zsh/dot_zshrc` → `~/.config/zsh/.zshrc`, загружает модули из `config/*.zsh`: +`env.zsh` → `options.zsh` → `plugins.zsh` (zinit) → `completion.zsh` → `aliases.zsh` → `functions.zsh` → `keybindings.zsh` → `prompt.zsh` + +Промпт — Powerlevel10k, конфиг в `dot_config/zsh/dot_p10k.zsh`. +Машинно-специфичные настройки — `~/.config/zsh/config/local.zsh` (вне репо). + +## Nvim + +LazyVim на базе `lazy.nvim`. Кастомные плагины в `dot_config/nvim/lua/plugins/`: +- `colorscheme.lua` — тема Nord (`gbprod/nord.nvim`) +- `langmapper.lua` — дублирует маппинги для русской раскладки ЙЦУКЕН + +## Kitty + +Основной терминал. `dot_config/kitty/startup.conf` запускает fastfetch при старте. Nord, FiraCode Nerd Font 14pt, opacity 0.90. + +## Restic-бэкапы + +Профили в `dot_config/resticprofile/profiles.yaml`. Хранилище — Яндекс.Диск через rclone remote `yadisk`. Пароль репозитория — `encrypted_pass.txt.age` (расшифровывается chezmoi при apply). + +| Профиль | Источник | Частота | +|---|---|---| +| `dotfiles` | `~/.dotfiles`, `~/.config`, `~/.ssh` | каждые 6 ч | +| `projects` | `~/Documents/Projects` | каждый час | +| `vaults` | `~/Documents/Vaults` | каждый час | +| `files` | `~/Documents/Files` | ежедневно 02:15 | + +```bash +resticprofile -n dotfiles backup +resticprofile snapshots +resticprofile -n dotfiles restore latest /tmp/restore +``` + +## Коммиты + +`backup: YYYY-MM-DD HH:MM` — для плановых бэкапов; обычные описательные сообщения — для изменений конфигов. diff --git a/bootstrap.sh b/bootstrap.sh index c8012c2..a95555d 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,34 +1,24 @@ #!/usr/bin/env bash set -euo pipefail -PACKAGES=("zsh" "tmux" "alacritty" "stow" "sshuttle" "eza" "zoxide") +PACKAGES=("zsh" "tmux" "alacritty" "chezmoi" "age" "eza" "zoxide") -# Detect package manager and install. detect_and_install() { if command -v apt &>/dev/null; then - echo "Detected: apt (Debian/Ubuntu)" - sudo apt update - sudo apt install -y "${PACKAGES[@]}" + sudo apt update && sudo apt install -y "${PACKAGES[@]}" elif command -v pacman &>/dev/null; then - echo "Detected: pacman (Arch)" sudo pacman -Syu --noconfirm "${PACKAGES[@]}" elif command -v dnf &>/dev/null; then - echo "Detected: dnf (Fedora/RHEL)" sudo dnf install -y "${PACKAGES[@]}" - elif command -v zypper &>/dev/null; then - echo "Detected: zypper (openSUSE)" - sudo zypper install -y "${PACKAGES[@]}" elif command -v brew &>/dev/null; then - echo "Detected: brew (macOS)" brew install "${PACKAGES[@]}" else - echo "Error: No supported package manager found" + echo "Error: no supported package manager found" echo "Please install: ${PACKAGES[*]}" exit 1 fi } -# Check if all packages are already installed. check_installed() { local missing=() for pkg in "${PACKAGES[@]}"; do @@ -36,36 +26,29 @@ check_installed() { missing+=("$pkg") fi done - if [[ ${#missing[@]} -gt 0 ]]; then - echo "Missing packages: ${missing[*]}" + echo "Missing: ${missing[*]}" detect_and_install - else - echo "All required packages already installed." fi } check_installed -# Basic setup for this dotfiles repo. mkdir -p "$HOME/.ssh/sockets" -echo "Created ~/.ssh/sockets" -# Apply all stow packages. -cd "$(dirname "$0")" -echo "Running: stow -t $HOME */" -stow -t "$HOME" */ +# Apply dotfiles via chezmoi +DOTFILES_DIR="$(cd "$(dirname "$0")" && pwd)" +chezmoi apply --source "$DOTFILES_DIR" -# Set zsh as default shell. +# Set zsh as default shell set_default_shell() { local zsh_path zsh_path=$(command -v zsh) - read -p "Set zsh as default shell? (y/n) " -n 1 -r echo if [[ $REPLY =~ ^[Yy]$ ]]; then chsh -s "$zsh_path" - echo "Default shell changed to: $zsh_path" + echo "Default shell: $zsh_path" fi } diff --git a/alacritty/.config/alacritty/alacritty.toml b/dot_config/alacritty/alacritty.toml similarity index 100% rename from alacritty/.config/alacritty/alacritty.toml rename to dot_config/alacritty/alacritty.toml diff --git a/fastfetch/.config/fastfetch/config.jsonc b/dot_config/fastfetch/config.jsonc similarity index 100% rename from fastfetch/.config/fastfetch/config.jsonc rename to dot_config/fastfetch/config.jsonc diff --git a/kitty/.config/kitty/kitty.conf b/dot_config/kitty/kitty.conf similarity index 100% rename from kitty/.config/kitty/kitty.conf rename to dot_config/kitty/kitty.conf diff --git a/dot_config/kitty/startup.conf b/dot_config/kitty/startup.conf new file mode 100644 index 0000000..ee8dfe4 --- /dev/null +++ b/dot_config/kitty/startup.conf @@ -0,0 +1 @@ +launch zsh -i -c 'fastfetch; exec zsh -l' diff --git a/micro/.config/micro/bindings.json b/dot_config/micro/bindings.json similarity index 100% rename from micro/.config/micro/bindings.json rename to dot_config/micro/bindings.json diff --git a/micro/.config/micro/settings.json b/dot_config/micro/settings.json similarity index 100% rename from micro/.config/micro/settings.json rename to dot_config/micro/settings.json diff --git a/dot_config/nvim/.gitignore b/dot_config/nvim/.gitignore new file mode 100644 index 0000000..cc5457a --- /dev/null +++ b/dot_config/nvim/.gitignore @@ -0,0 +1,8 @@ +tt.* +.tests +doc/tags +debug +.repro +foo.* +*.log +data diff --git a/dot_config/nvim/.neoconf.json b/dot_config/nvim/.neoconf.json new file mode 100644 index 0000000..7c48087 --- /dev/null +++ b/dot_config/nvim/.neoconf.json @@ -0,0 +1,15 @@ +{ + "neodev": { + "library": { + "enabled": true, + "plugins": true + } + }, + "neoconf": { + "plugins": { + "lua_ls": { + "enabled": true + } + } + } +} diff --git a/dot_config/nvim/LICENSE b/dot_config/nvim/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/dot_config/nvim/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/dot_config/nvim/README.md b/dot_config/nvim/README.md new file mode 100644 index 0000000..185280b --- /dev/null +++ b/dot_config/nvim/README.md @@ -0,0 +1,4 @@ +# 💤 LazyVim + +A starter template for [LazyVim](https://github.com/LazyVim/LazyVim). +Refer to the [documentation](https://lazyvim.github.io/installation) to get started. diff --git a/dot_config/nvim/init.lua b/dot_config/nvim/init.lua new file mode 100644 index 0000000..2514f9e --- /dev/null +++ b/dot_config/nvim/init.lua @@ -0,0 +1,2 @@ +-- bootstrap lazy.nvim, LazyVim and your plugins +require("config.lazy") diff --git a/dot_config/nvim/lazy-lock.json b/dot_config/nvim/lazy-lock.json new file mode 100644 index 0000000..7784559 --- /dev/null +++ b/dot_config/nvim/lazy-lock.json @@ -0,0 +1,39 @@ +{ + "LazyVim": { "branch": "main", "commit": "83d90f339defdb109a6ede333865a66ffc7ef6aa" }, + "SchemaStore.nvim": { "branch": "main", "commit": "0c303573345e710a233f5ba75f9aadc05852771b" }, + "blink-copilot": { "branch": "main", "commit": "7ad8209b2f880a2840c94cdcd80ab4dc511d4f39" }, + "blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" }, + "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, + "catppuccin": { "branch": "main", "commit": "426dbebe06b5c69fd846ceb17b42e12f890aedf1" }, + "conform.nvim": { "branch": "master", "commit": "dca1a190aa85f9065979ef35802fb77131911106" }, + "copilot.lua": { "branch": "master", "commit": "adff470bca742b7658228ed144589250ecb3dc0a" }, + "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" }, + "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" }, + "gitsigns.nvim": { "branch": "main", "commit": "6d808f99bd63303646794406e270bd553ad7792e" }, + "grug-far.nvim": { "branch": "main", "commit": "21604255d0e8f9968322f61f2b6c09e5efe1285a" }, + "langmapper.nvim": { "branch": "main", "commit": "49462fd9f4f33cf8cfbaa779ba07d3c0b255cc06" }, + "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, + "lazydev.nvim": { "branch": "main", "commit": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d" }, + "lualine.nvim": { "branch": "master", "commit": "a905eeebc4e63fdc48b5135d3bf8aea5618fb21c" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "0c2823e0418f3d9230ff8b201c976e84de1cb401" }, + "mason.nvim": { "branch": "main", "commit": "12ddd182d9efbdc848b540f16484a583d52da0fb" }, + "mini.ai": { "branch": "main", "commit": "43eb2074843950a3a25aae56a5f41362ec043bfa" }, + "mini.icons": { "branch": "main", "commit": "bac6317300e205335df425296570d84322730067" }, + "mini.pairs": { "branch": "main", "commit": "42387c7fe68fc0b6e95eaf37f1bb76e7bffaa0d9" }, + "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" }, + "nord.nvim": { "branch": "main", "commit": "87394d4fc35c901bbe38326a78d31ab1ead826b6" }, + "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, + "nvim-lint": { "branch": "master", "commit": "eab58b48eb11d7745c11c505e0f3057165902461" }, + "nvim-lspconfig": { "branch": "master", "commit": "81878de76c0de4ce289513734ad80c31ec7871b8" }, + "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" }, + "nvim-treesitter-textobjects": { "branch": "main", "commit": "851e865342e5a4cb1ae23d31caf6e991e1c99f1e" }, + "nvim-ts-autotag": { "branch": "main", "commit": "88c1453db4ba7dd24131086fe51fdf74e587d275" }, + "persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" }, + "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" }, + "snacks.nvim": { "branch": "main", "commit": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" }, + "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" }, + "tokyonight.nvim": { "branch": "main", "commit": "cdc07ac78467a233fd62c493de29a17e0cf2b2b6" }, + "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" }, + "ts-comments.nvim": { "branch": "main", "commit": "123a9fb12e7229342f807ec9e6de478b1102b041" }, + "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" } +} diff --git a/dot_config/nvim/lazyvim.json b/dot_config/nvim/lazyvim.json new file mode 100644 index 0000000..c977cf7 --- /dev/null +++ b/dot_config/nvim/lazyvim.json @@ -0,0 +1,11 @@ +{ + "extras": [ + "lazyvim.plugins.extras.ai.copilot", + "lazyvim.plugins.extras.lang.json" + ], + "install_version": 8, + "news": { + "NEWS.md": "11866" + }, + "version": 8 +} diff --git a/dot_config/nvim/lua/config/autocmds.lua b/dot_config/nvim/lua/config/autocmds.lua new file mode 100644 index 0000000..4221e75 --- /dev/null +++ b/dot_config/nvim/lua/config/autocmds.lua @@ -0,0 +1,8 @@ +-- Autocmds are automatically loaded on the VeryLazy event +-- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua +-- +-- Add any additional autocmds here +-- with `vim.api.nvim_create_autocmd` +-- +-- Or remove existing autocmds by their group name (which is prefixed with `lazyvim_` for the defaults) +-- e.g. vim.api.nvim_del_augroup_by_name("lazyvim_wrap_spell") diff --git a/dot_config/nvim/lua/config/keymaps.lua b/dot_config/nvim/lua/config/keymaps.lua new file mode 100644 index 0000000..2c134f7 --- /dev/null +++ b/dot_config/nvim/lua/config/keymaps.lua @@ -0,0 +1,3 @@ +-- Keymaps are automatically loaded on the VeryLazy event +-- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua +-- Add any additional keymaps here diff --git a/dot_config/nvim/lua/config/lazy.lua b/dot_config/nvim/lua/config/lazy.lua new file mode 100644 index 0000000..d73bfa1 --- /dev/null +++ b/dot_config/nvim/lua/config/lazy.lua @@ -0,0 +1,53 @@ +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not (vim.uv or vim.loop).fs_stat(lazypath) then + local lazyrepo = "https://github.com/folke/lazy.nvim.git" + local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) + if vim.v.shell_error ~= 0 then + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) + end +end +vim.opt.rtp:prepend(lazypath) + +require("lazy").setup({ + spec = { + -- add LazyVim and import its plugins + { "LazyVim/LazyVim", import = "lazyvim.plugins" }, + -- import/override with your plugins + { import = "plugins" }, + }, + defaults = { + -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup. + -- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default. + lazy = false, + -- It's recommended to leave version=false for now, since a lot the plugin that support versioning, + -- have outdated releases, which may break your Neovim install. + version = false, -- always use the latest git commit + -- version = "*", -- try installing the latest stable version for plugins that support semver + }, + install = { colorscheme = { "tokyonight", "habamax" } }, + checker = { + enabled = true, -- check for plugin updates periodically + notify = false, -- notify on update + }, -- automatically check for plugin updates + performance = { + rtp = { + -- disable some rtp plugins + disabled_plugins = { + "gzip", + -- "matchit", + -- "matchparen", + -- "netrwPlugin", + "tarPlugin", + "tohtml", + "tutor", + "zipPlugin", + }, + }, + }, +}) diff --git a/dot_config/nvim/lua/config/options.lua b/dot_config/nvim/lua/config/options.lua new file mode 100644 index 0000000..3ea1454 --- /dev/null +++ b/dot_config/nvim/lua/config/options.lua @@ -0,0 +1,3 @@ +-- Options are automatically loaded before lazy.nvim startup +-- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua +-- Add any additional options here diff --git a/dot_config/nvim/lua/plugins/colorscheme.lua b/dot_config/nvim/lua/plugins/colorscheme.lua new file mode 100644 index 0000000..e32d9fb --- /dev/null +++ b/dot_config/nvim/lua/plugins/colorscheme.lua @@ -0,0 +1,25 @@ +return { + { + "gbprod/nord.nvim", + lazy = false, + priority = 1000, + opts = { + transparent = false, + terminal_colors = true, + diff = { mode = "bg" }, + borders = true, + errors = { mode = "bg" }, + styles = { + comments = { italic = true }, + keywords = { bold = true }, + }, + }, + }, + + { + "LazyVim/LazyVim", + opts = { + colorscheme = "nord", + }, + }, +} diff --git a/dot_config/nvim/lua/plugins/example.lua b/dot_config/nvim/lua/plugins/example.lua new file mode 100644 index 0000000..17f53d6 --- /dev/null +++ b/dot_config/nvim/lua/plugins/example.lua @@ -0,0 +1,197 @@ +-- since this is just an example spec, don't actually load anything here and return an empty spec +-- stylua: ignore +if true then return {} end + +-- every spec file under the "plugins" directory will be loaded automatically by lazy.nvim +-- +-- In your plugin files, you can: +-- * add extra plugins +-- * disable/enabled LazyVim plugins +-- * override the configuration of LazyVim plugins +return { + -- add gruvbox + { "ellisonleao/gruvbox.nvim" }, + + -- Configure LazyVim to load gruvbox + { + "LazyVim/LazyVim", + opts = { + colorscheme = "gruvbox", + }, + }, + + -- change trouble config + { + "folke/trouble.nvim", + -- opts will be merged with the parent spec + opts = { use_diagnostic_signs = true }, + }, + + -- disable trouble + { "folke/trouble.nvim", enabled = false }, + + -- override nvim-cmp and add cmp-emoji + { + "hrsh7th/nvim-cmp", + dependencies = { "hrsh7th/cmp-emoji" }, + ---@param opts cmp.ConfigSchema + opts = function(_, opts) + table.insert(opts.sources, { name = "emoji" }) + end, + }, + + -- change some telescope options and a keymap to browse plugin files + { + "nvim-telescope/telescope.nvim", + keys = { + -- add a keymap to browse plugin files + -- stylua: ignore + { + "fp", + function() require("telescope.builtin").find_files({ cwd = require("lazy.core.config").options.root }) end, + desc = "Find Plugin File", + }, + }, + -- change some options + opts = { + defaults = { + layout_strategy = "horizontal", + layout_config = { prompt_position = "top" }, + sorting_strategy = "ascending", + winblend = 0, + }, + }, + }, + + -- add pyright to lspconfig + { + "neovim/nvim-lspconfig", + ---@class PluginLspOpts + opts = { + ---@type lspconfig.options + servers = { + -- pyright will be automatically installed with mason and loaded with lspconfig + pyright = {}, + }, + }, + }, + + -- add tsserver and setup with typescript.nvim instead of lspconfig + { + "neovim/nvim-lspconfig", + dependencies = { + "jose-elias-alvarez/typescript.nvim", + init = function() + require("lazyvim.util").lsp.on_attach(function(_, buffer) + -- stylua: ignore + vim.keymap.set( "n", "co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" }) + vim.keymap.set("n", "cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer }) + end) + end, + }, + ---@class PluginLspOpts + opts = { + ---@type lspconfig.options + servers = { + -- tsserver will be automatically installed with mason and loaded with lspconfig + tsserver = {}, + }, + -- you can do any additional lsp server setup here + -- return true if you don't want this server to be setup with lspconfig + ---@type table + setup = { + -- example to setup with typescript.nvim + tsserver = function(_, opts) + require("typescript").setup({ server = opts }) + return true + end, + -- Specify * to use this function as a fallback for any server + -- ["*"] = function(server, opts) end, + }, + }, + }, + + -- for typescript, LazyVim also includes extra specs to properly setup lspconfig, + -- treesitter, mason and typescript.nvim. So instead of the above, you can use: + { import = "lazyvim.plugins.extras.lang.typescript" }, + + -- add more treesitter parsers + { + "nvim-treesitter/nvim-treesitter", + opts = { + ensure_installed = { + "bash", + "html", + "javascript", + "json", + "lua", + "markdown", + "markdown_inline", + "python", + "query", + "regex", + "tsx", + "typescript", + "vim", + "yaml", + }, + }, + }, + + -- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above + -- would overwrite `ensure_installed` with the new value. + -- If you'd rather extend the default config, use the code below instead: + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + -- add tsx and treesitter + vim.list_extend(opts.ensure_installed, { + "tsx", + "typescript", + }) + end, + }, + + -- the opts function can also be used to change the default opts: + { + "nvim-lualine/lualine.nvim", + event = "VeryLazy", + opts = function(_, opts) + table.insert(opts.sections.lualine_x, { + function() + return "😄" + end, + }) + end, + }, + + -- or you can return new options to override all the defaults + { + "nvim-lualine/lualine.nvim", + event = "VeryLazy", + opts = function() + return { + --[[add your custom lualine config here]] + } + end, + }, + + -- use mini.starter instead of alpha + { import = "lazyvim.plugins.extras.ui.mini-starter" }, + + -- add jsonls and schemastore packages, and setup treesitter for json, json5 and jsonc + { import = "lazyvim.plugins.extras.lang.json" }, + + -- add any tools you want to have installed below + { + "williamboman/mason.nvim", + opts = { + ensure_installed = { + "stylua", + "shellcheck", + "shfmt", + "flake8", + }, + }, + }, +} diff --git a/dot_config/nvim/lua/plugins/langmapper.lua b/dot_config/nvim/lua/plugins/langmapper.lua new file mode 100644 index 0000000..ea5096a --- /dev/null +++ b/dot_config/nvim/lua/plugins/langmapper.lua @@ -0,0 +1,14 @@ +return { + { + "Wansmer/langmapper.nvim", + lazy = false, + priority = 1, + config = function() + require("langmapper").setup({ + -- автоматически перехватывает все vim.keymap.set и дублирует для RU + hack_keymap = true, + -- стандартная ЙЦУКЕН — дефолт, явно не нужна + }) + end, + }, +} diff --git a/dot_config/nvim/stylua.toml b/dot_config/nvim/stylua.toml new file mode 100644 index 0000000..5d6c50d --- /dev/null +++ b/dot_config/nvim/stylua.toml @@ -0,0 +1,3 @@ +indent_type = "Spaces" +indent_width = 2 +column_width = 120 \ No newline at end of file diff --git a/restic/.config/resticprofile/.resticignore b/dot_config/resticprofile/dot_resticignore similarity index 100% rename from restic/.config/resticprofile/.resticignore rename to dot_config/resticprofile/dot_resticignore diff --git a/dot_config/resticprofile/encrypted_pass.txt.age b/dot_config/resticprofile/encrypted_pass.txt.age new file mode 100644 index 0000000..6f0b629 --- /dev/null +++ b/dot_config/resticprofile/encrypted_pass.txt.age @@ -0,0 +1,5 @@ +age-encryption.org/v1 +-> X25519 EIZIyjM8GxEL7eAtSebeqD+0Byf+OOAYNJjPIhQ51BY +gYWk1Emv5NbIZOGEWRAcJBSkMEROUeLTEEYDd9KxuAg +--- Dk6oyb1AYDJCOa38S3bj1Q06t9AZe1FYfeAJypQWNwI +g뗨J$Yz6-b\.x[~HBA`iE8: \ No newline at end of file diff --git a/restic/.config/resticprofile/profiles.yaml b/dot_config/resticprofile/profiles.yaml similarity index 100% rename from restic/.config/resticprofile/profiles.yaml rename to dot_config/resticprofile/profiles.yaml diff --git a/zed/.config/zed/settings.json b/dot_config/zed/settings.json similarity index 100% rename from zed/.config/zed/settings.json rename to dot_config/zed/settings.json diff --git a/zsh/.config/zsh/config/aliases.zsh b/dot_config/zsh/config/aliases.zsh similarity index 100% rename from zsh/.config/zsh/config/aliases.zsh rename to dot_config/zsh/config/aliases.zsh diff --git a/zsh/.config/zsh/config/completion.zsh b/dot_config/zsh/config/completion.zsh similarity index 100% rename from zsh/.config/zsh/config/completion.zsh rename to dot_config/zsh/config/completion.zsh diff --git a/zsh/.config/zsh/config/env.zsh b/dot_config/zsh/config/env.zsh similarity index 100% rename from zsh/.config/zsh/config/env.zsh rename to dot_config/zsh/config/env.zsh diff --git a/zsh/.config/zsh/config/functions.zsh b/dot_config/zsh/config/functions.zsh similarity index 100% rename from zsh/.config/zsh/config/functions.zsh rename to dot_config/zsh/config/functions.zsh diff --git a/zsh/.config/zsh/config/keybindings.zsh b/dot_config/zsh/config/keybindings.zsh similarity index 100% rename from zsh/.config/zsh/config/keybindings.zsh rename to dot_config/zsh/config/keybindings.zsh diff --git a/zsh/.config/zsh/config/options.zsh b/dot_config/zsh/config/options.zsh similarity index 100% rename from zsh/.config/zsh/config/options.zsh rename to dot_config/zsh/config/options.zsh diff --git a/zsh/.config/zsh/config/plugins.zsh b/dot_config/zsh/config/plugins.zsh similarity index 100% rename from zsh/.config/zsh/config/plugins.zsh rename to dot_config/zsh/config/plugins.zsh diff --git a/zsh/.config/zsh/config/prompt.zsh b/dot_config/zsh/config/prompt.zsh similarity index 100% rename from zsh/.config/zsh/config/prompt.zsh rename to dot_config/zsh/config/prompt.zsh diff --git a/zsh/.config/zsh/.p10k.zsh b/dot_config/zsh/dot_p10k.zsh similarity index 100% rename from zsh/.config/zsh/.p10k.zsh rename to dot_config/zsh/dot_p10k.zsh diff --git a/zsh/.config/zsh/.zshrc b/dot_config/zsh/dot_zshrc similarity index 100% rename from zsh/.config/zsh/.zshrc rename to dot_config/zsh/dot_zshrc diff --git a/git/.gitconfig b/dot_gitconfig similarity index 100% rename from git/.gitconfig rename to dot_gitconfig diff --git a/git/.gitignore_global b/dot_gitignore_global similarity index 100% rename from git/.gitignore_global rename to dot_gitignore_global diff --git a/tmux/.tmux.conf b/dot_tmux.conf similarity index 100% rename from tmux/.tmux.conf rename to dot_tmux.conf diff --git a/tmux/.tmux.conf.local b/dot_tmux.conf.local similarity index 100% rename from tmux/.tmux.conf.local rename to dot_tmux.conf.local diff --git a/vim/.vimrc b/dot_vimrc similarity index 100% rename from vim/.vimrc rename to dot_vimrc diff --git a/zsh/.zshenv b/dot_zshenv similarity index 100% rename from zsh/.zshenv rename to dot_zshenv diff --git a/micro/.config/micro/buffers/history b/micro/.config/micro/buffers/history deleted file mode 100644 index 2a56670..0000000 Binary files a/micro/.config/micro/buffers/history and /dev/null differ diff --git a/ssh/.ssh/config b/private_dot_ssh/config similarity index 100% rename from ssh/.ssh/config rename to private_dot_ssh/config diff --git a/ssh/.ssh/config.d/00-globals.conf b/private_dot_ssh/config.d/00-globals.conf similarity index 100% rename from ssh/.ssh/config.d/00-globals.conf rename to private_dot_ssh/config.d/00-globals.conf diff --git a/ssh/.ssh/config.d/10-local.conf b/private_dot_ssh/config.d/10-local.conf similarity index 100% rename from ssh/.ssh/config.d/10-local.conf rename to private_dot_ssh/config.d/10-local.conf diff --git a/ssh/.ssh/config.d/20-selfhost.conf b/private_dot_ssh/config.d/20-selfhost.conf similarity index 100% rename from ssh/.ssh/config.d/20-selfhost.conf rename to private_dot_ssh/config.d/20-selfhost.conf diff --git a/ssh/.ssh/config.d/30-corporate.conf b/private_dot_ssh/config.d/30-corporate.conf similarity index 100% rename from ssh/.ssh/config.d/30-corporate.conf rename to private_dot_ssh/config.d/30-corporate.conf diff --git a/ssh/.ssh/config.d/40-proxy.conf b/private_dot_ssh/config.d/40-proxy.conf similarity index 100% rename from ssh/.ssh/config.d/40-proxy.conf rename to private_dot_ssh/config.d/40-proxy.conf diff --git a/restic/.config/resticprofile/pass.txt b/restic/.config/resticprofile/pass.txt deleted file mode 100644 index 860f55c..0000000 --- a/restic/.config/resticprofile/pass.txt +++ /dev/null @@ -1 +0,0 @@ -?Holivarr588856 \ No newline at end of file diff --git a/zed/.config/zed/settings_backup.json b/zed/.config/zed/settings_backup.json deleted file mode 100644 index e770deb..0000000 --- a/zed/.config/zed/settings_backup.json +++ /dev/null @@ -1,153 +0,0 @@ -// Zed settings -// -// For information on how to configure Zed, see the Zed -// documentation: https://zed.dev/docs/configuring-zed -// -// To see all of Zed's default settings without changing your -// custom settings, run `zed: open default settings` from the -// command palette (cmd-shift-p / ctrl-shift-p) -{ - "base_keymap": "VSCode", - "use_smartcase_search": true, - "minimap": { - "show": "never" - }, - "scrollbar": { - "axes": { - "horizontal": true, - "vertical": true - } - }, - "cursor_blink": true, - "colorize_brackets": true, - "auto_indent_on_paste": true, - "show_whitespaces": "selection", - "ensure_final_newline_on_save": true, - "indent_guides": { - "enabled": true - }, - "preferred_line_length": 100, - "soft_wrap": "editor_width", - "hard_tabs": false, - "tab_size": 4, - "session": { - "trust_all_worktrees": false - }, - "edit_predictions": { - "provider": "copilot" - }, - "outline_panel": { - "git_status": true, - "auto_fold_dirs": true, - }, - "use_system_window_tabs": true, - "centered_layout": { - "left_padding": 0.2, - }, - "redact_private_values": false, - "cursor_shape": "bar", - "autosave": { - "after_delay": { - "milliseconds": 5000, - }, - }, - "preview_tabs": { - "enabled": true, - "enable_preview_from_multibuffer": true, - "enable_preview_from_file_finder": false, - }, - "pane_split_direction_vertical": "right", - "zoomed_padding": true, - "active_pane_modifiers": { - "inactive_opacity": 1.0, - "border_size": 0.0, - }, - "status_bar": { - "experimental.show": true, - "active_language_button": true, - "cursor_position_button": true, - }, - "terminal": { - "font_family": "FiraCode Nerd Font Mono", - "font_size": 14.0, - "dock": "bottom", - "button": true, - }, - "diagnostics": { - "button": true, - }, - "search": { - "button": true, - }, - "debugger": { - "button": true, - }, - "tabs": { - "show_diagnostics": "errors", - "close_position": "right", - "file_icons": true, - "git_status": true, - }, - "tab_bar": { - "show": true, - }, - "title_bar": { - "show_menus": false, - "show_user_picture": false, - "show_onboarding_banner": true, - "show_project_items": true, - "show_branch_name": true, - "show_branch_icon": true, - }, - "project_panel": { - "sort_mode": "directories_first", - "dock": "left", - "hide_root": true, - "button": true, - "indent_size": 15.0, - "git_status": true, - "folder_icons": true, - "file_icons": true, - "hide_gitignore": false, - }, - "agent": { - "button": true, - "always_allow_tool_actions": true, - "inline_assistant_model": { - "provider": "copilot_chat", - "model": "grok-code-fast-1", - }, - "default_profile": "ask", - "default_model": { - "provider": "copilot_chat", - "model": "gpt-5.1-codex-max", - }, - "model_parameters": [], - }, - "collaboration_panel": { - "button": false, - "dock": "right", - }, - "ui_font_family": "FiraCode Nerd Font Mono", - "telemetry": { - "diagnostics": false, - "metrics": false, - }, - "buffer_font_weight": 400.0, - "ui_font_weight": 400.0, - "buffer_font_family": "FiraCode Nerd Font Mono", - "buffer_line_height": "comfortable", - "icon_theme": { - "mode": "system", - "light": "Material Icon Theme", - "dark": "Catppuccin Frappé", - }, - "ui_font_size": 16.0, - "buffer_font_size": 14.0, - "proxy": "http://127.0.0.1:8118", - "theme": { - "mode": "system", - "light": "One Light", - "dark": "One Dark", - }, -}