diff --git a/private_dot_config/jj/config.toml.tmpl.orig b/private_dot_config/jj/config.toml.tmpl.orig deleted file mode 100644 index 1f0a79c..0000000 --- a/private_dot_config/jj/config.toml.tmpl.orig +++ /dev/null @@ -1,96 +0,0 @@ -<<<<<<< HEAD -'$schema' = 'https://jj-vcs.github.io/jj/latest/config-schema.json' - -[user] -name = "{{ .name }}" -email = "{{ .email }}" - -[ui] -default-command = "log" -diff-formatter = ["difft", "--color=always", "$left", "$right"] -show-cryptographic-signatures = true -editor = "nano" -diff-editor = ":builtin" -# fixes nerd icons in less pager -pager = { command = ["less", "-FRX"], env = { LESSCHARSET = "utf-8", LESSUTFCHARDEF = "E000-F8FF:p,F0000-FFFFD:p,100000-10FFFD:p" } } -{{ if eq .chezmoi.os "darwin" -}} -merge-editor = "ksdiff" -[merge-tools.ksdiff] -diff-invocation-mode = "file-by-file" -diff-args = ["--partial-changeset", "$left", "$right"] -merge-args = ["--merge", "--output", "$output", "--base", "$base", "$left", "$right"] -{{- end }} - - -[signing] -behavior = "drop" -backend = "ssh" -key = "{{ .signingkey }}" -backends.ssh.allowed-signers = {{joinPath .chezmoi.homeDir ".ssh" "allowed_signers" | quote}} - - -[git] -sign-on-push = true -write-change-id-header = true - -[revsets] -bookmark-advance-to = 'closest_pushable(@)' - -[revset-aliases] -# Closest revision that is mutable, described and either non-empty or a merge -'closest_pushable(to)' = ''' - heads(::to & mutable() & ~description(exact:"") & (~empty() | merges())) -''' - -[aliases] -pr = ["util", "exec", "--", "jj-gh", "pr"] -push = ["util", "exec", "--", "jj-hp", "push"] - -[jj-hooks] -advance-bookmarks = true - -||||||| 0e3d8c1 - -======= -'$schema' = 'https://jj-vcs.github.io/jj/latest/config-schema.json' - -[user] -name = "{{ .name }}" -email = "{{ .email }}" - -[ui] -default-command = "log" -diff-formatter = ["difft", "--color=always", "$left", "$right"] -show-cryptographic-signatures = true -editor = "nano" -diff-editor = ":builtin" -{{ if eq .chezmoi.os "darwin" -}} -merge-editor = "ksdiff" -[merge-tools.ksdiff] -diff-invocation-mode = "file-by-file" -diff-args = ["--partial-changeset", "$left", "$right"] -merge-args = ["--merge", "--output", "$output", "--base", "$base", "$left", "$right"] -{{- end }} - - -[signing] -behavior = "drop" -backend = "ssh" -key = "{{ .signingkey }}" -backends.ssh.allowed-signers = {{joinPath .chezmoi.homeDir ".ssh" "allowed_signers" | quote}} - - -[git] -sign-on-push = true -write-change-id-header = true - -[revsets] -bookmark-advance-to = 'closest_pushable(@)' - -[revset-aliases] -# Closest revision that is mutable, described and either non-empty or a merge -'closest_pushable(to)' = ''' - heads(::to & mutable() & ~description(exact:"") & (~empty() | merges())) -''' - ->>>>>>> 118bd7f900663e94ce112397f72e24b42df8e3e3 \ No newline at end of file diff --git a/private_dot_config/private_fish/config.fish b/private_dot_config/private_fish/config.fish index e893477..cd908c0 100644 --- a/private_dot_config/private_fish/config.fish +++ b/private_dot_config/private_fish/config.fish @@ -30,4 +30,4 @@ source ~/.orbstack/shell/init2.fish 2>/dev/null || : # Added by LM Studio CLI (lms) set -gx PATH $PATH /Users/jack/.lmstudio/bin # End of LM Studio CLI section - +_zoxide_uninstall diff --git a/private_dot_config/zed/private_settings.json.orig b/private_dot_config/zed/private_settings.json.orig deleted file mode 100644 index bb055ec..0000000 --- a/private_dot_config/zed/private_settings.json.orig +++ /dev/null @@ -1,337 +0,0 @@ -<<<<<<< HEAD -// 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 the `open default settings` command -// from the command palette or from `Zed` application menu. -{ - "ui_font_size": 16.0, - "buffer_font_weight": 400.0, - "colorize_brackets": true, - "completion_menu_item_kind": "symbol", - "language_models": { - "opencode": { - "show_go_models": false, - "show_zen_models": false, - }, - "lmstudio": { - "api_url": "http://localhost:1234/api/v0", - }, - }, - "which_key": { - "enabled": true, - }, - "agent_servers": { - "github-copilot-cli": { - "type": "registry", - }, - }, - "cli_default_open_behavior": "existing_window", - "buffer_font_size": 12.0, - "theme": "Monokai Pro (CE)", - "icon_theme": "Zed (Default)", - "project_panel": { - "dock": "right", - }, - "outline_panel": { - "dock": "right", - }, - "collaboration_panel": { - "dock": "right", - }, - "git_panel": { - "dock": "right", - }, - "ui_font_weight": 400.0, - "ui_font_family": ".ZedSans", - "edit_predictions": { - "allow_data_collection": "no", - "disabled_globs": [], - "mode": "eager", - "copilot": { - "enable_next_edit_suggestions": true, - }, - "provider": "zed", - }, - "buffer_line_height": "standard", - "git": { - "inline_blame": { - "enabled": true, - "show_commit_summary": false, - }, - }, - "auto_indent_on_paste": true, - "wrap_guides": [80], - "tab_size": 4, - "autosave": "on_window_change", - "multi_cursor_modifier": "cmd_or_ctrl", - "minimap": { - "show": "always", - "current_line_highlight": "all", - "thumb": "always", - }, - "current_line_highlight": "all", - "cursor_blink": true, - "agent": { - "profiles": {}, - "favorite_models": [ - { - "provider": "zed.dev", - "model": "gpt-5-mini", - "enable_thinking": false, - }, - { - "provider": "zed.dev", - "model": "claude-haiku-4-5", - "enable_thinking": false, - }, - { - "provider": "zed.dev", - "model": "gpt-5-nano", - "enable_thinking": false, - }, - { - "provider": "zed.dev", - "model": "gpt-5.5", - "enable_thinking": true, - "effort": "medium", - }, - { - "provider": "zed.dev", - "model": "gpt-5.2", - "enable_thinking": false, - }, - ], - "sidebar_side": "left", - "dock": "left", - "tool_permissions": { - "default": "allow", - }, - "default_profile": "write", - "button": true, - "enabled": true, - "default_model": { - "enable_thinking": false, - "provider": "zed.dev", - "model": "claude-haiku-4-5", - }, - }, - "base_keymap": "VSCode", - // "ui_font_size": 14, - "buffer_font_family": "Berkeley Mono", - "buffer_font_fallbacks": ["Symbols Nerd Font Mono"], - "buffer_font_features": { "calt": false }, - "inlay_hints": { - "enabled": true, - "show_other_hints": true, - }, - "tabs": { - "file_icons": true, - }, - "languages": { - "Markdown": { - "show_edit_predictions": false, - }, - "Astro": { - "formatter": "prettier", - }, - "CSS": { - "formatter": "prettier", - "language_servers": [ - "tailwindcss-intellisense-css", - "!vscode-css-language-server", - ], - }, - "HTML": { "formatter": "prettier" }, - "JSON": { "formatter": "prettier" }, - "JSONC": { - "formatter": "prettier", - }, - "JavaScript": { - "formatter": "prettier", - }, - - "TSX": { "formatter": "prettier" }, - "TypeScript": { - "formatter": "prettier", - }, - }, - "terminal": { - "toolbar": { - "breadcrumbs": false, - }, - "cursor_shape": "bar", - "blinking": "on", - "font_family": "Berkeley Mono", - "font_size": 12.0, - "env": { - "EDITOR": "zed --wait", - "VISUAL": "zed --wait", - }, - }, -} - -||||||| 0e3d8c1 - -======= -// 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 the `open default settings` command -// from the command palette or from `Zed` application menu. -{ - "colorize_brackets": true, - "completion_menu_item_kind": "symbol", - "language_models": { - "opencode": { - "show_go_models": false, - "show_zen_models": false - }, - "lmstudio": { - "api_url": "http://localhost:1234/api/v0", - }, - }, - "which_key": { - "enabled": true, - }, - "agent_servers": { - "github-copilot-cli": { - "type": "registry", - }, - }, - "cli_default_open_behavior": "existing_window", - "buffer_font_size": 12.0, - "theme": "Monokai Pro (CE)", - "icon_theme": "Zed (Default)", - "project_panel": { - "dock": "right", - }, - "outline_panel": { - "dock": "right", - }, - "collaboration_panel": { - "dock": "right", - }, - "git_panel": { - "dock": "right", - }, - "ui_font_weight": 400.0, - "ui_font_family": ".ZedSans", - "edit_predictions": { - "allow_data_collection": "no", - "disabled_globs": [], - "mode": "eager", - "copilot": { - "enable_next_edit_suggestions": true, - }, - "provider": "zed", - }, - "buffer_line_height": "standard", - "git": { - "inline_blame": { - "enabled": true, - "show_commit_summary": false, - }, - }, - "auto_indent_on_paste": true, - "wrap_guides": [80], - "tab_size": 4, - "autosave": "on_window_change", - "multi_cursor_modifier": "cmd_or_ctrl", - "minimap": { - "show": "always", - "current_line_highlight": "all", - "thumb": "always", - }, - "current_line_highlight": "all", - "cursor_blink": true, - "agent": { - "profiles": {}, - "favorite_models": [ - { - "provider": "zed.dev", - "model": "gpt-5-mini", - "enable_thinking": false, - }, - { - "provider": "zed.dev", - "model": "claude-haiku-4-5", - "enable_thinking": false, - }, - { - "provider": "zed.dev", - "model": "gpt-5-nano", - "enable_thinking": false, - }, - { - "provider": "zed.dev", - "model": "gpt-5.5", - "enable_thinking": true, - "effort": "medium", - }, - { - "provider": "zed.dev", - "model": "gpt-5.2", - "enable_thinking": false, - }, - { - "provider": "zed.dev", - "model": "claude-sonnet-4-5", - "enable_thinking": true, - }, - ], - "sidebar_side": "left", - "dock": "left", - "tool_permissions": { - "default": "allow", - }, - "default_profile": "ask", - "button": true, - "enabled": true, - "default_model": { - "enable_thinking": false, - "provider": "opencode", - "model": "free/big-pickle", - }, - }, - "base_keymap": "VSCode", - // "ui_font_size": 14, - "buffer_font_family": "Berkeley Mono", - "buffer_font_fallbacks": ["Symbols Nerd Font Mono"], - "buffer_font_features": { "calt": false }, - "inlay_hints": { - "enabled": true, - "show_other_hints": true, - }, - "tabs": { - "file_icons": true, - }, - "languages": { - "Astro": { - // "language_servers": ["eslint"], - }, - "CSS": { - "language_servers": [ - "tailwindcss-intellisense-css", - "!vscode-css-language-server", - ], - }, - }, - "terminal": { - "toolbar": { - "breadcrumbs": false, - }, - "cursor_shape": "bar", - "blinking": "on", - "font_family": "Berkeley Mono", - "font_size": 12.0, - }, -} - ->>>>>>> 118bd7f900663e94ce112397f72e24b42df8e3e3 \ No newline at end of file