From b691ebe0d732442f30f3f376042b4f11be3c7534 Mon Sep 17 00:00:00 2001 From: Graham Hall Date: Tue, 23 Sep 2025 09:49:24 -0400 Subject: [PATCH] 2025-09-23 --- Brewfile | 35 ++++++++++++++--------------------- git_config/gitconfig | 8 +++++--- misc_config/ghostty | 11 ++++------- vscode_config/settings.json | 26 ++++++++++++++++++++------ zed_config/keymap.json | 11 +++++++++++ zed_config/settings.json | 18 +++++------------- 6 files changed, 59 insertions(+), 50 deletions(-) diff --git a/Brewfile b/Brewfile index e8f0f6e..02056a6 100644 --- a/Brewfile +++ b/Brewfile @@ -26,6 +26,7 @@ brew "fzf" brew "ggc" brew "gh" brew "git" +brew "git-split-diffs" brew "gitmoji" brew "glow" brew "gnupg" @@ -61,17 +62,19 @@ brew "telnet" brew "thefuck" brew "toot" brew "vapor" +brew "vlang" brew "watchman" brew "wget" brew "yarn" brew "yazi" brew "yt-dlp" +brew "zig" brew "zlib" brew "zoxide" brew "dotenvx/brew/dotenvx" brew "oven-sh/bun/bun" cask "airbuddy" -cask "app-tamer" +cask "alfred" cask "appflowy" cask "arq" cask "autodock" @@ -80,11 +83,7 @@ cask "cog-app" cask "contexts" cask "cork" cask "daisydisk" -cask "discord" -cask "epic-games" -cask "firefox@nightly" cask "fork" -cask "gb-studio" cask "ghostty" cask "hazel" cask "iina" @@ -93,14 +92,14 @@ cask "jordanbaird-ice" cask "keka" cask "keyboardcleantool" cask "keystash" -cask "kiro" +cask "knockknock" +cask "lulu" cask "mac-mouse-fix" -cask "mailmate@beta" cask "nova" -cask "onyx" +cask "onyx@beta" cask "openemu" cask "paletro" -cask "pictogram" +cask "pearcleaner" cask "postgres-unofficial" cask "qlmarkdown" cask "quicklook-json" @@ -108,7 +107,6 @@ cask "raycast" cask "rectangle-pro" cask "rocket" cask "siphon" -cask "slack" cask "spamsieve" cask "steam" cask "swift-shift" @@ -122,21 +120,18 @@ cask "vivaldi" cask "xscope" cask "zed" cask "zen" +cask "zoom" mas "Actions", id: 1586435171 mas "Affinity Designer 2", id: 1616831348 mas "Affinity Photo 2", id: 1616822987 -mas "Affinity Publisher 2", id: 1606941598 mas "Anybox", id: 1593408455 mas "Bakery", id: 1575220747 mas "Baking Soda", id: 1601151613 -mas "Balatro", id: 6502451661 mas "Battery Indicator", id: 1206020918 mas "Bear", id: 1091189122 mas "Codye", id: 1516894961 mas "Collections", id: 1568395334 mas "Color Picker", id: 1545870783 -mas "CoverSutra", id: 404128139 -mas "CustomSymbols", id: 1566662030 mas "Dato", id: 1470584107 mas "DevCleaner", id: 1388020431 mas "Developer", id: 640199958 @@ -150,6 +145,7 @@ mas "Front and Center", id: 1493996622 mas "Gifski", id: 1351639930 mas "HEIC Converter", id: 1294126402 mas "HTTPBot", id: 1232603544 +mas "Ice Cubes", id: 6444915884 mas "Interactful", id: 1528095640 mas "Ivory", id: 6444602274 mas "JSON Peep", id: 1458969831 @@ -157,12 +153,11 @@ mas "Key Codes", id: 414568915 mas "Keynote", id: 409183694 mas "Lungo", id: 1263070803 mas "Mactracker", id: 430255202 -mas "Mini Motorways", id: 1456188526 mas "Numbers", id: 409203825 mas "Online Check", id: 6504709660 mas "Page Screenshot for Safari", id: 1472715727 mas "Pages", id: 409201541 -mas "Parcel", id: 639968404 +mas "Parcel", id: 375589283 mas "Pastel", id: 413897608 mas "Photomator", id: 1444636541 mas "Pixelmator Pro", id: 1289583905 @@ -182,20 +177,16 @@ 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 "astro-build.astro-vscode" vscode "bradlc.vscode-tailwindcss" -vscode "chenglou92.rescript-vscode" vscode "christian-kohler.npm-intellisense" -vscode "codeium.codeium" vscode "csstools.postcss" vscode "dbaeumer.vscode-eslint" 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" @@ -204,8 +195,10 @@ vscode "orta.vscode-jest" vscode "oven.bun-vscode" vscode "prisma.prisma" vscode "redhat.vscode-xml" +vscode "ripplejs.ripple-vscode-plugin" vscode "rust-lang.rust-analyzer" vscode "shopify.ruby-lsp" vscode "swiftlang.swift-vscode" vscode "tamasfe.even-better-toml" vscode "vue.volar" +vscode "ziglang.vscode-zig" diff --git a/git_config/gitconfig b/git_config/gitconfig index b738caf..c78c4e8 100644 --- a/git_config/gitconfig +++ b/git_config/gitconfig @@ -5,7 +5,7 @@ signingkey = FB70F1142D7A45B8 [core] - editor = vim + editor = micro excludesfile = /Users/ghall/.gitignore [filter "lfs"] @@ -13,7 +13,7 @@ smudge = git-lfs smudge -- %f process = git-lfs filter-process required = true - + [init] defaultBranch = main @@ -21,8 +21,10 @@ autoSetupRemote = true default = simple [merge] - tool = vimdiff + tool = git-split-diffs [color] ui = true [fetch] auto = true +[coderabbit] + machineId = cli/e407c8d66b9f497cb110e079e700f9e1 diff --git a/misc_config/ghostty b/misc_config/ghostty index ac5c2b1..f38c546 100644 --- a/misc_config/ghostty +++ b/misc_config/ghostty @@ -1,14 +1,12 @@ -theme = Breeze -# theme = light:Tomorrow,dark:Breeze -window-theme = system -macos-titlebar-style = native + +theme = light:Tomorrow,dark:Aura macos-secure-input-indication = true cursor-style = underline shell-integration-features = no-cursor adjust-cursor-thickness = 4 -font-size = 14 +font-size = 13 font-family = Maple Mono font-thicken = true selection-invert-fg-bg = true @@ -18,5 +16,4 @@ window-width = 120 window-padding-x = 5 window-padding-y = 5 window-padding-balance = true -background-opacity = 0.96 -background-blur = true + diff --git a/vscode_config/settings.json b/vscode_config/settings.json index 082abc3..9ed0e54 100644 --- a/vscode_config/settings.json +++ b/vscode_config/settings.json @@ -45,7 +45,7 @@ "editor.defaultFormatter": "esbenp.prettier-vscode" }, "terminal.integrated.fontSize": 14, - "terminal.integrated.fontFamily": "'Maple Mono', monospace", + "terminal.integrated.fontFamily": "'MesloLGS NF', monospace", "workbench.editor.enablePreview": false, "telemetry.feedback.enabled": false, "telemetry.telemetryLevel": "crash", @@ -62,10 +62,10 @@ "[astro]": { "editor.defaultFormatter": "astro-build.astro-vscode" }, - "workbench.preferredLightColorTheme": "FlatUI Immersed", + "workbench.preferredLightColorTheme": "FlatUI", "discord.suppressNotifications": true, "[json]": { - "editor.defaultFormatter": "vscode.json-language-features" + "editor.defaultFormatter": "esbenp.prettier-vscode" }, "[html]": { "editor.defaultFormatter": "esbenp.prettier-vscode" @@ -82,13 +82,27 @@ "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" + "editor.cursorBlinking": "smooth", + "workbench.activityBar.location": "top", + "rust-analyzer.inlayHints.chainingHints.enable": false, + "rust-analyzer.inlayHints.closingBraceHints.enable": false, + "rust-analyzer.inlayHints.genericParameterHints.const.enable": false, + "rust-analyzer.inlayHints.parameterHints.enable": false, + "zig.zls.enabled": "on", + "zig.zls.inlayHintsExcludeSingleArgument": false, + "zig.zls.inlayHintsShowBuiltin": false, + "zig.zls.inlayHintsShowParameterName": false, + "zig.zls.inlayHintsShowStructLiteralFieldType": false, + "zig.zls.inlayHintsShowVariableTypeHints": false, + "editor.inlayHints.enabled": "offUnlessPressed", + "prettier.documentSelectors": ["**/*.ripple"], + "[ripple]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + } } diff --git a/zed_config/keymap.json b/zed_config/keymap.json index a175aca..c3a6388 100644 --- a/zed_config/keymap.json +++ b/zed_config/keymap.json @@ -32,5 +32,16 @@ "bindings": { "ctrl-`": "pane::CloseActiveItem" } + }, + { + "context": "Editor", + "bindings": { + "cmd-w": [ + "pane::CloseActiveItem", + { + "close_pinned": false + } + ] + } } ] diff --git a/zed_config/settings.json b/zed_config/settings.json index 2395de8..1895a52 100644 --- a/zed_config/settings.json +++ b/zed_config/settings.json @@ -4,7 +4,7 @@ "button": false }, "icon_theme": "Soft Charmed Icons", - "show_edit_predictions": true, + "show_edit_predictions": false, "base_keymap": "VSCode", "close_on_file_delete": true, "outline_panel": { @@ -16,12 +16,7 @@ "metrics": false }, "agent": { - "default_profile": "write", - "default_model": { - "provider": "ollama", - "model": "qwen2.5-coder:7b" - }, - "enabled": true, + "enabled": false, "dock": "right" }, "edit_predictions": { @@ -32,14 +27,11 @@ "inactive_opacity": 0.7 }, "features": { - "edit_prediction_provider": "zed" + "edit_prediction_provider": "none" }, "collaboration_panel": { "button": false }, - "chat_panel": { - "button": "never" - }, "toolbar": { "breadcrumbs": false, "quick_actions": false, @@ -55,7 +47,7 @@ "theme": { "mode": "system", "light": "One Light", - "dark": "Ayu Mirage" + "dark": "Ayu Dark" }, "scrollbar": { "show": "system", @@ -82,7 +74,7 @@ // "ss09": true, // "liga": true // }, - "buffer_font_size": 14, + "buffer_font_size": 13, "terminal": { "dock": "bottom", "font_family": "Maple Mono",