diff --git a/private_dot_config/jj/config.toml.tmpl b/private_dot_config/jj/config.toml.tmpl index 41ba0ba..a7ed1ef 100644 --- a/private_dot_config/jj/config.toml.tmpl +++ b/private_dot_config/jj/config.toml.tmpl @@ -10,6 +10,8 @@ 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] @@ -38,3 +40,10 @@ bookmark-advance-to = 'closest_pushable(@)' '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 diff --git a/private_dot_config/mise/config.toml b/private_dot_config/mise/config.toml index 42fbf44..44e29e1 100644 --- a/private_dot_config/mise/config.toml +++ b/private_dot_config/mise/config.toml @@ -6,8 +6,8 @@ python = "latest" pnpm = "11" rust = "1.92.0" golangci-lint = "2.7.2" +"cargo:jj-gh" = "latest" aube = "latest" - [settings] experimental = true idiomatic_version_file_enable_tools = ["rust"] diff --git a/private_dot_config/zed/private_settings.json b/private_dot_config/zed/private_settings.json index 935249c..d747251 100644 --- a/private_dot_config/zed/private_settings.json +++ b/private_dot_config/zed/private_settings.json @@ -7,12 +7,14 @@ // 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 + "show_zen_models": false, }, "lmstudio": { "api_url": "http://localhost:1234/api/v0", @@ -101,24 +103,19 @@ "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", + "default_profile": "write", "button": true, "enabled": true, "default_model": { "enable_thinking": false, - "provider": "opencode", - "model": "free/big-pickle", + "provider": "zed.dev", + "model": "claude-haiku-4-5", }, }, "base_keymap": "VSCode", @@ -134,15 +131,32 @@ "file_icons": true, }, "languages": { + "Markdown": { + "show_edit_predictions": false, + }, "Astro": { - // "language_servers": ["eslint"], + "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": { @@ -152,5 +166,9 @@ "blinking": "on", "font_family": "Berkeley Mono", "font_size": 12.0, + "env": { + "EDITOR": "zed --wait", + "VISUAL": "zed --wait", + }, }, }