From ed1504aff0b3bd85e12382c000e209e7d69e03cf Mon Sep 17 00:00:00 2001 From: Graham Hall Date: Fri, 5 Dec 2025 16:23:16 -0500 Subject: [PATCH] 2025-12-05 --- Brewfile | 44 +++++++++++++++++++++++++++---------- "Icon\r" | 0 misc_config/ghostty | 5 ++++- vscode_config/settings.json | 22 +++++++++++++------ zed_config/keymap.json | 6 +++++ zed_config/settings.json | 26 +++++++++++++++------- 6 files changed, 75 insertions(+), 28 deletions(-) delete mode 100644 "Icon\r" diff --git a/Brewfile b/Brewfile index c7156f1..bbeaf7b 100644 --- a/Brewfile +++ b/Brewfile @@ -3,6 +3,7 @@ tap "dotenvx/brew" tap "ghall89/tap" tap "marsanne/cask" tap "oven-sh/bun" +tap "tinygo-org/tools" brew "jq" brew "ansiweather" brew "xz" @@ -12,17 +13,21 @@ brew "automake" brew "bazel" brew "bchunk" brew "btop" +brew "coreutils" +brew "openssl@3" +brew "cask" brew "cloc" brew "cmake" brew "libyaml" -brew "openssl@3" brew "cocoapods" -brew "coreutils" +brew "create-dmg" brew "csvkit" brew "deno" +brew "elixir" brew "exiv2" brew "eza" brew "fastfetch" +brew "fd" brew "ffmpeg" brew "flyctl" brew "fzf" @@ -31,9 +36,11 @@ brew "gh" brew "git" brew "git-split-diffs" brew "gitmoji" +brew "gitui" brew "glow" brew "gnupg" brew "go" +brew "go-task" brew "gum" brew "helix" brew "icu4c@76" @@ -57,6 +64,7 @@ brew "pkgconf" brew "pnpm" brew "ripgrep" brew "rust" +brew "rust-analyzer" brew "sf-pwgen" brew "speedtest-cli" brew "superfile" @@ -64,6 +72,8 @@ brew "swift-format" brew "telnet" brew "thefuck" brew "toot" +brew "trash" +brew "typst" brew "vapor" brew "vlang" brew "watchman" @@ -76,22 +86,25 @@ brew "zlib" brew "zoxide" brew "dotenvx/brew/dotenvx" brew "oven-sh/bun/bun" +brew "tinygo-org/tools/tinygo" cask "airbuddy" cask "alfred" cask "appflowy" cask "arq" cask "autodock" cask "bbedit" -cask "bloom" +cask "cap" cask "coderabbit" cask "cog-app" cask "contexts" cask "cork" cask "daisydisk" +cask "discord" +cask "firefox" cask "fork" cask "ghostty" -cask "gog-galaxy" cask "hazel" +cask "helium-browser" cask "iina" cask "imageoptim" cask "jordanbaird-ice" @@ -99,38 +112,40 @@ cask "keka" cask "keyboardcleantool" cask "keystash" cask "knockknock" -cask "lulu" +cask "lapce" cask "mac-mouse-fix" +cask "markedit" cask "marta" cask "nova" cask "onyx@beta" cask "openemu" +cask "orion" cask "paletro" cask "pearcleaner" cask "postgres-unofficial" cask "qlmarkdown" cask "quicklook-json" +cask "rapidapi" cask "raycast" cask "rectangle-pro" cask "rocket" cask "siphon" +cask "slack" cask "spamsieve" cask "steam" cask "swift-shift" cask "swiftformat-for-xcode" +cask "sync" cask "tableplus" cask "tic80" cask "tunnelblick" cask "vanilla" cask "visual-studio-code" -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 "Anybox", id: 1593408455 mas "Bakery", id: 1575220747 mas "Baking Soda", id: 1601151613 @@ -146,12 +161,11 @@ mas "Dice by PCalc", id: 1479250666 mas "Dropover", id: 1355679052 mas "Equinox", id: 1591510203 mas "Expenses", id: 1492055171 -mas "Find Any File", id: 0 +mas "Find Any File", id: 402569179 mas "Folder Quick Look", id: 6753110395 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 @@ -180,16 +194,19 @@ mas "Text Workflow", id: 1600520682 mas "Tot", id: 1491071483 mas "Transporter", id: 1450874784 mas "uBlock Origin Lite", id: 6745342698 +mas "Uplock", id: 6469049274 mas "Velja", id: 1607635845 mas "Vinegar", id: 1591303229 mas "WhatsApp", id: 310633997 mas "WorldWideWeb", id: 1621370168 -mas "WutheringWaves", id: 6475033368 +mas "Xcode", id: 497799835 +vscode "akamud.vscode-theme-onelight" vscode "astro-build.astro-vscode" vscode "bradlc.vscode-tailwindcss" vscode "christian-kohler.npm-intellisense" vscode "csstools.postcss" vscode "dbaeumer.vscode-eslint" +vscode "dnicolson.binary-plist" vscode "esbenp.prettier-vscode" vscode "golang.go" vscode "icrawl.discord-vscode" @@ -197,6 +214,7 @@ vscode "littensy.charmed-icons" vscode "lkytal.flatui" vscode "llvm-vs-code-extensions.lldb-dap" vscode "mechatroner.rainbow-csv" +vscode "ms-vscode.makefile-tools" vscode "orta.vscode-jest" vscode "oven.bun-vscode" vscode "pollywoggames.pico8-ls" @@ -205,9 +223,11 @@ vscode "redhat.vscode-xml" vscode "ripplejs.ripple-vscode-plugin" vscode "rust-lang.rust-analyzer" vscode "shopify.ruby-lsp" +vscode "svelte.svelte-vscode" vscode "swiftlang.swift-vscode" vscode "tamasfe.even-better-toml" -vscode "vue.volar" +vscode "task.vscode-task" +vscode "teabyii.ayu" vscode "ziglang.vscode-zig" go "golang.org/x/tools/gopls" go "honnef.co/go/tools/cmd/staticcheck" diff --git "a/Icon\r" "b/Icon\r" deleted file mode 100644 index e69de29..0000000 diff --git a/misc_config/ghostty b/misc_config/ghostty index 94905df..7e231fe 100644 --- a/misc_config/ghostty +++ b/misc_config/ghostty @@ -1,4 +1,4 @@ -theme = dark: Afterglow,light: Adwaita +theme = dark: Afterglow,light: 3024 Day macos-secure-input-indication = true cursor-style = underline @@ -18,3 +18,6 @@ window-padding-balance = true background-opacity=0.93 background-blur=true + + + diff --git a/vscode_config/settings.json b/vscode_config/settings.json index 9ed0e54..9a73dc4 100644 --- a/vscode_config/settings.json +++ b/vscode_config/settings.json @@ -2,18 +2,16 @@ "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", + "workbench.preferredDarkColorTheme": "Ayu Mirage Bordered", "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", @@ -29,7 +27,6 @@ "explorer.autoReveal": true, "explorer.compactFolders": false, "explorer.sortOrder": "type", - "window.commandCenter": false, "window.title": "${rootName}", "breadcrumbs.enabled": false, "terminal.integrated.fontLigatures.enabled": true, @@ -62,7 +59,7 @@ "[astro]": { "editor.defaultFormatter": "astro-build.astro-vscode" }, - "workbench.preferredLightColorTheme": "FlatUI", + "workbench.preferredLightColorTheme": "Ayu Light Bordered", "discord.suppressNotifications": true, "[json]": { "editor.defaultFormatter": "esbenp.prettier-vscode" @@ -75,7 +72,6 @@ "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, @@ -104,5 +100,17 @@ "prettier.documentSelectors": ["**/*.ripple"], "[ripple]": { "editor.defaultFormatter": "esbenp.prettier-vscode" - } + }, + "makefile.configureOnOpen": false, + "svelte.enable-ts-plugin": true, + "[svelte]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[scss]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "workbench.navigationControl.enabled": false, + "workbench.layoutControl.enabled": false, + "indentRainbow.lightIndicatorStyleLineWidth": 0, + "workbench.tree.renderIndentGuides": "none" } diff --git a/zed_config/keymap.json b/zed_config/keymap.json index a60f168..763f9c3 100644 --- a/zed_config/keymap.json +++ b/zed_config/keymap.json @@ -44,5 +44,11 @@ } ] } + }, + { + "context": "(Editor && !edit_prediction)", + "bindings": { + "alt": "editor::ShowEditPrediction" + } } ] diff --git a/zed_config/settings.json b/zed_config/settings.json index 42fc712..44ead82 100644 --- a/zed_config/settings.json +++ b/zed_config/settings.json @@ -1,7 +1,12 @@ { - "git_panel": { - "button": false + "sticky_scroll": { + "enabled": true }, + "preview_tabs": { + "enable_preview_from_code_navigation": true, + "enable_preview_from_file_finder": true + }, + "disable_ai": true, "icon_theme": "Soft Charmed Icons", "show_edit_predictions": false, "base_keymap": "VSCode", @@ -19,14 +24,16 @@ "metrics": false }, "agent": { + "button": false, "enabled": false, "dock": "right" }, "edit_predictions": { "disabled_globs": [".md"], - "mode": "eager" + "mode": "subtle" }, "active_pane_modifiers": { + "border_size": 0.0, "inactive_opacity": 0.7 }, "features": { @@ -36,7 +43,6 @@ "button": false }, "toolbar": { - // "breadcrumbs": false, "quick_actions": false, "selections_menu": false }, @@ -49,8 +55,8 @@ }, "theme": { "mode": "system", - "light": "One Light", - "dark": "Catppuccin Mocha" + "light": "Fleet Light", + "dark": "Nightfox - opaque" }, "scrollbar": { "show": "system", @@ -65,7 +71,7 @@ }, "cursor_shape": "underline", "vertical_scroll_margin": 18, - "ui_font_family": "Input Mono", + "ui_font_family": ".SystemUIFont", "ui_font_size": 15, "buffer_font_family": "Maple Mono", // "buffer_font_features": { @@ -90,6 +96,7 @@ }, "soft_wrap": "editor_width", "tabs": { + "show_close_button": "hover", "close_position": "left", "git_status": true, "file_icons": true, @@ -99,6 +106,7 @@ "button": false }, "tab_bar": { + "show": true, "show_nav_history_buttons": false }, "git": { @@ -134,8 +142,10 @@ } }, "project_panel": { + "file_icons": true, + "folder_icons": true, "dock": "left", - "indent_size": 16, + "indent_size": 14.0, "auto_fold_dirs": false, "show_diagnostics": "off", "git_status": true,