diff --git a/README.md b/README.md index 07d4f84..5c6649e 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,7 @@ resticprofile -n dotfiles check # проверить репозиторий # resticprofile (управление бэкапами) # или через пакетный менеджер вашей системы ``` - +t 4. **Настройка rclone** (нужно один раз): ```bash rclone config diff --git a/zed/.config/zed/settings.json b/zed/.config/zed/settings.json index f5665e3..9a4f084 100644 --- a/zed/.config/zed/settings.json +++ b/zed/.config/zed/settings.json @@ -1,150 +1,155 @@ { - "restore_on_startup": "launchpad", - "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": true - }, - "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": true, - "cursor_shape": "bar", - "autosave": { - "after_delay": { - "milliseconds": 5000, + "disable_ai": true, + "restore_on_startup": "launchpad", + "base_keymap": "VSCode", + "use_smartcase_search": true, + "minimap": { + "show": "never", }, - }, - "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": { - "tool_permissions": { - "default": "allow" + "scrollbar": { + "axes": { + "horizontal": true, + "vertical": true, + }, }, - "button": true, - "inline_assistant_model": { - "provider": "copilot_chat", - "model": "grok-code-fast-1", + "cursor_blink": true, + "colorize_brackets": true, + "auto_indent_on_paste": true, + "show_whitespaces": "selection", + "ensure_final_newline_on_save": true, + "indent_guides": { + "enabled": true, }, - "default_profile": "write", - "default_model": { - "effort": "high", - "provider": "copilot_chat", - "model": "gpt-5.4-mini", + "preferred_line_length": 100, + "soft_wrap": "editor_width", + "hard_tabs": false, + "tab_size": 4, + "session": { + "trust_all_worktrees": true, + }, + "edit_predictions": { + "provider": "none", + }, + "outline_panel": { + "git_status": true, + "auto_fold_dirs": true, + }, + "use_system_window_tabs": true, + "centered_layout": { + "left_padding": 0.2, + }, + "redact_private_values": true, + "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": "right", + "hide_root": true, + "button": true, + "indent_size": 15.0, + "git_status": true, + "folder_icons": true, + "file_icons": true, + "hide_gitignore": false, + }, + "agent": { + "enable_feedback": false, + "tool_permissions": { + "default": "allow", + }, + "button": true, + "inline_assistant_model": { + "provider": "copilot_chat", + "model": "grok-code-fast-1", + }, + "default_profile": "write", + "default_model": { + "effort": "high", + "provider": "copilot_chat", + "model": "gpt-5.4-mini", + }, + "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 Propo", + "buffer_line_height": "comfortable", + "icon_theme": { + "mode": "system", + "light": "Material Icon Theme", + "dark": "Material Icon Theme", + }, + "ui_font_size": 16.0, + "buffer_font_size": 14.0, + "proxy": "socks5://127.0.0.1:20170", + // "proxy": "socks5://ada:%3FHolivarr588856@157.22.231.198:1081", + "theme": { + "mode": "system", + "light": "Ayu Light", + "dark": "Tokyo Night", + }, + "features": { + "notebooks": true, }, - "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 Propo", - "buffer_line_height": "comfortable", - "icon_theme": { - "mode": "system", - "light": "Material Icon Theme", - "dark": "Material Icon Theme", - }, - "ui_font_size": 16.0, - "buffer_font_size": 14.0, - "proxy": "socks5://127.0.0.1:20170", - // "proxy": "socks5://ada:%3FHolivarr588856@157.22.231.198:1081", - "theme": { - "mode": "system", - "light": "Ayu Light", - "dark": "Nordfox - opaque", - }, } diff --git a/zsh/.config/zsh/config/aliases.zsh b/zsh/.config/zsh/config/aliases.zsh index 3bb875f..e85f76a 100644 --- a/zsh/.config/zsh/config/aliases.zsh +++ b/zsh/.config/zsh/config/aliases.zsh @@ -191,4 +191,13 @@ alias gbackup='git add . && git commit -m "backup: $(date +"%Y-%m-%d %H:%M")" && alias db_rev='rails db:drop && rails db:create && rails db:migrate && rails db:seed' -alias dotfiles='$VISUAL ~/.dotfiles' +alias zed='zeditor' +alias dotfiles='$VISUAL ~/dotfiles' +alias ua-drop-caches='sudo paccache -rk3; paru -Sc --noconfirm' +alias ua-update-all='export TMPFILE="$(mktemp)"; \ + sudo true; \ + rate-mirrors --save=$TMPFILE arch --max-delay=21600 \ + && sudo mv /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist-backup \ + && sudo mv $TMPFILE /etc/pacman.d/mirrorlist \ + && paru -Syyu --noconfirm \ + && ua-drop-caches' diff --git a/zsh/.config/zsh/config/env.zsh b/zsh/.config/zsh/config/env.zsh index 846652e..eb143ab 100644 --- a/zsh/.config/zsh/config/env.zsh +++ b/zsh/.config/zsh/config/env.zsh @@ -4,8 +4,9 @@ # ═══ Основные пути ═════════════════════════════════════════ export EDITOR="${EDITOR:-nano}" -export VISUAL="${VISUAL:-code}" +export VISUAL="${VISUAL:-zeditor}" export PAGER="less" +export SUDO_EDITOR="zeditor --wait" # ═══ XDG Base Directories ══════════════════════════════════ export XDG_CONFIG_HOME="${HOME}/.config"