From f4f8ca18c9d5470d11f3f357408bcfa3e722852a Mon Sep 17 00:00:00 2001 From: Graham Hall Date: Fri, 6 Sep 2024 08:31:49 -0400 Subject: [PATCH] changes --- git_config/gitconfig | 7 + misc_config/alacritty.toml | 84 ++++- zed_config/keymap.json | 739 ++++++++++++++++++++++++++++++++++++- zed_config/settings.json | 26 +- zsh_config/alias.zsh | 1 + zsh_config/zshrc | 1 + 6 files changed, 835 insertions(+), 23 deletions(-) diff --git a/git_config/gitconfig b/git_config/gitconfig index 4889597..2f61ced 100644 --- a/git_config/gitconfig +++ b/git_config/gitconfig @@ -2,13 +2,20 @@ [user] email = graham@ghall.dev name = Graham Hall + signingkey = 613BA8D6E15E1297 + [core] editor = micro excludesfile = /Users/ghall/.gitignore + [filter "lfs"] clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f process = git-lfs filter-process required = true + [init] defaultBranch = main + +[push] + autoSetupRemote = true diff --git a/misc_config/alacritty.toml b/misc_config/alacritty.toml index 5f041c6..a38dc7c 100644 --- a/misc_config/alacritty.toml +++ b/misc_config/alacritty.toml @@ -1,3 +1,85 @@ [font] -normal = { family = "Rec Mono Semicasual", style = "Regular" } +normal = { family = "MesloLGS NF", style = "Regular" } size = 14 + +[cursor] +style = { shape = "Underline", blinking = "On" } + +[window] +dimensions = { columns = 130, lines = 40 } + +[colors.primary] +background = "#303446" +foreground = "#c6d0f5" +dim_foreground = "#838ba7" +bright_foreground = "#c6d0f5" + +[colors.cursor] +text = "#303446" +cursor = "#f2d5cf" + +[colors.vi_mode_cursor] +text = "#303446" +cursor = "#babbf1" + +[colors.search.matches] +foreground = "#303446" +background = "#a5adce" + +[colors.search.focused_match] +foreground = "#303446" +background = "#a6d189" + +[colors.footer_bar] +foreground = "#303446" +background = "#a5adce" + +[colors.hints.start] +foreground = "#303446" +background = "#e5c890" + +[colors.hints.end] +foreground = "#303446" +background = "#a5adce" + +[colors.selection] +text = "#303446" +background = "#f2d5cf" + +[colors.normal] +black = "#51576d" +red = "#e78284" +green = "#a6d189" +yellow = "#e5c890" +blue = "#8caaee" +magenta = "#f4b8e4" +cyan = "#81c8be" +white = "#b5bfe2" + +[colors.bright] +black = "#626880" +red = "#e78284" +green = "#a6d189" +yellow = "#e5c890" +blue = "#8caaee" +magenta = "#f4b8e4" +cyan = "#81c8be" +white = "#a5adce" + +[colors.dim] +black = "#51576d" +red = "#e78284" +green = "#a6d189" +yellow = "#e5c890" +blue = "#8caaee" +magenta = "#f4b8e4" +cyan = "#81c8be" +white = "#b5bfe2" + +[[colors.indexed_colors]] +index = 16 +color = "#ef9f76" + +[[colors.indexed_colors]] +index = 17 +color = "#f2d5cf" diff --git a/zed_config/keymap.json b/zed_config/keymap.json index 970db5a..9922a47 100644 --- a/zed_config/keymap.json +++ b/zed_config/keymap.json @@ -1,24 +1,346 @@ [ + // Standard macOS bindings { - "bindings": {} + "bindings": { + "up": "menu::SelectPrev", + "shift-tab": "menu::SelectPrev", + "home": "menu::SelectFirst", + "pageup": "menu::SelectFirst", + "shift-pageup": "menu::SelectFirst", + "ctrl-p": "menu::SelectPrev", + "down": "menu::SelectNext", + "tab": "menu::SelectNext", + "end": "menu::SelectLast", + "pagedown": "menu::SelectLast", + "shift-pagedown": "menu::SelectFirst", + "ctrl-n": "menu::SelectNext", + "cmd-up": "menu::SelectFirst", + "cmd-down": "menu::SelectLast", + "enter": "menu::Confirm", + "ctrl-enter": "menu::SecondaryConfirm", + "cmd-enter": "menu::SecondaryConfirm", + "escape": "menu::Cancel", + "cmd-escape": "menu::Cancel", + "ctrl-escape": "menu::Cancel", + "ctrl-c": "menu::Cancel", + "cmd-shift-w": "workspace::CloseWindow", + "shift-escape": "workspace::ToggleZoom", + "cmd-o": "workspace::Open", + "cmd-=": "zed::IncreaseBufferFontSize", + "cmd-+": "zed::IncreaseBufferFontSize", + "cmd--": "zed::DecreaseBufferFontSize", + "cmd-0": "zed::ResetBufferFontSize", + "cmd-,": "zed::OpenSettings", + "cmd-q": "zed::Quit", + "cmd-h": "zed::Hide", + "alt-cmd-h": "zed::HideOthers", + "cmd-m": "zed::Minimize", + "ctrl-cmd-f": "zed::ToggleFullScreen" + } }, { - "context": "Workspace", + "context": "Editor", "bindings": { - "cmd-shift-o": "file_finder::Toggle", - "cmd-r": "task::Spawn" + "escape": "editor::Cancel", + "backspace": "editor::Backspace", + "shift-backspace": "editor::Backspace", + "delete": "editor::Delete", + "tab": "editor::Tab", + "shift-tab": "editor::TabPrev", + "ctrl-k": "editor::CutToEndOfLine", + "ctrl-t": "editor::Transpose", + "cmd-backspace": "editor::DeleteToBeginningOfLine", + "cmd-delete": "editor::DeleteToEndOfLine", + "alt-backspace": "editor::DeleteToPreviousWordStart", + "ctrl-w": "editor::DeleteToPreviousWordStart", + "alt-delete": "editor::DeleteToNextWordEnd", + "alt-h": "editor::DeleteToPreviousWordStart", + "alt-d": "editor::DeleteToNextWordEnd", + "cmd-x": "editor::Cut", + "cmd-c": "editor::Copy", + "cmd-v": "editor::Paste", + "cmd-z": "editor::Undo", + "cmd-shift-z": "editor::Redo", + "up": "editor::MoveUp", + "ctrl-up": "editor::MoveToStartOfParagraph", + "pageup": "editor::MovePageUp", + "shift-pageup": "editor::SelectPageUp", + "cmd-pageup": "editor::PageUp", + "ctrl-pageup": "editor::LineUp", + "home": "editor::MoveToBeginningOfLine", + "down": "editor::MoveDown", + "ctrl-down": "editor::MoveToEndOfParagraph", + "pagedown": "editor::MovePageDown", + "shift-pagedown": "editor::SelectPageDown", + "cmd-pagedown": "editor::PageDown", + "ctrl-pagedown": "editor::LineDown", + "end": "editor::MoveToEndOfLine", + "left": "editor::MoveLeft", + "right": "editor::MoveRight", + "ctrl-p": "editor::MoveUp", + "ctrl-n": "editor::MoveDown", + "ctrl-b": "editor::MoveLeft", + "ctrl-f": "editor::MoveRight", + "ctrl-l": "editor::NextScreen", + "alt-left": "editor::MoveToPreviousWordStart", + "alt-b": "editor::MoveToPreviousWordStart", + "alt-right": "editor::MoveToNextWordEnd", + "alt-f": "editor::MoveToNextWordEnd", + "cmd-left": "editor::MoveToBeginningOfLine", + "ctrl-a": "editor::MoveToBeginningOfLine", + "cmd-right": "editor::MoveToEndOfLine", + "ctrl-e": "editor::MoveToEndOfLine", + "cmd-up": "editor::MoveToBeginning", + "cmd-down": "editor::MoveToEnd", + "shift-up": "editor::SelectUp", + "ctrl-shift-p": "editor::SelectUp", + "shift-down": "editor::SelectDown", + "ctrl-shift-n": "editor::SelectDown", + "shift-left": "editor::SelectLeft", + "ctrl-shift-b": "editor::SelectLeft", + "shift-right": "editor::SelectRight", + "ctrl-shift-f": "editor::SelectRight", + "alt-shift-left": "editor::SelectToPreviousWordStart", + "alt-shift-b": "editor::SelectToPreviousWordStart", + "alt-shift-right": "editor::SelectToNextWordEnd", + "alt-shift-f": "editor::SelectToNextWordEnd", + "ctrl-shift-up": "editor::SelectToStartOfParagraph", + "ctrl-shift-down": "editor::SelectToEndOfParagraph", + "cmd-shift-up": "editor::SelectToBeginning", + "cmd-shift-down": "editor::SelectToEnd", + "cmd-a": "editor::SelectAll", + "cmd-l": "editor::SelectLine", + "cmd-shift-i": "editor::Format", + "cmd-shift-left": [ + "editor::SelectToBeginningOfLine", + { + "stop_at_soft_wraps": true + } + ], + "shift-home": [ + "editor::SelectToBeginningOfLine", + { + "stop_at_soft_wraps": true + } + ], + "ctrl-shift-a": [ + "editor::SelectToBeginningOfLine", + { + "stop_at_soft_wraps": true + } + ], + "cmd-shift-right": [ + "editor::SelectToEndOfLine", + { + "stop_at_soft_wraps": true + } + ], + "shift-end": [ + "editor::SelectToEndOfLine", + { + "stop_at_soft_wraps": true + } + ], + "ctrl-shift-e": [ + "editor::SelectToEndOfLine", + { + "stop_at_soft_wraps": true + } + ], + "ctrl-v": [ + "editor::MovePageDown", + { + "center_cursor": true + } + ], + "alt-v": [ + "editor::MovePageUp", + { + "center_cursor": true + } + ], + "ctrl-cmd-space": "editor::ShowCharacterPalette", + "cmd-;": "editor::ToggleLineNumbers", + "cmd-alt-z": "editor::RevertSelectedHunks", + "cmd-'": "editor::ToggleHunkDiff", + "cmd-\"": "editor::ExpandAllHunkDiffs", + "cmd-alt-g b": "editor::ToggleGitBlame" } }, { "context": "Editor && mode == full", "bindings": { "cmd-shift-o": "file_finder::Toggle", - "cmd-p": "outline::Toggle" + "cmd-p": "outline::Toggle", + "enter": "editor::Newline", + "shift-enter": "editor::Newline", + "cmd-shift-enter": "editor::NewlineAbove", + "cmd-enter": "editor::NewlineBelow", + "alt-z": "editor::ToggleSoftWrap", + "cmd-f": "buffer_search::Deploy", + "cmd-alt-f": [ + "buffer_search::Deploy", + { + "replace_enabled": true + } + ], + "cmd-alt-l": [ + "buffer_search::Deploy", + { + "selection_search_enabled": true + } + ], + "cmd-e": [ + "buffer_search::Deploy", + { + "focus": false + } + ], + "cmd->": "assistant::QuoteSelection", + "cmd-<": "assistant::InsertIntoEditor", + "cmd-alt-e": "editor::SelectEnclosingSymbol" + } + }, + { + "context": "Editor && mode == full && inline_completion", + "bindings": { + "alt-]": "editor::NextInlineCompletion", + "alt-[": "editor::PreviousInlineCompletion", + "alt-right": "editor::AcceptPartialInlineCompletion" + } + }, + { + "context": "Editor && !inline_completion", + "bindings": { + "alt-\\": "editor::ShowInlineCompletion" + } + }, + { + "context": "Editor && mode == auto_height", + "bindings": { + "ctrl-enter": "editor::Newline", + "shift-enter": "editor::Newline", + "ctrl-shift-enter": "editor::NewlineBelow" + } + }, + { + "context": "Markdown", + "bindings": { + "cmd-c": "markdown::Copy" + } + }, + { + "context": "AssistantPanel", + "bindings": { + "cmd-g": "search::SelectNextMatch", + "cmd-shift-g": "search::SelectPrevMatch", + "alt-m": "assistant::ToggleModelSelector" + } + }, + { + "context": "ContextEditor > Editor", + "bindings": { + "cmd-enter": "assistant::Assist", + "cmd-s": "workspace::Save", + "cmd->": "assistant::QuoteSelection", + "cmd-<": "assistant::InsertIntoEditor", + "shift-enter": "assistant::Split", + "ctrl-r": "assistant::CycleMessageRole", + "enter": "assistant::ConfirmCommand", + "alt-enter": "editor::Newline" + } + }, + { + "context": "PromptLibrary", + "bindings": { + "cmd-n": "prompt_library::NewPrompt", + "cmd-shift-s": "prompt_library::ToggleDefaultPrompt", + "cmd-w": "workspace::CloseWindow" + } + }, + { + "context": "BufferSearchBar", + "bindings": { + "escape": "buffer_search::Dismiss", + "tab": "buffer_search::FocusEditor", + "enter": "search::SelectNextMatch", + "shift-enter": "search::SelectPrevMatch", + "alt-enter": "search::SelectAllMatches", + "cmd-f": "search::FocusSearch", + "cmd-alt-f": "search::ToggleReplace", + "cmd-alt-l": "search::ToggleSelection" + } + }, + { + "context": "BufferSearchBar && in_replace", + "bindings": { + "enter": "search::ReplaceNext", + "cmd-enter": "search::ReplaceAll" + } + }, + { + "context": "BufferSearchBar && !in_replace > Editor", + "bindings": { + "up": "search::PreviousHistoryQuery", + "down": "search::NextHistoryQuery" + } + }, + { + "context": "ProjectSearchBar", + "bindings": { + "escape": "project_search::ToggleFocus", + "cmd-shift-j": "project_search::ToggleFilters", + "cmd-shift-f": "search::FocusSearch", + "cmd-shift-h": "search::ToggleReplace", + "alt-cmd-g": "search::ToggleRegex", + "alt-cmd-x": "search::ToggleRegex" + } + }, + { + "context": "ProjectSearchBar > Editor", + "bindings": { + "up": "search::PreviousHistoryQuery", + "down": "search::NextHistoryQuery" + } + }, + { + "context": "ProjectSearchBar && in_replace", + "bindings": { + "enter": "search::ReplaceNext", + "cmd-enter": "search::ReplaceAll" + } + }, + { + "context": "ProjectSearchView", + "bindings": { + "escape": "project_search::ToggleFocus", + "cmd-shift-j": "project_search::ToggleFilters", + "cmd-shift-h": "search::ToggleReplace", + "alt-cmd-g": "search::ToggleRegex", + "alt-cmd-x": "search::ToggleRegex" } }, { "context": "Pane", "bindings": { + "cmd-{": "pane::ActivatePrevItem", + "cmd-}": "pane::ActivateNextItem", + "cmd-w": "pane::CloseActiveItem", + "alt-cmd-t": "pane::CloseInactiveItems", + "ctrl-alt-cmd-w": "workspace::CloseInactiveTabsAndPanes", + "cmd-k u": "pane::CloseCleanItems", + "cmd-k cmd-w": "pane::CloseAllItems", + "cmd-f": "project_search::ToggleFocus", + "cmd-g": "search::SelectNextMatch", + "cmd-shift-g": "search::SelectPrevMatch", + "cmd-shift-h": "search::ToggleReplace", + "cmd-alt-l": "search::ToggleSelection", + "alt-enter": "search::SelectAllMatches", + "alt-cmd-c": "search::ToggleCaseSensitive", + "alt-cmd-w": "search::ToggleWholeWord", + "alt-cmd-f": "project_search::ToggleFilters", + "alt-cmd-g": "search::ToggleRegex", + "alt-cmd-x": "search::ToggleRegex", "cmd-1": ["pane::ActivateItem", 0], "cmd-2": ["pane::ActivateItem", 1], "cmd-3": ["pane::ActivateItem", 2], @@ -32,5 +354,412 @@ "alt-cmd-left": ["workspace::ActivatePaneInDirection", "Left"], "alt-cmd-right": ["workspace::ActivatePaneInDirection", "Right"] } + }, + // Bindings from VS Code + { + "context": "Editor", + "bindings": { + "cmd-[": "editor::Outdent", + "cmd-]": "editor::Indent", + "cmd-alt-up": "editor::AddSelectionAbove", + "cmd-ctrl-p": "editor::AddSelectionAbove", + "cmd-alt-down": "editor::AddSelectionBelow", + "cmd-ctrl-n": "editor::AddSelectionBelow", + "cmd-shift-k": "editor::DeleteLine", + "alt-up": "editor::MoveLineUp", + "alt-down": "editor::MoveLineDown", + "alt-shift-up": "editor::DuplicateLineUp", + "alt-shift-down": "editor::DuplicateLineDown", + "ctrl-shift-right": "editor::SelectLargerSyntaxNode", + "ctrl-shift-left": "editor::SelectSmallerSyntaxNode", + "cmd-d": [ + "editor::SelectNext", + { + "replace_newest": false + } + ], + "cmd-shift-l": "editor::SelectAllMatches", + "ctrl-cmd-d": [ + "editor::SelectPrevious", + { + "replace_newest": false + } + ], + "cmd-k cmd-d": [ + "editor::SelectNext", + { + "replace_newest": true + } + ], + "cmd-k ctrl-cmd-d": [ + "editor::SelectPrevious", + { + "replace_newest": true + } + ], + "cmd-k cmd-i": "editor::Hover", + "cmd-/": [ + "editor::ToggleComments", + { + "advance_downwards": false + } + ], + "cmd-u": "editor::UndoSelection", + "cmd-shift-u": "editor::RedoSelection", + "f8": "editor::GoToDiagnostic", + "shift-f8": "editor::GoToPrevDiagnostic", + "f2": "editor::Rename", + "f12": "editor::GoToDefinition", + "alt-f12": "editor::GoToDefinitionSplit", + "cmd-f12": "editor::GoToTypeDefinition", + "shift-f12": "editor::GoToImplementation", + "alt-cmd-f12": "editor::GoToTypeDefinitionSplit", + "alt-shift-f12": "editor::FindAllReferences", + "ctrl-m": "editor::MoveToEnclosingBracket", + "cmd-shift-\\": "editor::MoveToEnclosingBracket", + "alt-cmd-[": "editor::Fold", + "alt-cmd-]": "editor::UnfoldLines", + "ctrl-space": "editor::ShowCompletions", + "cmd-.": "editor::ToggleCodeActions", + "alt-cmd-r": "editor::RevealInFileManager", + "cmd-k r": "editor::RevealInFileManager", + "cmd-k p": "editor::CopyPath", + "cmd-\\": "pane::SplitRight", + "cmd-k v": "markdown::OpenPreviewToTheSide", + "cmd-shift-v": "markdown::OpenPreview", + "ctrl-cmd-c": "editor::DisplayCursorNames" + } + }, + { + "context": "Editor && mode == full", + "bindings": { + "ctrl-g": "go_to_line::Toggle" + } + }, + { + "context": "Pane", + "bindings": { + "ctrl-0": "pane::ActivateLastItem", + "ctrl--": "pane::GoBack", + "ctrl-_": "pane::GoForward", + "cmd-shift-t": "pane::ReopenClosedItem", + "cmd-shift-f": "project_search::ToggleFocus" + } + }, + { + "context": "Workspace", + "bindings": { + // Change the default action on `menu::Confirm` by setting the parameter + // "alt-cmd-o": [ + // "projects::OpenRecent", + // { + // "create_new_window": true + // } + // ] + "cmd-shift-o": "file_finder::Toggle", + "cmd-r": "task::Spawn", + "alt-cmd-o": "projects::OpenRecent", + "alt-cmd-b": "branches::OpenRecent", + "ctrl-~": "workspace::NewTerminal", + "cmd-s": "workspace::Save", + "cmd-k s": "workspace::SaveWithoutFormat", + "cmd-shift-s": "workspace::SaveAs", + "cmd-n": "workspace::NewFile", + "cmd-shift-n": "workspace::NewWindow", + "ctrl-`": "terminal_panel::ToggleFocus", + "shift-cmd-B": "workspace::ToggleRightDock", + "cmd-b": "workspace::ToggleLeftDock", + "cmd-j": "workspace::ToggleBottomDock", + "alt-cmd-y": "workspace::CloseAllDocks", + "cmd-shift-f": "pane::DeploySearch", + "cmd-shift-h": [ + "pane::DeploySearch", + { + "replace_enabled": true + } + ], + "cmd-k cmd-s": "zed::OpenKeymap", + "cmd-k cmd-t": "theme_selector::Toggle", + "cmd-t": "project_symbols::Toggle", + "cmd-p": "file_finder::Toggle", + "ctrl-tab": "tab_switcher::Toggle", + "ctrl-shift-tab": [ + "tab_switcher::Toggle", + { + "select_last": true + } + ], + "cmd-shift-p": "command_palette::Toggle", + "cmd-shift-m": "diagnostics::Deploy", + "cmd-shift-e": "project_panel::ToggleFocus", + "cmd-?": "assistant::ToggleFocus", + "cmd-alt-s": "workspace::SaveAll", + "cmd-k m": "language_selector::Toggle", + "escape": "workspace::Unfollow", + "cmd-k cmd-left": ["workspace::ActivatePaneInDirection", "Left"], + "cmd-k cmd-right": ["workspace::ActivatePaneInDirection", "Right"], + "cmd-k cmd-up": ["workspace::ActivatePaneInDirection", "Up"], + "cmd-k cmd-down": ["workspace::ActivatePaneInDirection", "Down"], + "cmd-k shift-left": ["workspace::SwapPaneInDirection", "Left"], + "cmd-k shift-right": ["workspace::SwapPaneInDirection", "Right"], + "cmd-k shift-up": ["workspace::SwapPaneInDirection", "Up"], + "cmd-k shift-down": ["workspace::SwapPaneInDirection", "Down"], + "cmd-shift-x": "zed::Extensions", + "alt-t": "task::Rerun", + "alt-shift-t": "task::Spawn" + } + }, + // Bindings from Sublime Text + { + "context": "Editor", + "bindings": { + "ctrl-j": "editor::JoinLines", + "ctrl-alt-backspace": "editor::DeleteToPreviousSubwordStart", + "ctrl-alt-h": "editor::DeleteToPreviousSubwordStart", + "ctrl-alt-delete": "editor::DeleteToNextSubwordEnd", + "ctrl-alt-d": "editor::DeleteToNextSubwordEnd", + "ctrl-alt-left": "editor::MoveToPreviousSubwordStart", + "ctrl-alt-b": "editor::MoveToPreviousSubwordStart", + "ctrl-alt-right": "editor::MoveToNextSubwordEnd", + "ctrl-alt-f": "editor::MoveToNextSubwordEnd", + "ctrl-alt-shift-left": "editor::SelectToPreviousSubwordStart", + "ctrl-alt-shift-b": "editor::SelectToPreviousSubwordStart", + "ctrl-alt-shift-right": "editor::SelectToNextSubwordEnd", + "ctrl-alt-shift-f": "editor::SelectToNextSubwordEnd" + } + }, + // Bindings from Atom + { + "context": "Pane", + "bindings": { + "cmd-k up": "pane::SplitUp", + "cmd-k down": "pane::SplitDown", + "cmd-k left": "pane::SplitLeft", + "cmd-k right": "pane::SplitRight" + } + }, + // Bindings that should be unified with bindings for more general actions + { + "context": "Editor && renaming", + "bindings": { + "enter": "editor::ConfirmRename" + } + }, + { + "context": "Editor && showing_completions", + "bindings": { + "enter": "editor::ConfirmCompletion", + "tab": "editor::ConfirmCompletion" + } + }, + { + "context": "Editor && inline_completion && !showing_completions", + "bindings": { + "tab": "editor::AcceptInlineCompletion" + } + }, + { + "context": "Editor && showing_code_actions", + "bindings": { + "enter": "editor::ConfirmCodeAction" + } + }, + { + "context": "Editor && (showing_code_actions || showing_completions)", + "bindings": { + "up": "editor::ContextMenuPrev", + "ctrl-p": "editor::ContextMenuPrev", + "down": "editor::ContextMenuNext", + "ctrl-n": "editor::ContextMenuNext", + "pageup": "editor::ContextMenuFirst", + "pagedown": "editor::ContextMenuLast" + } + }, + // Custom bindings + { + "bindings": { + // TODO: Move this to a dock open action + "cmd-alt-i": "zed::DebugElements", + "ctrl-:": "editor::ToggleInlayHints" + } + }, + { + "context": "Editor && mode == full", + "bindings": { + "alt-enter": "editor::OpenExcerpts", + "shift-enter": "editor::ExpandExcerpts", + "cmd-k enter": "editor::OpenExcerptsSplit", + "cmd-f8": "editor::GoToHunk", + "cmd-shift-f8": "editor::GoToPrevHunk", + "ctrl-enter": "assistant::InlineAssist" + } + }, + { + "context": "ProjectSearchBar && !in_replace", + "bindings": { + "cmd-enter": "project_search::SearchInNew" + } + }, + { + "context": "OutlinePanel", + "bindings": { + "left": "outline_panel::CollapseSelectedEntry", + "right": "outline_panel::ExpandSelectedEntry", + "cmd-alt-c": "outline_panel::CopyPath", + "alt-cmd-shift-c": "outline_panel::CopyRelativePath", + "alt-cmd-r": "outline_panel::RevealInFileManager", + "space": "outline_panel::Open", + "shift-down": "menu::SelectNext", + "shift-up": "menu::SelectPrev" + } + }, + { + "context": "ProjectPanel", + "bindings": { + "left": "project_panel::CollapseSelectedEntry", + "right": "project_panel::ExpandSelectedEntry", + "cmd-n": "project_panel::NewFile", + "cmd-d": "project_panel::Duplicate", + "alt-cmd-n": "project_panel::NewDirectory", + "cmd-x": "project_panel::Cut", + "cmd-c": "project_panel::Copy", + "cmd-v": "project_panel::Paste", + "cmd-alt-c": "project_panel::CopyPath", + "alt-cmd-shift-c": "project_panel::CopyRelativePath", + "enter": "project_panel::Rename", + "f2": "project_panel::Rename", + "backspace": [ + "project_panel::Trash", + { + "skip_prompt": false + } + ], + "delete": [ + "project_panel::Trash", + { + "skip_prompt": false + } + ], + "cmd-backspace": [ + "project_panel::Trash", + { + "skip_prompt": true + } + ], + "cmd-delete": [ + "project_panel::Delete", + { + "skip_prompt": false + } + ], + "alt-cmd-r": "project_panel::RevealInFileManager", + "cmd-alt-backspace": [ + "project_panel::Delete", + { + "skip_prompt": false + } + ], + "alt-shift-f": "project_panel::NewSearchInDirectory", + "shift-down": "menu::SelectNext", + "shift-up": "menu::SelectPrev", + "escape": "menu::Cancel" + } + }, + { + "context": "ProjectPanel && not_editing", + "bindings": { + "space": "project_panel::Open" + } + }, + { + "context": "CollabPanel && not_editing", + "bindings": { + "ctrl-backspace": "collab_panel::Remove", + "space": "menu::Confirm" + } + }, + { + "context": "(CollabPanel && editing) > Editor", + "bindings": { + "space": "collab_panel::InsertSpace" + } + }, + { + "context": "ChannelModal", + "bindings": { + "tab": "channel_modal::ToggleMode" + } + }, + { + "context": "ChannelModal > Picker > Editor", + "bindings": { + "tab": "channel_modal::ToggleMode" + } + }, + { + "context": "FileFinder", + "bindings": { + "cmd-shift-p": "file_finder::SelectPrev" + } + }, + { + "context": "TabSwitcher", + "bindings": { + "ctrl-backspace": "tab_switcher::CloseSelectedItem" + } + }, + { + "context": "Picker", + "bindings": { + "f2": "picker::UseSelectedQuery", + "alt-enter": [ + "picker::ConfirmInput", + { + "secondary": false + } + ], + "cmd-alt-enter": [ + "picker::ConfirmInput", + { + "secondary": true + } + ] + } + }, + { + "context": "Terminal", + "bindings": { + "ctrl-cmd-space": "terminal::ShowCharacterPalette", + "cmd-c": "terminal::Copy", + "cmd-v": "terminal::Paste", + "cmd-k": "terminal::Clear", + "ctrl-enter": "assistant::InlineAssist", + // Some nice conveniences + "cmd-backspace": ["terminal::SendText", "\u0015"], + "cmd-right": ["terminal::SendText", "\u0005"], + "cmd-left": ["terminal::SendText", "\u0001"], + // Terminal.app compatibility + "alt-left": ["terminal::SendText", "\u001bb"], + "alt-right": ["terminal::SendText", "\u001bf"], + // There are conflicting bindings for these keys in the global context. + // these bindings override them, remove at your own risk: + "up": ["terminal::SendKeystroke", "up"], + "pageup": ["terminal::SendKeystroke", "pageup"], + "down": ["terminal::SendKeystroke", "down"], + "pagedown": ["terminal::SendKeystroke", "pagedown"], + "escape": ["terminal::SendKeystroke", "escape"], + "enter": ["terminal::SendKeystroke", "enter"], + "ctrl-c": ["terminal::SendKeystroke", "ctrl-c"], + "cmd-up": "terminal::ScrollPageUp", + "cmd-down": "terminal::ScrollPageDown", + "shift-pageup": "terminal::ScrollPageUp", + "shift-pagedown": "terminal::ScrollPageDown", + "shift-up": "terminal::ScrollLineUp", + "shift-down": "terminal::ScrollLineDown", + "cmd-home": "terminal::ScrollToTop", + "cmd-end": "terminal::ScrollToBottom", + "shift-home": "terminal::ScrollToTop", + "shift-end": "terminal::ScrollToBottom" + } } ] diff --git a/zed_config/settings.json b/zed_config/settings.json index 05763d3..36fcf1c 100644 --- a/zed_config/settings.json +++ b/zed_config/settings.json @@ -1,4 +1,5 @@ { + "base_keymap": "None", "outline_panel": { "dock": "right" }, @@ -7,7 +8,7 @@ "metrics": false }, "assistant": { - "version": "1", + "version": "2", "enabled": false }, "features": { @@ -23,17 +24,17 @@ "theme": { "mode": "system", "light": "Ayu Light", - "dark": "Ayu Mirage" + "dark": "Catppuccin Mocha" }, "scrollbar": { "show": "system" }, "scroll_beyond_last_line": "vertical_scroll_margin", "vertical_scroll_margin": 20, - "ui_font_family": "Rec Mono Semicasual", + "ui_font_family": "SF Mono", "ui_font_features": {}, "ui_font_size": 17, - "buffer_font_family": "Rec Mono Semicasual", + "buffer_font_family": "SF Mono", "buffer_font_size": 15, "terminal": { "font_family": "FiraCode Nerd Font Mono" @@ -54,29 +55,20 @@ "enabled": true, "coloring": "indent_aware" }, - "wrap_guides": [80], "languages": { "Go": { "tab_size": 2 }, "Astro": { "tab_size": 2 - }, - "TypeScript": { - "code_actions_on_format": { - "source.organizeImports": true - } - }, - "TSX": { - "code_actions_on_format": { - "source.organizeImports": true - } } }, "project_panel": { - "indent_size": 10 + "indent_size": 10, + "auto_fold_dirs": false }, "file_types": { - "HTML": ["hbs", "njk", "webc"] + "HTML": ["hbs", "njk", "webc"], + "Shell Script": [".env.local", ".env"] } } diff --git a/zsh_config/alias.zsh b/zsh_config/alias.zsh index dda2d0a..f25c63e 100644 --- a/zsh_config/alias.zsh +++ b/zsh_config/alias.zsh @@ -4,6 +4,7 @@ alias cd="z" # developer stuff alias nv="open -a Nova" +alias code="codium" alias runx="npx concurrently \"serverless offline\" \"nx dev frontend\"" # git diff --git a/zsh_config/zshrc b/zsh_config/zshrc index 70155d8..4d7aef1 100644 --- a/zsh_config/zshrc +++ b/zsh_config/zshrc @@ -3,6 +3,7 @@ if [ "$TERM_PROGRAM" != "Apple_Terminal" ]; then fi source $(brew --prefix nvm)/nvm.sh +source <(fzf --zsh) # Load seperated config files for conf in "$HOME/dotfiles/zsh_config/"*.zsh; do