diff --git a/config/fish/config.fish b/config/fish/config.fish index 7c411b5..ab4992c 100644 --- a/config/fish/config.fish +++ b/config/fish/config.fish @@ -9,12 +9,12 @@ set -q EDITOR || set -x EDITOR nvim set -q VISUAL || set -x VISUAL nvim set -q MANPAGER || set -x MANPAGER "nvim +Man!" -# prompt -starship init fish | source - # source brew shellenv /opt/homebrew/bin/brew shellenv | source +# prompt +starship init fish | source + # fzf fzf --fish | source diff --git a/config/fish/functions/p.fish b/config/fish/functions/p.fish index aa1cbdd..64d3666 100644 --- a/config/fish/functions/p.fish +++ b/config/fish/functions/p.fish @@ -1,4 +1,4 @@ -function p --wraps='pnpm prisma' --wraps='pnpm nx run db:prisma' --description 'alias p pnpm prisma' - pnpm nx run db:prisma $argv +function p --wraps='pnpm prisma' --description 'alias p pnpm prisma' + pnpm prisma $argv end diff --git a/config/zed/settings.json b/config/zed/settings.json index 2fa1bc1..9297dc3 100644 --- a/config/zed/settings.json +++ b/config/zed/settings.json @@ -1,100 +1,72 @@ { - "language_models": { - "ollama": {} - }, - "base_keymap": "VSCode", - "telemetry": { - "diagnostics": true, - "metrics": true - }, - "relative_line_numbers": true, - "theme": "Ayu Light", - "buffer_font_family": "FiraCode Nerd Font", - "tab_size": 2, - "tabs": { - "file_icons": true - }, - "ui_font_size": 15, - "buffer_font_size": 14, - "vim_mode": true, - "terminal": { - "dock": "right", - "alternate_scroll": "off", - "blinking": "terminal_controlled", - "copy_on_select": false, - "env": { - "EDITOR": "zed --wait" - }, - "font_family": "Liga SFMono Nerd Font", - "font_size": 13, - "option_as_meta": false, - "working_directory": "current_project_directory", - "line_height": "standard" - }, - "features": { - "inline_completion_provider": "supermaven" - }, - "languages": { - "JavaScript": { - "language_servers": ["biome", "!eslint", "!prettier"] - }, - "JSONC": { - "language_servers": [ - "json-language-server", - "biome", - "!eslint", - "!prettier" - ] - }, - "JSON": { - "language_servers": [ - "json-language-server", - "biome", - "!eslint", - "!prettier" - ] - }, - "Astro": { - "format_on_save": "on", - "language_servers": [ - "astro-language-server", - "vtsls", - "biome", - "!eslint", - "!prettier" - ], - "code_actions_on_format": { - "source.organizeImports.biome": true - } - }, - "TypeScript": { - "format_on_save": "on", - "language_servers": ["vtsls", "biome", "!eslint", "!prettier"], - "code_actions_on_format": { - "source.organizeImports.biome": true - } - }, - "Markdown": { - "soft_wrap": "editor_width" - }, - "TSX": { - "format_on_save": "on", - "language_servers": ["vtsls", "biome", "!eslint", "!prettier"], - "code_actions_on_format": { - "source.organizeImports.biome": true - } - }, - "Prisma": { - "format_on_save": "off", - "language_servers": ["prisma-language-server"] - } - }, - "assistant": { - "default_model": { - "provider": "zed.dev", - "model": "claude-3-5-sonnet-20240620" - }, - "version": "2", - "provider": null - } + "language_models": { + "ollama": {} + }, + "base_keymap": "VSCode", + "telemetry": { + "diagnostics": true, + "metrics": true + }, + "relative_line_numbers": true, + "theme": "Catppuccin Frappé", + "buffer_font_family": "FiraCode Nerd Font", + "tab_size": 2, + "tabs": { + "file_icons": true + }, + "ui_font_size": 15, + "buffer_font_size": 14, + "vim_mode": true, + "terminal": { + "dock": "right", + "alternate_scroll": "off", + "blinking": "terminal_controlled", + "copy_on_select": false, + "env": { + "EDITOR": "zed --wait" + }, + "font_family": "Liga SFMono Nerd Font", + "font_size": 13, + "option_as_meta": false, + "working_directory": "current_project_directory", + "line_height": "standard" + }, + "features": { + "inline_completion_provider": "supermaven" + }, + "languages": { + "TypeScript": { + "language_servers": ["vtsls", "biome"] + }, + "TSX": { + "language_servers": ["vtsls", "biome"] + }, + "Astro": { + "language_servers": ["astro-language-server", "vtsls", "biome"] + }, + "Markdown": { + "soft_wrap": "editor_width" + }, + "Prisma": { + "language_servers": ["prisma-language-server", "biome"] + } + }, + "language_servers": ["biome", "!eslint", "!prettier"], + "formatter": { + "language_server": { + "name": "biome" + } + }, + "code_actions_on_format": { + "source.fixAll.biome": true, + "source.organizeImports.biome": true + }, + "assistant": { + "default_model": { + "provider": "zed.dev", + "model": "claude-3-5-sonnet-20240620" + }, + "version": "2", + "provider": null + } }