From d171c944786fd029e38f1f28f2d59910fa21a5ff Mon Sep 17 00:00:00 2001 From: Graham Hall Date: Tue, 14 Oct 2025 18:56:06 -0400 Subject: [PATCH] 2025-10-14 --- Brewfile | 9 +++++++++ git_config/gitconfig | 2 ++ misc_config/ghostty | 2 +- zed_config/settings.json | 38 +++++++++++++++++++++++++++----------- 4 files changed, 39 insertions(+), 12 deletions(-) diff --git a/Brewfile b/Brewfile index 3d8b616..c7156f1 100644 --- a/Brewfile +++ b/Brewfile @@ -13,13 +13,16 @@ brew "bazel" brew "bchunk" brew "btop" brew "cloc" +brew "cmake" brew "libyaml" brew "openssl@3" brew "cocoapods" brew "coreutils" brew "csvkit" +brew "deno" brew "exiv2" brew "eza" +brew "fastfetch" brew "ffmpeg" brew "flyctl" brew "fzf" @@ -79,6 +82,7 @@ cask "appflowy" cask "arq" cask "autodock" cask "bbedit" +cask "bloom" cask "coderabbit" cask "cog-app" cask "contexts" @@ -97,6 +101,7 @@ cask "keystash" cask "knockknock" cask "lulu" cask "mac-mouse-fix" +cask "marta" cask "nova" cask "onyx@beta" cask "openemu" @@ -179,6 +184,7 @@ mas "Velja", id: 1607635845 mas "Vinegar", id: 1591303229 mas "WhatsApp", id: 310633997 mas "WorldWideWeb", id: 1621370168 +mas "WutheringWaves", id: 6475033368 vscode "astro-build.astro-vscode" vscode "bradlc.vscode-tailwindcss" vscode "christian-kohler.npm-intellisense" @@ -193,6 +199,7 @@ vscode "llvm-vs-code-extensions.lldb-dap" vscode "mechatroner.rainbow-csv" vscode "orta.vscode-jest" vscode "oven.bun-vscode" +vscode "pollywoggames.pico8-ls" vscode "prisma.prisma" vscode "redhat.vscode-xml" vscode "ripplejs.ripple-vscode-plugin" @@ -202,3 +209,5 @@ vscode "swiftlang.swift-vscode" vscode "tamasfe.even-better-toml" vscode "vue.volar" vscode "ziglang.vscode-zig" +go "golang.org/x/tools/gopls" +go "honnef.co/go/tools/cmd/staticcheck" diff --git a/git_config/gitconfig b/git_config/gitconfig index c78c4e8..87d2517 100644 --- a/git_config/gitconfig +++ b/git_config/gitconfig @@ -28,3 +28,5 @@ auto = true [coderabbit] machineId = cli/e407c8d66b9f497cb110e079e700f9e1 +[pull] + rebase = true diff --git a/misc_config/ghostty b/misc_config/ghostty index 92aed14..94905df 100644 --- a/misc_config/ghostty +++ b/misc_config/ghostty @@ -16,5 +16,5 @@ window-padding-x = 5 window-padding-y = 5 window-padding-balance = true -background-opacity=0.95 +background-opacity=0.93 background-blur=true diff --git a/zed_config/settings.json b/zed_config/settings.json index f460b5a..42fc712 100644 --- a/zed_config/settings.json +++ b/zed_config/settings.json @@ -1,6 +1,6 @@ { "git_panel": { - "dock": "left" + "button": false }, "icon_theme": "Soft Charmed Icons", "show_edit_predictions": false, @@ -9,9 +9,13 @@ "outline_panel": { "dock": "right" }, - "bottom_dock_layout": "full", + "title_bar": { + "show_user_picture": false, + "show_sign_in": false, + "show_branch_icon": true + }, "telemetry": { - "diagnostics": true, + "diagnostics": false, "metrics": false }, "agent": { @@ -20,19 +24,19 @@ }, "edit_predictions": { "disabled_globs": [".md"], - "mode": "subtle" + "mode": "eager" }, "active_pane_modifiers": { "inactive_opacity": 0.7 }, "features": { - "edit_prediction_provider": "zed" + "edit_prediction_provider": "none" }, "collaboration_panel": { "button": false }, "toolbar": { - "breadcrumbs": false, + // "breadcrumbs": false, "quick_actions": false, "selections_menu": false }, @@ -45,8 +49,8 @@ }, "theme": { "mode": "system", - "light": "Catppuccin Latte (Blur)", - "dark": "Catppuccin Macchiato (Blur) [Heavy]" + "light": "One Light", + "dark": "Catppuccin Mocha" }, "scrollbar": { "show": "system", @@ -55,6 +59,10 @@ "vertical": true } }, + "status_bar": { + "active_language_button": false, + "cursor_position_button": false + }, "cursor_shape": "underline", "vertical_scroll_margin": 18, "ui_font_family": "Input Mono", @@ -95,7 +103,10 @@ }, "git": { "git_gutter": "tracked_files", - "hunk_style": "unstaged_hollow" + "hunk_style": "unstaged_hollow", + "inline_blame": { + "show_commit_summary": true + } }, "indent_guides": { "enabled": true, @@ -124,11 +135,16 @@ }, "project_panel": { "dock": "left", - "indent_size": 10, + "indent_size": 16, "auto_fold_dirs": false, "show_diagnostics": "off", "git_status": true, - "entry_spacing": "standard" + "entry_spacing": "standard", + "sticky_scroll": false, + "hide_root": true, + "indent_guides": { + "show": "never" + } }, "file_types": { "HTML": ["hbs", "njk", "webc", "leaf"]