Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -187,19 +187,20 @@ dock_add:

# Items to remove from dock
dock_remove:
- "App Store"
- Apps
- Contacts
- FaceTime
- Freeform
- "iPhone Mirroring"
- Keynote
- Launchpad
- Messages
- Mail
- Maps
- Messages
- Music
- Numbers
- Pages
- Photos
- FaceTime
- Contacts
- Reminders
- Freeform
- TV
- Music
- Pages
- Numbers
- Keynote
- "App Store"
- "iPhone Mirroring"
77 changes: 62 additions & 15 deletions dotfiles/zed/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,68 @@
// ################################################################
// AI-related stuff
// ################################################################
"edit_predictions": {
"provider": "sweep",
"mode": "eager",

// For some reason I couldn't make codestral to work yet
"codestral": {
"api_url": "https://codestral.mistral.ai/v1/fim/completions",
"model": "codestral-latest",
},

"sweep": {
"privacy_mode": true,
},
},

"agent": {
"default_model": {
"provider": "copilot_chat",
"model": "claude-opus-4.5",
"provider": "openrouter",
"model": "anthropic/claude-opus-4.6",
"enable_thinking": true,
},
"inline_assistant_model": {
"provider": "copilot_chat",
"model": "claude-haiku-4.5",
"provider": "openrouter",
"model": "anthropic/claude-haiku-4.6",
},
"commit_message_model": {
"provider": "openrouter",
"model": "anthropic/claude-haiku-4.6",
},
"thread_summary_model": {
"provider": "openrouter",
"model": "anthropic/claude-sonnet-4.6",
},

"favorite_models": [
{
"provider": "openrouter",
"model": "anthropic/claude-opus-4.6",
"enable_thinking": true,
},
{
"provider": "openrouter",
"model": "anthropic/claude-sonnet-4.6",
"enable_thinking": true,
},
{
"provider": "openrouter",
"model": "anthropic/claude-haiku-4.6",
"enable_thinking": false,
},
],

"enable_feedback": false,
"profiles": {},
},
"features": {
"edit_prediction_provider": "copilot",
},
"edit_predictions": {
"mode": "eager",
},

// ################################################################
// UI customization
// ################################################################

"text_rendering_mode": "subpixel",

// Themes
"theme": {
"mode": "system",
Expand All @@ -54,6 +92,12 @@
"buffer_font_features": { "calt": true },
"buffer_line_height": "standard",

"tabs": {
"file_icons": true,
"close_position": "left",
"git_status": true,
"activate_on_close": "left_neighbour",
},
// 3 digits is actually enough to display 4
"gutter": { "min_line_number_digits": 3 },

Expand All @@ -62,10 +106,6 @@
"current_line_highlight": "all",
},

"scrollbar": {
"show": "auto",
},

// Terminal settings
"terminal": {
"blinking": "on",
Expand Down Expand Up @@ -103,10 +143,11 @@
// ################################################################
// Language-specific
// ################################################################
"extend_comment_on_newline": false,
"file_types": {
"Shell Script": ["*.zsh-theme"],
},

"extend_comment_on_newline": false,
"languages": {
"Python": {
"language_servers": ["basedpyright", "ruff"],
Expand All @@ -122,6 +163,11 @@
},
],
},
"YAML": {
"show_whitespaces": "all",
"auto_indent_on_paste": false,
"use_on_type_format": false,
},
},

"lsp": {
Expand All @@ -143,6 +189,7 @@
"catppuccin": true,
"catppuccin-icons": true,

"ansible": true,
"dockerfile": true,
"git-firefly": true,
"html": true,
Expand Down
4 changes: 2 additions & 2 deletions dotfiles/zsh/starship.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ disabled = true

[custom.kubectx]
style = 'bold blue'
command = "echo \ue81d ${$(kubectl config current-context)##*/}"
command = "echo \ue81d ${$(kubectl config current-context 2>/dev/null)##*/} "
Copy link

Copilot AI Feb 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This command adds a trailing space to the module output (...##*/} ). That space will be included in $output and can create inconsistent spacing around the (:${custom.kubens}) segment in the prompt. Consider removing the trailing space (or using printf if you need precise formatting).

Suggested change
command = "echo \ue81d ${$(kubectl config current-context 2>/dev/null)##*/} "
command = "echo \ue81d ${$(kubectl config current-context 2>/dev/null)##*/}"

Copilot uses AI. Check for mistakes.
format = '[$output]($style)'
when = true

[custom.kubens]
style = 'bold red'
command = 'kubectl config view --minify -o "jsonpath={..namespace}"'
command = 'kubectl config view --minify -o "jsonpath={..namespace} 2>/dev/null"'
Copy link

Copilot AI Feb 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The stderr redirection is currently inside the jsonpath string (after jsonpath={..namespace}), so it will be passed to kubectl as part of the -o argument and won’t actually silence stderr. Move 2>/dev/null outside the quoted -o "jsonpath=..." portion so the shell performs the redirection.

Suggested change
command = 'kubectl config view --minify -o "jsonpath={..namespace} 2>/dev/null"'
command = 'kubectl config view --minify -o "jsonpath={..namespace}" 2>/dev/null'

Copilot uses AI. Check for mistakes.
format = '[$output]($style)'
when = true

Expand Down
2 changes: 1 addition & 1 deletion tasks/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
- name: Store osx.sh checksum
ansible.builtin.copy:
content: "{{ osx_script_stat.stat.checksum }}"
dest: "{{ ansible_env.HOME }}/.osx.sh.done"
dest: "{{ ansible_facts.env.HOME }}/.osx.sh.done"
mode: "0644"
when: osx_script_result.rc == 0