diff --git a/misc_config/ghostty b/misc_config/ghostty index ecd981c..7caebf7 100644 --- a/misc_config/ghostty +++ b/misc_config/ghostty @@ -4,7 +4,7 @@ cursor-style = underline shell-integration-features = no-cursor adjust-cursor-thickness = 4 -font-size = 13 +font-size = 14 font-family = Rec Mono Linear font-thicken = true selection-invert-fg-bg = true diff --git a/zed_config/keymap.json b/zed_config/keymap.json index f70c198..f4012b7 100644 --- a/zed_config/keymap.json +++ b/zed_config/keymap.json @@ -204,7 +204,7 @@ } }, { - "context": "Editor && mode == full && edit_prediction", + "context": "Editor && edit_prediction", "use_key_equivalents": true, "bindings": { "tab": "editor::AcceptEditPrediction", @@ -213,6 +213,12 @@ "ctrl-cmd-right": "editor::AcceptPartialEditPrediction" } }, + { + "context": "Editor && edit_prediction_conflict", + "bindings": { + "alt-tab": "editor::AcceptEditPrediction" + } + }, { "context": "Editor && !edit_prediction", "use_key_equivalents": true, diff --git a/zed_config/settings.json b/zed_config/settings.json index 7343c72..5083473 100644 --- a/zed_config/settings.json +++ b/zed_config/settings.json @@ -20,10 +20,10 @@ }, "edit_predictions": { "disabled_globs": [".md"], - "mode": "subtle" + "mode": "eager" }, "features": { - "edit_prediction_provider": "copilot" + "edit_prediction_provider": "zed" }, "collaboration_panel": { "button": false @@ -37,8 +37,8 @@ }, "theme": { "mode": "system", - "light": "One Light", - "dark": "Gruvbox Dark" + "light": "Github Light", + "dark": "Github Dark Dimmed" }, "scrollbar": { "show": "never" @@ -46,7 +46,7 @@ "cursor_shape": "underline", "scroll_beyond_last_line": "vertical_scroll_margin", "vertical_scroll_margin": 20, - "ui_font_family": "SF Mono", + "ui_font_family": "Rec Mono Casual", "ui_font_features": {}, "ui_font_size": 15, "buffer_font_family": "Rec Mono Linear", diff --git a/zsh_config/alias.zsh b/zsh_config/alias.zsh index f25c63e..34074eb 100644 --- a/zsh_config/alias.zsh +++ b/zsh_config/alias.zsh @@ -5,7 +5,6 @@ alias cd="z" # developer stuff alias nv="open -a Nova" alias code="codium" -alias runx="npx concurrently \"serverless offline\" \"nx dev frontend\"" # git alias ptob="gh pr create -B beta"