feat(restic): update backup profiles and ignore patterns for improved organization
fix(ssh): clean up whitespace in SSH configuration files feat(zed): enhance Zed settings with new configurations and improved defaults fix(zsh): remove unused editor aliases for cleaner alias management
This commit is contained in:
@@ -1,3 +1,18 @@
|
|||||||
|
# --- Контроль версий ---
|
||||||
|
.git/
|
||||||
|
.gitignore
|
||||||
|
.hg/
|
||||||
|
.svn/
|
||||||
|
.fossil/
|
||||||
|
|
||||||
|
# --- Кэши пакетов и зависимостей ---
|
||||||
|
.cache/pip/
|
||||||
|
.cache/npm/
|
||||||
|
.yarn/cache/
|
||||||
|
.cargo/registry/
|
||||||
|
~/.gradle/
|
||||||
|
~/.m2/
|
||||||
|
|
||||||
# --- Зависимости (самое тяжелое) ---
|
# --- Зависимости (самое тяжелое) ---
|
||||||
venv/
|
venv/
|
||||||
.venv/
|
.venv/
|
||||||
|
|||||||
@@ -1,60 +1,19 @@
|
|||||||
default:
|
|
||||||
repository: "rclone:yadisk:System/Backups/ada-x1"
|
|
||||||
password-file: "/home/ada/.config/resticprofile/pass.txt"
|
|
||||||
exclude-file: "/home/ada/.config/resticprofile/.resticignore"
|
|
||||||
initialize: false
|
|
||||||
|
|
||||||
# Общие опции для всех backup команд
|
|
||||||
backup:
|
|
||||||
check-before: false # не проверять перед backup'ом для скорости
|
|
||||||
use-fs-snapshot: false
|
|
||||||
|
|
||||||
# Очистка старых снимков
|
|
||||||
forget:
|
|
||||||
group-by: "host,paths"
|
|
||||||
keep-last: 10
|
|
||||||
keep-daily: 7
|
|
||||||
keep-weekly: 4
|
|
||||||
keep-monthly: 6
|
|
||||||
prune: true
|
|
||||||
|
|
||||||
groups:
|
groups:
|
||||||
all:
|
all:
|
||||||
- dotfiles
|
|
||||||
- projects
|
- projects
|
||||||
- vaults
|
- vaults
|
||||||
- files
|
- files
|
||||||
- pictures
|
- pictures
|
||||||
schedule: "0 * * * *"
|
schedule: "0 * * * *"
|
||||||
|
|
||||||
# Критичные данные - конфиги и dotfiles
|
|
||||||
dotfiles:
|
|
||||||
repository: "rclone:yadisk:System/Backups/ada-x1"
|
|
||||||
password-file: "/home/ada/.config/resticprofile/pass.txt"
|
|
||||||
backup:
|
|
||||||
source:
|
|
||||||
- /home/ada/.dotfiles
|
|
||||||
- /home/ada/.config
|
|
||||||
- /home/ada/.ssh
|
|
||||||
schedule: "*-*-* 0,6,12,18:00:00" # каждые 6 часов (0, 6, 12, 18)
|
|
||||||
retain:
|
|
||||||
keep-last: 28 # последние 28 часов
|
|
||||||
keep-daily: 30 # месячные
|
|
||||||
keep-monthly: 12 # год архивов
|
|
||||||
exclude:
|
|
||||||
- "**/.git"
|
|
||||||
- "**/node_modules"
|
|
||||||
- "**/__pycache__"
|
|
||||||
|
|
||||||
# Код и проекты - часто меняются
|
|
||||||
projects:
|
projects:
|
||||||
repository: "rclone:yadisk:System/Backups/ada-x1"
|
repository: "rclone:yadisk:System/Backups/ada-x1/Documents/Projects"
|
||||||
password-file: "/home/ada/.config/resticprofile/pass.txt"
|
password-file: "/home/ada/.config/resticprofile/pass.txt"
|
||||||
backup:
|
backup:
|
||||||
source:
|
source:
|
||||||
- /home/ada/Documents/Projects
|
- /home/ada/Documents/Projects
|
||||||
schedule: "*-*-* *:15:00" # каждый час в 15 минут
|
schedule: "*-*-* *:15:00" # каждый час в 15 минут
|
||||||
retain:
|
forget:
|
||||||
keep-last: 24
|
keep-last: 24
|
||||||
keep-daily: 14
|
keep-daily: 14
|
||||||
keep-monthly: 3
|
keep-monthly: 3
|
||||||
@@ -66,40 +25,39 @@ projects:
|
|||||||
|
|
||||||
# Важные данные
|
# Важные данные
|
||||||
vaults:
|
vaults:
|
||||||
repository: "rclone:yadisk:System/Backups/ada-x1"
|
repository: "rclone:yadisk:System/Backups/ada-x1/Documents/Vaults"
|
||||||
password-file: "/home/ada/.config/resticprofile/pass.txt"
|
password-file: "/home/ada/.config/resticprofile/pass.txt"
|
||||||
backup:
|
backup:
|
||||||
source:
|
source:
|
||||||
- /home/ada/Documents/Vaults
|
- /home/ada/Documents/Vaults
|
||||||
schedule: "*-*-* *:30:00" # каждый час в 30 минут
|
schedule: "*-*-* *:30:00" # каждый час в 30 минут
|
||||||
retain:
|
forget:
|
||||||
keep-last: 12
|
keep-last: 12
|
||||||
keep-daily: 7
|
keep-daily: 7
|
||||||
keep-monthly: 12
|
keep-monthly: 12
|
||||||
|
|
||||||
# Документы
|
# Документы
|
||||||
files:
|
files:
|
||||||
repository: "rclone:yadisk:System/Backups/ada-x1"
|
repository: "rclone:yadisk:System/Backups/ada-x1/Documents/Files"
|
||||||
password-file: "/home/ada/.config/resticprofile/pass.txt"
|
password-file: "/home/ada/.config/resticprofile/pass.txt"
|
||||||
backup:
|
backup:
|
||||||
source:
|
source:
|
||||||
- /home/ada/Documents/Files
|
- /home/ada/Documents/Files
|
||||||
schedule: "*-*-* 02:15:00" # 02:15 каждый день
|
schedule: "*-*-* 02:15:00" # 02:15 каждый день
|
||||||
retain:
|
forget:
|
||||||
keep-daily: 30
|
keep-daily: 30
|
||||||
keep-weekly: 12
|
keep-weekly: 12
|
||||||
keep-yearly: 1
|
keep-yearly: 1
|
||||||
|
|
||||||
# Фотографии и видео
|
# Фотографии и видео
|
||||||
pictures:
|
pictures:
|
||||||
repository: "rclone:yadisk:System/Backups/ada-x1"
|
repository: "rclone:yadisk:System/Backups/ada-x1/Pictures"
|
||||||
password-file: "/home/ada/.config/resticprofile/pass.txt"
|
password-file: "/home/ada/.config/resticprofile/pass.txt"
|
||||||
backup:
|
backup:
|
||||||
source:
|
source:
|
||||||
- /home/ada/Pictures
|
- /home/ada/Pictures
|
||||||
- /home/ada/Videos
|
|
||||||
schedule: "*-*-* 03:30:00" # 03:30 каждый день
|
schedule: "*-*-* 03:30:00" # 03:30 каждый день
|
||||||
retain:
|
forget:
|
||||||
keep-daily: 14
|
keep-daily: 14
|
||||||
keep-weekly: 8
|
keep-weekly: 8
|
||||||
keep-monthly: 12
|
keep-monthly: 12
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ Host vps vps-ada
|
|||||||
User ada
|
User ada
|
||||||
IdentityFile ~/.ssh/id_ed25519_homelab
|
IdentityFile ~/.ssh/id_ed25519_homelab
|
||||||
|
|
||||||
|
|
||||||
# ZimaOS
|
# ZimaOS
|
||||||
Host home zima
|
Host home zima
|
||||||
HostName 100.124.120.78
|
HostName 100.124.120.78
|
||||||
|
|||||||
@@ -7,10 +7,37 @@
|
|||||||
// custom settings, run `zed: open default settings` from the
|
// custom settings, run `zed: open default settings` from the
|
||||||
// command palette (cmd-shift-p / ctrl-shift-p)
|
// 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": {
|
"edit_predictions": {
|
||||||
"provider": "copilot"
|
"provider": "copilot"
|
||||||
},
|
},
|
||||||
"outline_panel": {
|
"outline_panel": {
|
||||||
|
"git_status": true,
|
||||||
"auto_fold_dirs": true,
|
"auto_fold_dirs": true,
|
||||||
},
|
},
|
||||||
"use_system_window_tabs": true,
|
"use_system_window_tabs": true,
|
||||||
@@ -21,7 +48,7 @@
|
|||||||
"cursor_shape": "bar",
|
"cursor_shape": "bar",
|
||||||
"autosave": {
|
"autosave": {
|
||||||
"after_delay": {
|
"after_delay": {
|
||||||
"milliseconds": 1000,
|
"milliseconds": 5000,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"preview_tabs": {
|
"preview_tabs": {
|
||||||
@@ -36,10 +63,13 @@
|
|||||||
"border_size": 0.0,
|
"border_size": 0.0,
|
||||||
},
|
},
|
||||||
"status_bar": {
|
"status_bar": {
|
||||||
|
"experimental.show": true,
|
||||||
"active_language_button": true,
|
"active_language_button": true,
|
||||||
"cursor_position_button": true,
|
"cursor_position_button": true,
|
||||||
},
|
},
|
||||||
"terminal": {
|
"terminal": {
|
||||||
|
"font_family": "FiraCode Nerd Font Mono",
|
||||||
|
"font_size": 14.0,
|
||||||
"dock": "bottom",
|
"dock": "bottom",
|
||||||
"button": true,
|
"button": true,
|
||||||
},
|
},
|
||||||
@@ -81,8 +111,10 @@
|
|||||||
"hide_gitignore": false,
|
"hide_gitignore": false,
|
||||||
},
|
},
|
||||||
"agent": {
|
"agent": {
|
||||||
|
"tool_permissions": {
|
||||||
|
"default": "allow"
|
||||||
|
},
|
||||||
"button": true,
|
"button": true,
|
||||||
"always_allow_tool_actions": true,
|
|
||||||
"inline_assistant_model": {
|
"inline_assistant_model": {
|
||||||
"provider": "copilot_chat",
|
"provider": "copilot_chat",
|
||||||
"model": "grok-code-fast-1",
|
"model": "grok-code-fast-1",
|
||||||
@@ -113,11 +145,11 @@
|
|||||||
"dark": "Catppuccin Frappé",
|
"dark": "Catppuccin Frappé",
|
||||||
},
|
},
|
||||||
"ui_font_size": 16.0,
|
"ui_font_size": 16.0,
|
||||||
"buffer_font_size": 15.0,
|
"buffer_font_size": 14.0,
|
||||||
"proxy": "http://127.0.0.1:8118",
|
"proxy": "http://127.0.0.1:8118",
|
||||||
"theme": {
|
"theme": {
|
||||||
"mode": "system",
|
"mode": "system",
|
||||||
"light": "Nord Light",
|
"light": "Ayu Light",
|
||||||
"dark": "Catppuccin Frappé",
|
"dark": "One Dark",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,37 @@
|
|||||||
// custom settings, run `zed: open default settings` from the
|
// custom settings, run `zed: open default settings` from the
|
||||||
// command palette (cmd-shift-p / ctrl-shift-p)
|
// 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": {
|
"outline_panel": {
|
||||||
|
"git_status": true,
|
||||||
"auto_fold_dirs": true,
|
"auto_fold_dirs": true,
|
||||||
},
|
},
|
||||||
"use_system_window_tabs": true,
|
"use_system_window_tabs": true,
|
||||||
@@ -18,7 +48,7 @@
|
|||||||
"cursor_shape": "bar",
|
"cursor_shape": "bar",
|
||||||
"autosave": {
|
"autosave": {
|
||||||
"after_delay": {
|
"after_delay": {
|
||||||
"milliseconds": 1000,
|
"milliseconds": 5000,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"preview_tabs": {
|
"preview_tabs": {
|
||||||
@@ -33,10 +63,13 @@
|
|||||||
"border_size": 0.0,
|
"border_size": 0.0,
|
||||||
},
|
},
|
||||||
"status_bar": {
|
"status_bar": {
|
||||||
|
"experimental.show": true,
|
||||||
"active_language_button": true,
|
"active_language_button": true,
|
||||||
"cursor_position_button": true,
|
"cursor_position_button": true,
|
||||||
},
|
},
|
||||||
"terminal": {
|
"terminal": {
|
||||||
|
"font_family": "FiraCode Nerd Font Mono",
|
||||||
|
"font_size": 14.0,
|
||||||
"dock": "bottom",
|
"dock": "bottom",
|
||||||
"button": true,
|
"button": true,
|
||||||
},
|
},
|
||||||
@@ -95,9 +128,6 @@
|
|||||||
"button": false,
|
"button": false,
|
||||||
"dock": "right",
|
"dock": "right",
|
||||||
},
|
},
|
||||||
"features": {
|
|
||||||
"edit_prediction_provider": "copilot",
|
|
||||||
},
|
|
||||||
"ui_font_family": "FiraCode Nerd Font Mono",
|
"ui_font_family": "FiraCode Nerd Font Mono",
|
||||||
"telemetry": {
|
"telemetry": {
|
||||||
"diagnostics": false,
|
"diagnostics": false,
|
||||||
@@ -113,11 +143,11 @@
|
|||||||
"dark": "Catppuccin Frappé",
|
"dark": "Catppuccin Frappé",
|
||||||
},
|
},
|
||||||
"ui_font_size": 16.0,
|
"ui_font_size": 16.0,
|
||||||
"buffer_font_size": 15.0,
|
"buffer_font_size": 14.0,
|
||||||
"proxy": "http://127.0.0.1:8118",
|
"proxy": "http://127.0.0.1:8118",
|
||||||
"theme": {
|
"theme": {
|
||||||
"mode": "system",
|
"mode": "system",
|
||||||
"light": "Nord Light",
|
"light": "One Light",
|
||||||
"dark": "Catppuccin Frappé",
|
"dark": "One Dark",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -51,11 +51,6 @@ alias df='df -h'
|
|||||||
alias du='du -h'
|
alias du='du -h'
|
||||||
alias free='free -h'
|
alias free='free -h'
|
||||||
|
|
||||||
# Быстрый доступ к редактору
|
|
||||||
alias v='${EDITOR}'
|
|
||||||
alias vim='nvim'
|
|
||||||
alias vi='nvim'
|
|
||||||
|
|
||||||
# ═══ Сеть ══════════════════════════════════════════════════
|
# ═══ Сеть ══════════════════════════════════════════════════
|
||||||
alias ping='ping -c 5'
|
alias ping='ping -c 5'
|
||||||
alias ports='netstat -tulanp'
|
alias ports='netstat -tulanp'
|
||||||
@@ -173,4 +168,4 @@ alias cheat='curl cheat.sh'
|
|||||||
alias timer='echo "Timer started. Stop with Ctrl-D." && date && time cat && date'
|
alias timer='echo "Timer started. Stop with Ctrl-D." && date && time cat && date'
|
||||||
alias lidon='sudo systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target'
|
alias lidon='sudo systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target'
|
||||||
alias lidoff='sudo systemctl unmask sleep.target suspend.target hibernate.target hybrid-sleep.target'
|
alias lidoff='sudo systemctl unmask sleep.target suspend.target hibernate.target hybrid-sleep.target'
|
||||||
alias gemini='NODE_NO_WARNINGS=1 npx @google/gemini-cli'
|
# alias gemini='NODE_NO_WARNINGS=1 npx @google/gemini-cli'
|
||||||
|
|||||||
Reference in New Issue
Block a user