diff --git a/Brewfile b/Brewfile index 5969a1e..e8f0f6e 100644 --- a/Brewfile +++ b/Brewfile @@ -5,6 +5,7 @@ tap "marsanne/cask" tap "oven-sh/bun" brew "jq" brew "ansiweather" +brew "xz" brew "atuin" brew "autoconf" brew "automake" @@ -12,6 +13,8 @@ brew "bazel" brew "bchunk" brew "btop" brew "cloc" +brew "libyaml" +brew "openssl@3" brew "cocoapods" brew "coreutils" brew "csvkit" @@ -20,10 +23,10 @@ brew "eza" brew "ffmpeg" brew "flyctl" brew "fzf" +brew "ggc" brew "gh" brew "git" brew "gitmoji" -brew "gleam" brew "glow" brew "gnupg" brew "go" @@ -33,6 +36,7 @@ brew "icu4c@76" brew "libheif" brew "imagemagick" brew "lazygit" +brew "libffi" brew "loc" brew "lynx" brew "man2html" @@ -51,6 +55,7 @@ brew "ripgrep" brew "rust" brew "sf-pwgen" brew "speedtest-cli" +brew "superfile" brew "swift-format" brew "telnet" brew "thefuck" @@ -109,7 +114,6 @@ cask "steam" cask "swift-shift" cask "swiftformat-for-xcode" cask "tableplus" -cask "the-unarchiver" cask "tic80" cask "tunnelblick" cask "vanilla" @@ -118,7 +122,6 @@ cask "vivaldi" cask "xscope" cask "zed" cask "zen" -mas "1Blocker", id: 1365531024 mas "Actions", id: 1586435171 mas "Affinity Designer 2", id: 1616831348 mas "Affinity Photo 2", id: 1616822987 @@ -149,7 +152,7 @@ mas "HEIC Converter", id: 1294126402 mas "HTTPBot", id: 1232603544 mas "Interactful", id: 1528095640 mas "Ivory", id: 6444602274 -mas "JSONPeep", id: 1458969831 +mas "JSON Peep", id: 1458969831 mas "Key Codes", id: 414568915 mas "Keynote", id: 409183694 mas "Lungo", id: 1263070803 @@ -176,43 +179,33 @@ mas "TestFlight", id: 899247664 mas "Text Workflow", id: 1600520682 mas "Tot", id: 1491071483 mas "Transporter", id: 1450874784 +mas "uBlock Origin Lite", id: 6745342698 mas "Velja", id: 1607635845 mas "Vinegar", id: 1591303229 mas "Wallaroo", id: 1630565980 mas "WhatsApp", id: 310633997 mas "WorldWideWeb", id: 1621370168 mas "Xcode", id: 497799835 -vscode "akamud.vscode-theme-onelight" vscode "astro-build.astro-vscode" -vscode "biomejs.biome" vscode "bradlc.vscode-tailwindcss" +vscode "chenglou92.rescript-vscode" vscode "christian-kohler.npm-intellisense" +vscode "codeium.codeium" vscode "csstools.postcss" vscode "dbaeumer.vscode-eslint" -vscode "dericcain.feather" vscode "esbenp.prettier-vscode" -vscode "golang.go" vscode "icrawl.discord-vscode" vscode "karyfoundation.theme-karyfoundation-themes" vscode "littensy.charmed-icons" vscode "lkytal.flatui" vscode "llvm-vs-code-extensions.lldb-dap" vscode "mechatroner.rainbow-csv" -vscode "ms-python.debugpy" -vscode "ms-python.python" -vscode "ms-python.vscode-pylance" -vscode "ms-python.vscode-python-envs" -vscode "ms-vscode.theme-tomorrowkit" -vscode "openai.chatgpt" vscode "orta.vscode-jest" vscode "oven.bun-vscode" vscode "prisma.prisma" vscode "redhat.vscode-xml" vscode "rust-lang.rust-analyzer" -vscode "sdras.night-owl" vscode "shopify.ruby-lsp" vscode "swiftlang.swift-vscode" -vscode "teabyii.ayu" -vscode "tonsky.theme-alabaster" +vscode "tamasfe.even-better-toml" vscode "vue.volar" -vscode "zguolee.tabler-icons" diff --git a/git_config/gitconfig b/git_config/gitconfig index 4f4d0c1..b738caf 100644 --- a/git_config/gitconfig +++ b/git_config/gitconfig @@ -5,7 +5,7 @@ signingkey = FB70F1142D7A45B8 [core] - editor = micro + editor = vim excludesfile = /Users/ghall/.gitignore [filter "lfs"] @@ -19,3 +19,10 @@ [push] autoSetupRemote = true + default = simple +[merge] + tool = vimdiff +[color] + ui = true +[fetch] + auto = true diff --git a/misc_config/ghostty b/misc_config/ghostty index 7c639f9..ac5c2b1 100644 --- a/misc_config/ghostty +++ b/misc_config/ghostty @@ -1,11 +1,15 @@ -theme = light:Tomorrow,dark:Andromeda +theme = Breeze +# theme = light:Tomorrow,dark:Breeze +window-theme = system +macos-titlebar-style = native +macos-secure-input-indication = true cursor-style = underline shell-integration-features = no-cursor adjust-cursor-thickness = 4 font-size = 14 -font-family = Monaspace Argon +font-family = Maple Mono font-thicken = true selection-invert-fg-bg = true diff --git a/symlink_dotfiles.zsh b/symlink_dotfiles.zsh index 6ec9838..588dd90 100644 --- a/symlink_dotfiles.zsh +++ b/symlink_dotfiles.zsh @@ -20,6 +20,10 @@ ln -s -f ~/dotfiles/misc_config/thefuck.py ~/.config/thefuck/settings.py ln -s -f ~/dotfiles/zed_config/keymap.json ~/.config/zed/keymap.json ln -s -f ~/dotfiles/zed_config/settings.json ~/.config/zed/settings.json +# VS Code +ln -s -f ~/dotfiles/vscode_config/keybindings.json ~/Library/Application\ Support/Code/User/keybindings.json +ln -s -f ~/dotfiles/vscode_config/settings.json ~/Library/Application\ Support/Code/User/settings.json + # ghostty ln -s -f ~/dotfiles/misc_config/ghostty ~/Library/Application\ Support/com.mitchellh.ghostty/config diff --git a/vscode_config/keybindings.json b/vscode_config/keybindings.json new file mode 100644 index 0000000..d126848 --- /dev/null +++ b/vscode_config/keybindings.json @@ -0,0 +1,175 @@ +// Place your key bindings in this file to override the defaults +[ + { + "key": "alt+cmd+o", + "command": "workbench.action.openRecent" + }, + { + "key": "ctrl+r", + "command": "-workbench.action.openRecent" + }, + { + "key": "alt+cmd+o", + "command": "-workbench.action.remote.showMenu" + }, + { + "key": "alt+cmd+t", + "command": "-workbench.action.closeOtherEditors" + }, + { + "key": "alt+cmd+t", + "command": "workbench.action.terminal.openNativeConsole", + "when": "!terminalFocus" + }, + { + "key": "shift+cmd+c", + "command": "-workbench.action.terminal.openNativeConsole", + "when": "!terminalFocus" + }, + { "key": "cmd+1", "command": "workbench.action.openEditorAtIndex1" }, + { "key": "cmd+2", "command": "workbench.action.openEditorAtIndex2" }, + { "key": "cmd+3", "command": "workbench.action.openEditorAtIndex3" }, + { "key": "cmd+4", "command": "workbench.action.openEditorAtIndex4" }, + { "key": "cmd+5", "command": "workbench.action.openEditorAtIndex5" }, + { "key": "cmd+6", "command": "workbench.action.openEditorAtIndex6" }, + { "key": "cmd+7", "command": "workbench.action.openEditorAtIndex7" }, + { "key": "cmd+8", "command": "workbench.action.openEditorAtIndex8" }, + { + "key": "cmd+9", + "command": "workbench.action.openEditorAtIndex9" + }, + { + "key": "ctrl+1", + "command": "-workbench.action.openEditorAtIndex1" + }, + { + "key": "ctrl+2", + "command": "-workbench.action.openEditorAtIndex2" + }, + { + "key": "ctrl+3", + "command": "-workbench.action.openEditorAtIndex3" + }, + { + "key": "ctrl+4", + "command": "-workbench.action.openEditorAtIndex4" + }, + { + "key": "ctrl+5", + "command": "-workbench.action.openEditorAtIndex5" + }, + { + "key": "ctrl+6", + "command": "-workbench.action.openEditorAtIndex6" + }, + { + "key": "ctrl+7", + "command": "-workbench.action.openEditorAtIndex7" + }, + { + "key": "ctrl+8", + "command": "-workbench.action.openEditorAtIndex8" + }, + { + "key": "ctrl+9", + "command": "-workbench.action.openEditorAtIndex9" + }, + { + "key": "alt+cmd+left", + "command": "workbench.action.focusLeftGroup" + }, + { + "key": "cmd+k cmd+left", + "command": "-workbench.action.focusLeftGroup" + }, + { + "key": "alt+cmd+right", + "command": "workbench.action.focusRightGroup" + }, + { + "key": "cmd+k cmd+right", + "command": "-workbench.action.focusRightGroup" + }, + { + "key": "alt+cmd+right", + "command": "-workbench.action.nextEditor" + }, + { + "key": "alt+cmd+left", + "command": "-workbench.action.previousEditor" + }, + { + "key": "alt", + "command": "supermaven.toggle" + }, + { + "key": "alt+j", + "command": "-supermaven.newConversationTab" + }, + { + "key": "shift+cmd+i", + "command": "-supermaven.addToChat" + }, + { + "key": "cmd+i", + "command": "-supermaven.editWithSupermaven" + }, + { + "key": "cmd+numpad0", + "command": "-workbench.action.zoomReset" + }, + { + "key": "cmd+numpad_add", + "command": "-workbench.action.zoomIn" + }, + { + "key": "shift+cmd+=", + "command": "-workbench.action.zoomIn" + }, + { + "key": "cmd+=", + "command": "-workbench.action.zoomIn" + }, + { + "key": "cmd+numpad_subtract", + "command": "-workbench.action.zoomOut" + }, + { + "key": "shift+cmd+-", + "command": "-workbench.action.zoomOut" + }, + { + "key": "cmd+-", + "command": "-workbench.action.zoomOut" + }, + { + "key": "cmd+=", + "command": "editor.action.fontZoomIn" + }, + { + "key": "cmd+-", + "command": "editor.action.fontZoomOut" + }, + { + "key": "cmd+0", + "command": "editor.action.fontZoomReset" + }, + { + "key": "shift+cmd+f", + "command": "-workbench.action.findInFiles" + }, + { + "key": "shift+cmd+f", + "command": "-workbench.action.terminal.searchWorkspace", + "when": "terminalFocus && terminalProcessSupported && terminalTextSelected" + }, + { + "key": "shift+cmd+f", + "command": "-workbench.view.search", + "when": "workbench.view.search.active && neverMatch =~ /doesNotMatch/" + }, + { + "key": "shift+cmd+f", + "command": "search.action.openNewEditor" + } +] diff --git a/vscode_config/settings.json b/vscode_config/settings.json new file mode 100644 index 0000000..082abc3 --- /dev/null +++ b/vscode_config/settings.json @@ -0,0 +1,94 @@ +{ + "workbench.iconTheme": "charmed-icons", + "workbench.tips.enabled": false, + "workbench.tree.enableStickyScroll": false, + "workbench.tree.renderIndentGuides": "none", + "workbench.tree.indent": 10, + "window.systemColorTheme": "auto", + "window.autoDetectColorScheme": true, + "workbench.editor.tabActionLocation": "left", + "workbench.preferredDarkColorTheme": "FlatUI Dark", + "explorer.decorations.colors": false, + "editor.fontFamily": "'Maple Mono', monospace", + "editor.fontSize": 14, + "editor.fontLigatures": "'calt', 'ss01', 'ss02', 'ss03', 'ss06', 'ss07', 'ss08', 'ss09', 'liga'", + "editor.inlineSuggest.fontFamily": "'Maple Mono', monospace", + "workbench.navigationControl.enabled": false, + "editor.fontVariations": false, + "editor.wordWrap": "on", + "editor.cursorStyle": "underline", + "editor.tabSize": 2, + "editor.accessibilitySupport": "on", + "workbench.startupEditor": "none", + "editor.screenReaderAnnounceInlineSuggestion": false, + "[typescript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "accessibility.signalOptions.volume": 0, + "breadcrumbs.icons": false, + "explorer.autoReveal": true, + "explorer.compactFolders": false, + "explorer.sortOrder": "type", + "window.commandCenter": false, + "window.title": "${rootName}", + "breadcrumbs.enabled": false, + "terminal.integrated.fontLigatures.enabled": true, + "[javascript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "editor.formatOnSave": true, + "terminal.external.osxExec": "Ghostty.app", + "[jsonc]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[typescriptreact]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "terminal.integrated.fontSize": 14, + "terminal.integrated.fontFamily": "'Maple Mono', monospace", + "workbench.editor.enablePreview": false, + "telemetry.feedback.enabled": false, + "telemetry.telemetryLevel": "crash", + "chat.commandCenter.enabled": false, + "codeium.enableInComments": false, + "[javascriptreact]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "editor.minimap.enabled": false, + "editor.scrollbar.verticalScrollbarSize": 6, + "editor.scrollbar.horizontalScrollbarSize": 6, + "javascript.format.enable": false, + "typescript.format.enable": false, + "[astro]": { + "editor.defaultFormatter": "astro-build.astro-vscode" + }, + "workbench.preferredLightColorTheme": "FlatUI Immersed", + "discord.suppressNotifications": true, + "[json]": { + "editor.defaultFormatter": "vscode.json-language-features" + }, + "[html]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "redhat.telemetry.enabled": false, + "jest.runMode": "on-demand", + "testing.automaticallyOpenPeekView": "failureAnywhere", + "workbench.statusBar.visible": false, + "ollama-autocoder.model": "qwen2.5-coder:7b", + "workbench.layoutControl.enabled": false, + "rust-analyzer.lens.run.enable": false, + "rust-analyzer.lens.debug.enable": false, + "rust-analyzer.lens.enable": false, + "rust-analyzer.lens.implementations.enable": false, + "rust-analyzer.lens.updateTest.enable": false, + "rust-analyzer.inlayHints.typeHints.enable": false, + "workbench.activityBar.location": "top", + "workbench.editor.tabActionUnpinVisibility": false, + "workbench.editor.tabSizingFixedMaxWidth": 180, + "workbench.sideBar.location": "right", + "editor.smoothScrolling": true, + "editor.cursorSmoothCaretAnimation": "on", + "workbench.list.smoothScrolling": true, + "terminal.integrated.smoothScrolling": true, + "editor.cursorBlinking": "smooth" +} diff --git a/zed_config/settings.json b/zed_config/settings.json index 5aaccb9..2395de8 100644 --- a/zed_config/settings.json +++ b/zed_config/settings.json @@ -16,8 +16,13 @@ "metrics": false }, "agent": { - "enabled": false, - "dock": null + "default_profile": "write", + "default_model": { + "provider": "ollama", + "model": "qwen2.5-coder:7b" + }, + "enabled": true, + "dock": "right" }, "edit_predictions": { "disabled_globs": [".md"], @@ -27,7 +32,7 @@ "inactive_opacity": 0.7 }, "features": { - "edit_prediction_provider": "none" + "edit_prediction_provider": "zed" }, "collaboration_panel": { "button": false @@ -63,24 +68,24 @@ "vertical_scroll_margin": 18, "ui_font_family": ".SystemUIFont", "ui_font_size": 16, - "buffer_font_family": "Monaspace Argon Var", - "buffer_font_features": { - "calt": true, - "ss01": true, - "ss02": true, - "ss03": true, - "ss04": false, - "ss05": false, - "ss06": true, - "ss07": true, - "ss08": true, - "ss09": true, - "liga": true - }, + "buffer_font_family": "Maple Mono", + // "buffer_font_features": { + // "calt": true, + // "ss01": true, + // "ss02": true, + // "ss03": true, + // "ss04": false, + // "ss05": false, + // "ss06": true, + // "ss07": true, + // "ss08": true, + // "ss09": true, + // "liga": true + // }, "buffer_font_size": 14, "terminal": { "dock": "bottom", - "font_family": "Monaspace Argon Var", + "font_family": "Maple Mono", "font_fallbacks": ["FiraCode Nerd Font Mono"], "toolbar": { "breadcrumbs": false } }, diff --git a/zsh_config/zshrc b/zsh_config/zshrc index 6c1ff32..36e1428 100644 --- a/zsh_config/zshrc +++ b/zsh_config/zshrc @@ -17,5 +17,10 @@ eval "$(atuin init zsh)" # bun completions [ -s "/Users/ghall/.bun/_bun" ] && source "/Users/ghall/.bun/_bun" +# ggc completions +if [ -f "$(go env GOPATH)/pkg/mod/github.com/bmf-san/ggc/v5@*/tools/completions/ggc.zsh" ]; then + . "$(go env GOPATH)"/pkg/mod/github.com/bmf-san/ggc/v5@*/tools/completions/ggc.zsh +fi + # Add RVM to PATH for scripting. Make sure this is the last PATH variable change. export PATH="$PATH:$HOME/.rvm/bin"