diff --git a/config/fish/conf.d/brew.fish b/config/fish/conf.d/brew.fish index 286855f..12d9e9a 100644 --- a/config/fish/conf.d/brew.fish +++ b/config/fish/conf.d/brew.fish @@ -1,2 +1,2 @@ # source brew shellenv -/opt/homebrew/bin/brew shellenv | source +/opt/homebrew/bin/brew shellenv 2>/dev/null | source diff --git a/config/fish/conf.d/starship.fish b/config/fish/conf.d/starship.fish index 6956723..14d0e3b 100644 --- a/config/fish/conf.d/starship.fish +++ b/config/fish/conf.d/starship.fish @@ -1,5 +1,6 @@ if not status is-interactive && test "$CI" != true - exit + exit end starship init fish | source +enable_transience diff --git a/config/fish/config.fish b/config/fish/config.fish index f4cc5aa..362e10b 100644 --- a/config/fish/config.fish +++ b/config/fish/config.fish @@ -4,3 +4,6 @@ if not string match -q -- $PNPM_HOME $PATH set -gx PATH "$PNPM_HOME" $PATH end # pnpm end + +# uv +fish_add_path "/Users/chrisvanderloo/.local/share/../bin" diff --git a/config/fish/fish_variables b/config/fish/fish_variables index f966f40..249f370 100644 --- a/config/fish/fish_variables +++ b/config/fish/fish_variables @@ -34,4 +34,4 @@ SETUVAR fish_pager_color_description:yellow\x1e\x2di SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan SETUVAR fish_pager_color_selected_background:\x2dr -SETUVAR fish_user_paths:/Users/chrisvanderloo/\x2ecache/\x2ebun/bin\x1e/Users/chrisvanderloo/\x2ecargo/bin\x1e/opt/homebrew/opt/rustup/bin\x1e/opt/homebrew/bin\x1e/Applications/Ghostty\x2eapp/Contents/MacOS +SETUVAR fish_user_paths:/Users/chrisvanderloo/\x2elocal/bin\x1e/Users/chrisvanderloo/\x2ecache/\x2ebun/bin\x1e/Users/chrisvanderloo/\x2ecargo/bin\x1e/opt/homebrew/opt/rustup/bin\x1e/opt/homebrew/bin\x1e/Applications/Ghostty\x2eapp/Contents/MacOS diff --git a/config/fish/functions/docker.fish b/config/fish/functions/docker.fish new file mode 100644 index 0000000..b3d7ae8 --- /dev/null +++ b/config/fish/functions/docker.fish @@ -0,0 +1,3 @@ +function docker --wraps=podman --description 'alias docker=podman' + podman $argv +end diff --git a/config/fish/functions/k9s.fish b/config/fish/functions/k9s.fish deleted file mode 100644 index cee57e1..0000000 --- a/config/fish/functions/k9s.fish +++ /dev/null @@ -1,6 +0,0 @@ -function k9s --description 'alias k9s k9s && echo "hi"' - if ! aws sts get-caller-identity &>/dev/null - aws sso login - end - command k9s $argv -end diff --git a/config/helix/config.toml b/config/helix/config.toml index 7ec7012..47d2bbb 100644 --- a/config/helix/config.toml +++ b/config/helix/config.toml @@ -1,4 +1,4 @@ -theme = "catppuccin_dynamic_transparent" +theme = "catppuccin_mocha" [keys.normal] S-k = "hover" diff --git a/config/lazygit/config.yml b/config/lazygit/config.yml index 8e3b35f..af33a2d 100644 --- a/config/lazygit/config.yml +++ b/config/lazygit/config.yml @@ -1,6 +1,5 @@ git: - paging: - colorArg: always - pager: delta --light --paging=never + pagers: + - colorArg: always + pager: delta --light --paging=never overrideGpg: true - diff --git a/config/starship-jj/starship-jj.toml b/config/starship-jj/starship-jj.toml new file mode 100644 index 0000000..40da6cb --- /dev/null +++ b/config/starship-jj/starship-jj.toml @@ -0,0 +1,75 @@ +reset_color = false + +[bookmarks] +search_depth = 100 +exclude = [] + +[[module]] +type = "Bookmarks" +separator = " " +color = "Magenta" +behind_symbol = "⇡" +surround_with_quotes = false +ignore_empty_commits = "None" + +[[module]] +type = "Commit" +previous_message_symbol = "⇣" +max_length = 24 +show_previous_if_empty = false +empty_text = "(no desc)" +surround_with_quotes = true + +[module.non_unique] +color = "Black" + +[[module]] +type = "State" +separator = " " + +[module.conflict] +disabled = false +text = "(CONFLICT)" +color = "Red" + +[module.divergent] +disabled = false +text = "(DIVERGENT)" +color = "Cyan" + +[module.empty] +disabled = false +text = "(EMPTY)" +color = "Yellow" + +[module.immutable] +disabled = false +text = "(IMMUTABLE)" +color = "Yellow" + +[module.hidden] +disabled = false +text = "(HIDDEN)" +color = "Yellow" + +[[module]] +type = "Metrics" +template = "[{changed} {added} {removed}]" +hide_if_empty = true +color = "Magenta" + +[module.changed_files] +prefix = "" +suffix = "" +color = "Cyan" + +[module.added_lines] +prefix = "+" +suffix = "" +color = "Green" + +[module.removed_lines] +prefix = "-" +suffix = "" +color = "Red" + diff --git a/config/starship.toml b/config/starship.toml index 4975e56..5fe994e 100644 --- a/config/starship.toml +++ b/config/starship.toml @@ -34,9 +34,6 @@ us-east-2 = 'oh' [buf] symbol = " " -[bun] -disabled = true - [c] symbol = " " @@ -74,7 +71,6 @@ truncation_length = 8 symbol = " " [golang] -disabled = true symbol = " " [guix_shell] diff --git a/config/zed/settings.json b/config/zed/settings.json index 9e4cdab..d6a4345 100644 --- a/config/zed/settings.json +++ b/config/zed/settings.json @@ -1,25 +1,55 @@ { + "agent": { + "default_model": { + "provider": "copilot_chat", + "model": "gpt-5" + }, + "model_parameters": [] + }, + "buffer_line_height": { + "custom": 1.4 + }, + "minimap": { + "show": "auto", + "max_width_columns": 80, + "thumb_border": "left_only" + }, + "features": { - "edit_prediction_provider": "zed" + "edit_prediction_provider": "copilot" }, + // Theme "icon_theme": { "mode": "system", - "light": "JetBrains New UI Icons (Light)", - "dark": "Catppuccin Macchiato" + "light": "Catppuccin Latte", + "dark": "Catppuccin Mocha" }, "theme": { "mode": "system", "light": "Catppuccin Latte", - "dark": "Catppuccin Macchiato" + "dark": "Catppuccin Mocha" }, // Buffer - "buffer_font_family": "Hack Nerd Font", - "buffer_font_weight": 500, + "buffer_font_family": "JetBrainsMono Nerd Font", "tab_size": 2, - "ui_font_size": 15, - "buffer_font_size": 14, + "ui_font_size": 14, + "buffer_font_size": 14.0, + "experimental.theme_overrides": { + "syntax": { + "comment.doc": { + "font_weight": 300, + "font_style": "oblique" + }, + "comment": { + "font_weight": 300 + }, + "keyword": { + "font_weight": 600 + } + } + }, // Tabs "tabs": { @@ -31,7 +61,7 @@ // Helix stuff "helix_mode": true, - "relative_line_numbers": true, + "relative_line_numbers": "enabled", "vertical_scroll_margin": 20, "terminal": { @@ -50,7 +80,8 @@ "astro-language-server", "biome", "tailwindcss-language-server", - "!prettier" + "!prettier", + "!tsgo" ], "formatter": [ { @@ -77,7 +108,14 @@ "language_servers": ["prisma-language-server"] }, "JSON": { - "language_servers": ["vtsls", "biome", "!prettier", "..."], + "language_servers": [ + "vtsls", + "biome", + "!prettier", + "!vtsls", + "!typescript-language-server", + "..." + ], "formatter": [ { "code_action": "source.fixAll.biome" @@ -90,7 +128,14 @@ ] }, "JSONC": { - "language_servers": ["vtsls", "biome", "!prettier", "..."], + "language_servers": [ + "vtsls", + "biome", + "!prettier", + "!vtsls", + "!typescript-language-server", + "..." + ], "formatter": [ { "code_action": "source.fixAll.biome" @@ -109,6 +154,7 @@ "tailwindcss-language-server", "!eslint", "!prettier", + "!vtsls", "!typescript-language-server", "..." ], @@ -133,6 +179,7 @@ "tailwindcss-language-server", "!eslint", "!prettier", + "!vtsls", "!typescript-language-server", "..." ], @@ -151,16 +198,13 @@ ] }, "TypeScript": { - "inlay_hints": { - "enabled": true, - "show_type_hints": false - }, "language_servers": [ "vtsls", "biome", "tailwindcss-language-server", "!eslint", "!prettier", + "!vtsls", "!typescript-language-server", "..." ], @@ -180,21 +224,6 @@ } }, - "lsp": { - "rust-analyzer": { - "initialization_options": { - "checkOnSave": { - "enable": true, - "command": "clippy", - "extraArgs": ["--", "-W", "clippy::all"] - }, - "check": { - "allTargets": true - } - } - } - }, - "file_types": { "JSONC": ["tsconfig*.json"] }