From ac9eb1d8881270b308ed04dcfbe22bdf44f9a3e6 Mon Sep 17 00:00:00 2001 From: Christian van der Loo Date: Thu, 28 Nov 2024 15:41:48 -0500 Subject: [PATCH] switch to dark mode & fish shell for cmd --- config/zed/settings.json | 196 +++++++++++++++++++++++++-------------- config/zed/tasks.json | 66 ++++++------- 2 files changed, 157 insertions(+), 105 deletions(-) diff --git a/config/zed/settings.json b/config/zed/settings.json index 7a85499..0bd9e93 100644 --- a/config/zed/settings.json +++ b/config/zed/settings.json @@ -1,74 +1,126 @@ { - "base_keymap": "VSCode", - "telemetry": { - "diagnostics": true, - "metrics": true - }, - "theme": { - "mode": "system", - "light": "Catppuccin Latte", - "dark": "Catppuccin Mocha" - }, - "relative_line_numbers": true, - "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" - }, - "languages": { - "JavaScript": { - "formatter": { - "language_server": { - "name": "biome" - } - } - }, - "TSX": { - "formatter": { - "language_server": { - "name": "biome" - } - } - }, - "TypeScript": { - "formatter": { - "language_server": { - "name": "biome" - } - } - } - }, - "language_servers": ["biome", "!eslint", "!prettier"], - "code_actions_on_format": { - "source.fixAll.biome": true, - "source.organizeImports.biome": true - }, - "features": { - "inline_completion_provider": "supermaven" - }, - "assistant": { - "default_model": { - "provider": "zed.dev", - "model": "claude-3-5-sonnet-20240620" - }, - "version": "2", - "provider": null - } + "base_keymap": "VSCode", + "telemetry": { + "diagnostics": true, + "metrics": true + }, + "theme": { + "mode": "dark", + "light": "Catppuccin Latte", + "dark": "Catppuccin Mocha" + }, + "relative_line_numbers": true, + "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", + "VISUAL": "zed --wait", + "MANPAGER": "zed --wait +Man!" + }, + "font_family": "Liga SFMono Nerd Font", + "font_size": 13, + "option_as_meta": false, + "working_directory": "current_project_directory", + "line_height": "standard" + }, + "languages": { + "Astro": { + "language_servers": [ + "astro-language-server", + "biome", + "tailwindcss-language-server", + "..." + ], + "prettier": { + "allowed": false + } + }, + "JavaScript": { + "language_servers": [ + "!typescript-language-server", + "vtsls", + "biome", + "..." + ], + "prettier": { + "allowed": false + } + }, + "JSON": { + "language_servers": ["biome", "..."], + "prettier": { + "allowed": false + } + }, + "JSONC": { + "language_servers": ["biome", "..."], + "prettier": { + "allowed": false + } + }, + "Prisma": { + "formatter": { + "language_server": { + "name": "prisma-language-server" + } + }, + "language_servers": ["prisma-language-server", "!biome"] + }, + "TSX": { + "language_servers": [ + "!typescript-language-server", + "vtsls", + "biome", + "tailwindcss-language-server", + "..." + ], + "prettier": { + "allowed": false + } + }, + "TypeScript": { + "language_servers": [ + "!typescript-language-server", + "vtsls", + "biome", + "tailwindcss-language-server", + "..." + ], + "prettier": { + "allowed": false + } + } + }, + "formatter": { + "language_server": { + "name": "biome" + } + }, + "language_servers": ["!typescript-language-server", "!eslint", "!prettier"], + "code_actions_on_format": { + "source.fixAll.biome": true, + "source.organizeImports.biome": true + }, + "features": { + "inline_completion_provider": "supermaven" + }, + "assistant": { + "default_model": { + "provider": "zed.dev", + "model": "claude-3-5-sonnet-latest" + }, + "version": "2", + "provider": null + } } diff --git a/config/zed/tasks.json b/config/zed/tasks.json index 51db5b3..ac83d8e 100644 --- a/config/zed/tasks.json +++ b/config/zed/tasks.json @@ -1,35 +1,35 @@ [ - { - "label": "Lazygit", - "command": "lazygit", - "args": [], - "env": {}, - "use_new_terminal": false, - "allow_concurrent_runs": false - }, - { - "label": "Lazydocker", - "command": "lazydocker", - "args": [], - "env": {}, - "use_new_terminal": false, - "allow_concurrent_runs": false - }, - { - "label": "k9s", - "command": "aws sts get-caller-identity &> /dev/null; if [ $? = 0 ]; then k9s; else aws sso login && k9s; fi", - "args": [], - "env": {}, - "use_new_terminal": false, - "allow_concurrent_runs": false - }, - { - "label": "Format Prisma", - "command": "npx prisma format", - "args": [], - "reveal": "never", - "use_new_terminal": false, - "allow_concurrent_runs": false, - "shell": "system" - } + { + "label": "Lazygit", + "command": "lazygit", + "args": [], + "env": {}, + "use_new_terminal": false, + "allow_concurrent_runs": false + }, + { + "label": "Lazydocker", + "command": "lazydocker", + "args": [], + "env": {}, + "use_new_terminal": false, + "allow_concurrent_runs": false + }, + { + "label": "k9s", + "command": "aws sts get-caller-identity &> /dev/null; if test $status -eq 0; k9s; else; aws sso login && k9s; end", + "args": [], + "env": {}, + "use_new_terminal": false, + "allow_concurrent_runs": false + }, + { + "label": "Format Prisma", + "command": "npx prisma format", + "args": [], + "reveal": "never", + "use_new_terminal": false, + "allow_concurrent_runs": false, + "shell": "system" + } ] -- 2.51.2