[READ-ONLY] Mirror of https://github.com/plttn/dotfiles.
Add .config/jj/config.toml.tmpl.orig Update .config/mise/config.toml Update .config/zed/settings.json Add .config/zed/settings.json.orig
Jack Platten
(Jul 3, 2026, 8:28 PM -0700)
5dd84171
c7e4c725
+443
-12
+96
private_dot_config/jj/config.toml.tmpl.orig
+96
private_dot_config/jj/config.toml.tmpl.orig
···
1
+
<<<<<<< HEAD
2
+
'$schema' = 'https://jj-vcs.github.io/jj/latest/config-schema.json'
3
+
4
+
[user]
5
+
name = "{{ .name }}"
6
+
email = "{{ .email }}"
7
+
8
+
[ui]
9
+
default-command = "log"
10
+
diff-formatter = ["difft", "--color=always", "$left", "$right"]
11
+
show-cryptographic-signatures = true
12
+
editor = "nano"
13
+
diff-editor = ":builtin"
14
+
# fixes nerd icons in less pager
15
+
pager = { command = ["less", "-FRX"], env = { LESSCHARSET = "utf-8", LESSUTFCHARDEF = "E000-F8FF:p,F0000-FFFFD:p,100000-10FFFD:p" } }
16
+
{{ if eq .chezmoi.os "darwin" -}}
17
+
merge-editor = "ksdiff"
18
+
[merge-tools.ksdiff]
19
+
diff-invocation-mode = "file-by-file"
20
+
diff-args = ["--partial-changeset", "$left", "$right"]
21
+
merge-args = ["--merge", "--output", "$output", "--base", "$base", "$left", "$right"]
22
+
{{- end }}
23
+
24
+
25
+
[signing]
26
+
behavior = "drop"
27
+
backend = "ssh"
28
+
key = "{{ .signingkey }}"
29
+
backends.ssh.allowed-signers = {{joinPath .chezmoi.homeDir ".ssh" "allowed_signers" | quote}}
30
+
31
+
32
+
[git]
33
+
sign-on-push = true
34
+
write-change-id-header = true
35
+
36
+
[revsets]
37
+
bookmark-advance-to = 'closest_pushable(@)'
38
+
39
+
[revset-aliases]
40
+
# Closest revision that is mutable, described and either non-empty or a merge
41
+
'closest_pushable(to)' = '''
42
+
heads(::to & mutable() & ~description(exact:"") & (~empty() | merges()))
43
+
'''
44
+
45
+
[aliases]
46
+
pr = ["util", "exec", "--", "jj-gh", "pr"]
47
+
push = ["util", "exec", "--", "jj-hp", "push"]
48
+
49
+
[jj-hooks]
50
+
advance-bookmarks = true
51
+
52
+
||||||| 0e3d8c1
53
+
54
+
=======
55
+
'$schema' = 'https://jj-vcs.github.io/jj/latest/config-schema.json'
56
+
57
+
[user]
58
+
name = "{{ .name }}"
59
+
email = "{{ .email }}"
60
+
61
+
[ui]
62
+
default-command = "log"
63
+
diff-formatter = ["difft", "--color=always", "$left", "$right"]
64
+
show-cryptographic-signatures = true
65
+
editor = "nano"
66
+
diff-editor = ":builtin"
67
+
{{ if eq .chezmoi.os "darwin" -}}
68
+
merge-editor = "ksdiff"
69
+
[merge-tools.ksdiff]
70
+
diff-invocation-mode = "file-by-file"
71
+
diff-args = ["--partial-changeset", "$left", "$right"]
72
+
merge-args = ["--merge", "--output", "$output", "--base", "$base", "$left", "$right"]
73
+
{{- end }}
74
+
75
+
76
+
[signing]
77
+
behavior = "drop"
78
+
backend = "ssh"
79
+
key = "{{ .signingkey }}"
80
+
backends.ssh.allowed-signers = {{joinPath .chezmoi.homeDir ".ssh" "allowed_signers" | quote}}
81
+
82
+
83
+
[git]
84
+
sign-on-push = true
85
+
write-change-id-header = true
86
+
87
+
[revsets]
88
+
bookmark-advance-to = 'closest_pushable(@)'
89
+
90
+
[revset-aliases]
91
+
# Closest revision that is mutable, described and either non-empty or a merge
92
+
'closest_pushable(to)' = '''
93
+
heads(::to & mutable() & ~description(exact:"") & (~empty() | merges()))
94
+
'''
95
+
96
+
>>>>>>> 118bd7f900663e94ce112397f72e24b42df8e3e3
+2
-12
private_dot_config/mise/config.toml
+2
-12
private_dot_config/mise/config.toml
···
1
1
[tools]
2
-
node = "22"
2
+
node = "24"
3
3
go = "latest"
4
4
usage = "latest"
5
5
python = "latest"
···
7
7
rust = "1.92.0"
8
8
golangci-lint = "2.7.2"
9
9
"cargo:jj-gh" = "latest"
10
-
aube = "latest"
11
10
[settings]
12
11
experimental = true
13
12
idiomatic_version_file_enable_tools = ["rust"]
14
-
[env]
15
-
[tools]
16
-
node = "22"
17
-
go = "latest"
18
-
usage = "latest"
19
-
python = "latest"
20
-
pnpm = "11"
21
-
rust = "1.92.0"
22
-
golangci-lint = "2.7.2"
23
-
aube = "latest"
13
+
24
14
[env]
+8
private_dot_config/zed/private_settings.json
+8
private_dot_config/zed/private_settings.json
···
171
171
"VISUAL": "zed --wait",
172
172
},
173
173
},
174
+
"file_types": {
175
+
"Git Attributes": ["**/{git,.git,.git/info}/attributes"],
176
+
"Git Config": [
177
+
"*.gitconfig",
178
+
"**/{git,.git,.git/modules,.git/modules/*}/config",
179
+
],
180
+
"Git Ignore": ["**/{git,.git}/ignore", "**/.git/info/exclude"],
181
+
},
174
182
}
+337
private_dot_config/zed/private_settings.json.orig
+337
private_dot_config/zed/private_settings.json.orig
···
1
+
<<<<<<< HEAD
2
+
// Zed settings
3
+
//
4
+
// For information on how to configure Zed, see the Zed
5
+
// documentation: https://zed.dev/docs/configuring-zed
6
+
//
7
+
// To see all of Zed's default settings without changing your
8
+
// custom settings, run the `open default settings` command
9
+
// from the command palette or from `Zed` application menu.
10
+
{
11
+
"ui_font_size": 16.0,
12
+
"buffer_font_weight": 400.0,
13
+
"colorize_brackets": true,
14
+
"completion_menu_item_kind": "symbol",
15
+
"language_models": {
16
+
"opencode": {
17
+
"show_go_models": false,
18
+
"show_zen_models": false,
19
+
},
20
+
"lmstudio": {
21
+
"api_url": "http://localhost:1234/api/v0",
22
+
},
23
+
},
24
+
"which_key": {
25
+
"enabled": true,
26
+
},
27
+
"agent_servers": {
28
+
"github-copilot-cli": {
29
+
"type": "registry",
30
+
},
31
+
},
32
+
"cli_default_open_behavior": "existing_window",
33
+
"buffer_font_size": 12.0,
34
+
"theme": "Monokai Pro (CE)",
35
+
"icon_theme": "Zed (Default)",
36
+
"project_panel": {
37
+
"dock": "right",
38
+
},
39
+
"outline_panel": {
40
+
"dock": "right",
41
+
},
42
+
"collaboration_panel": {
43
+
"dock": "right",
44
+
},
45
+
"git_panel": {
46
+
"dock": "right",
47
+
},
48
+
"ui_font_weight": 400.0,
49
+
"ui_font_family": ".ZedSans",
50
+
"edit_predictions": {
51
+
"allow_data_collection": "no",
52
+
"disabled_globs": [],
53
+
"mode": "eager",
54
+
"copilot": {
55
+
"enable_next_edit_suggestions": true,
56
+
},
57
+
"provider": "zed",
58
+
},
59
+
"buffer_line_height": "standard",
60
+
"git": {
61
+
"inline_blame": {
62
+
"enabled": true,
63
+
"show_commit_summary": false,
64
+
},
65
+
},
66
+
"auto_indent_on_paste": true,
67
+
"wrap_guides": [80],
68
+
"tab_size": 4,
69
+
"autosave": "on_window_change",
70
+
"multi_cursor_modifier": "cmd_or_ctrl",
71
+
"minimap": {
72
+
"show": "always",
73
+
"current_line_highlight": "all",
74
+
"thumb": "always",
75
+
},
76
+
"current_line_highlight": "all",
77
+
"cursor_blink": true,
78
+
"agent": {
79
+
"profiles": {},
80
+
"favorite_models": [
81
+
{
82
+
"provider": "zed.dev",
83
+
"model": "gpt-5-mini",
84
+
"enable_thinking": false,
85
+
},
86
+
{
87
+
"provider": "zed.dev",
88
+
"model": "claude-haiku-4-5",
89
+
"enable_thinking": false,
90
+
},
91
+
{
92
+
"provider": "zed.dev",
93
+
"model": "gpt-5-nano",
94
+
"enable_thinking": false,
95
+
},
96
+
{
97
+
"provider": "zed.dev",
98
+
"model": "gpt-5.5",
99
+
"enable_thinking": true,
100
+
"effort": "medium",
101
+
},
102
+
{
103
+
"provider": "zed.dev",
104
+
"model": "gpt-5.2",
105
+
"enable_thinking": false,
106
+
},
107
+
],
108
+
"sidebar_side": "left",
109
+
"dock": "left",
110
+
"tool_permissions": {
111
+
"default": "allow",
112
+
},
113
+
"default_profile": "write",
114
+
"button": true,
115
+
"enabled": true,
116
+
"default_model": {
117
+
"enable_thinking": false,
118
+
"provider": "zed.dev",
119
+
"model": "claude-haiku-4-5",
120
+
},
121
+
},
122
+
"base_keymap": "VSCode",
123
+
// "ui_font_size": 14,
124
+
"buffer_font_family": "Berkeley Mono",
125
+
"buffer_font_fallbacks": ["Symbols Nerd Font Mono"],
126
+
"buffer_font_features": { "calt": false },
127
+
"inlay_hints": {
128
+
"enabled": true,
129
+
"show_other_hints": true,
130
+
},
131
+
"tabs": {
132
+
"file_icons": true,
133
+
},
134
+
"languages": {
135
+
"Markdown": {
136
+
"show_edit_predictions": false,
137
+
},
138
+
"Astro": {
139
+
"formatter": "prettier",
140
+
},
141
+
"CSS": {
142
+
"formatter": "prettier",
143
+
"language_servers": [
144
+
"tailwindcss-intellisense-css",
145
+
"!vscode-css-language-server",
146
+
],
147
+
},
148
+
"HTML": { "formatter": "prettier" },
149
+
"JSON": { "formatter": "prettier" },
150
+
"JSONC": {
151
+
"formatter": "prettier",
152
+
},
153
+
"JavaScript": {
154
+
"formatter": "prettier",
155
+
},
156
+
157
+
"TSX": { "formatter": "prettier" },
158
+
"TypeScript": {
159
+
"formatter": "prettier",
160
+
},
161
+
},
162
+
"terminal": {
163
+
"toolbar": {
164
+
"breadcrumbs": false,
165
+
},
166
+
"cursor_shape": "bar",
167
+
"blinking": "on",
168
+
"font_family": "Berkeley Mono",
169
+
"font_size": 12.0,
170
+
"env": {
171
+
"EDITOR": "zed --wait",
172
+
"VISUAL": "zed --wait",
173
+
},
174
+
},
175
+
}
176
+
177
+
||||||| 0e3d8c1
178
+
179
+
=======
180
+
// Zed settings
181
+
//
182
+
// For information on how to configure Zed, see the Zed
183
+
// documentation: https://zed.dev/docs/configuring-zed
184
+
//
185
+
// To see all of Zed's default settings without changing your
186
+
// custom settings, run the `open default settings` command
187
+
// from the command palette or from `Zed` application menu.
188
+
{
189
+
"colorize_brackets": true,
190
+
"completion_menu_item_kind": "symbol",
191
+
"language_models": {
192
+
"opencode": {
193
+
"show_go_models": false,
194
+
"show_zen_models": false
195
+
},
196
+
"lmstudio": {
197
+
"api_url": "http://localhost:1234/api/v0",
198
+
},
199
+
},
200
+
"which_key": {
201
+
"enabled": true,
202
+
},
203
+
"agent_servers": {
204
+
"github-copilot-cli": {
205
+
"type": "registry",
206
+
},
207
+
},
208
+
"cli_default_open_behavior": "existing_window",
209
+
"buffer_font_size": 12.0,
210
+
"theme": "Monokai Pro (CE)",
211
+
"icon_theme": "Zed (Default)",
212
+
"project_panel": {
213
+
"dock": "right",
214
+
},
215
+
"outline_panel": {
216
+
"dock": "right",
217
+
},
218
+
"collaboration_panel": {
219
+
"dock": "right",
220
+
},
221
+
"git_panel": {
222
+
"dock": "right",
223
+
},
224
+
"ui_font_weight": 400.0,
225
+
"ui_font_family": ".ZedSans",
226
+
"edit_predictions": {
227
+
"allow_data_collection": "no",
228
+
"disabled_globs": [],
229
+
"mode": "eager",
230
+
"copilot": {
231
+
"enable_next_edit_suggestions": true,
232
+
},
233
+
"provider": "zed",
234
+
},
235
+
"buffer_line_height": "standard",
236
+
"git": {
237
+
"inline_blame": {
238
+
"enabled": true,
239
+
"show_commit_summary": false,
240
+
},
241
+
},
242
+
"auto_indent_on_paste": true,
243
+
"wrap_guides": [80],
244
+
"tab_size": 4,
245
+
"autosave": "on_window_change",
246
+
"multi_cursor_modifier": "cmd_or_ctrl",
247
+
"minimap": {
248
+
"show": "always",
249
+
"current_line_highlight": "all",
250
+
"thumb": "always",
251
+
},
252
+
"current_line_highlight": "all",
253
+
"cursor_blink": true,
254
+
"agent": {
255
+
"profiles": {},
256
+
"favorite_models": [
257
+
{
258
+
"provider": "zed.dev",
259
+
"model": "gpt-5-mini",
260
+
"enable_thinking": false,
261
+
},
262
+
{
263
+
"provider": "zed.dev",
264
+
"model": "claude-haiku-4-5",
265
+
"enable_thinking": false,
266
+
},
267
+
{
268
+
"provider": "zed.dev",
269
+
"model": "gpt-5-nano",
270
+
"enable_thinking": false,
271
+
},
272
+
{
273
+
"provider": "zed.dev",
274
+
"model": "gpt-5.5",
275
+
"enable_thinking": true,
276
+
"effort": "medium",
277
+
},
278
+
{
279
+
"provider": "zed.dev",
280
+
"model": "gpt-5.2",
281
+
"enable_thinking": false,
282
+
},
283
+
{
284
+
"provider": "zed.dev",
285
+
"model": "claude-sonnet-4-5",
286
+
"enable_thinking": true,
287
+
},
288
+
],
289
+
"sidebar_side": "left",
290
+
"dock": "left",
291
+
"tool_permissions": {
292
+
"default": "allow",
293
+
},
294
+
"default_profile": "ask",
295
+
"button": true,
296
+
"enabled": true,
297
+
"default_model": {
298
+
"enable_thinking": false,
299
+
"provider": "opencode",
300
+
"model": "free/big-pickle",
301
+
},
302
+
},
303
+
"base_keymap": "VSCode",
304
+
// "ui_font_size": 14,
305
+
"buffer_font_family": "Berkeley Mono",
306
+
"buffer_font_fallbacks": ["Symbols Nerd Font Mono"],
307
+
"buffer_font_features": { "calt": false },
308
+
"inlay_hints": {
309
+
"enabled": true,
310
+
"show_other_hints": true,
311
+
},
312
+
"tabs": {
313
+
"file_icons": true,
314
+
},
315
+
"languages": {
316
+
"Astro": {
317
+
// "language_servers": ["eslint"],
318
+
},
319
+
"CSS": {
320
+
"language_servers": [
321
+
"tailwindcss-intellisense-css",
322
+
"!vscode-css-language-server",
323
+
],
324
+
},
325
+
},
326
+
"terminal": {
327
+
"toolbar": {
328
+
"breadcrumbs": false,
329
+
},
330
+
"cursor_shape": "bar",
331
+
"blinking": "on",
332
+
"font_family": "Berkeley Mono",
333
+
"font_size": 12.0,
334
+
},
335
+
}
336
+
337
+
>>>>>>> 118bd7f900663e94ce112397f72e24b42df8e3e3