From 5722f7390720b031222724b95dc5cd4327751fdf Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 20 Mar 2025 15:51:12 +0100 Subject: [PATCH] llkjdsaljkdsalkj --- keymap.json | 15 ++++++++++++--- settings.json | 19 ++++++++++++++++++- snippets/shell script.json | 5 +++++ 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/keymap.json b/keymap.json index 4aa8ab7..4b98520 100644 --- a/keymap.json +++ b/keymap.json @@ -49,6 +49,15 @@ "ctrl-e": "project_panel::ToggleFocus" } }, + // { + // // TODO + // "context": "Editor && multibuffer", + // "bindings": { + // // "ctrl-k ctrl-1": ["editor::FoldAtLevel", 0], + // "ctrl-k ctrl-1": "editor::FoldAll", + // "ctrl-k ctrl-0": "editor::UnfoldAll" + // } + // }, { "context": "Editor && mode == full", "bindings": { @@ -85,10 +94,10 @@ "ctrl-'": ["editor::ToggleComments", { "advance_downwards": false }], - "ctrl-r": "editor::ToggleLineNumbers", + "ctrl-r": "editor::ToggleLineNumbers" - "alt-pageup": ["workspace::ActivatePaneInDirection", "Left"], - "alt-pagedown": ["workspace::ActivatePaneInDirection", "Right"] + // "alt-pageup": ["workspace::ActivatePaneInDirection", "Left"], + // "alt-pagedown": ["workspace::ActivatePaneInDirection", "Right"] } }, { diff --git a/settings.json b/settings.json index 52c2b0f..d75b3cf 100644 --- a/settings.json +++ b/settings.json @@ -38,7 +38,8 @@ "calt": false // disable ligatures // "font_family": "Cousine" }, - "seed_search_query_from_cursor": "selection", + "use_system_path_prompts": false, // ctrl-o becomes way better, works remotely + "seed_search_query_from_cursor": "selection", // makes ctrl-f sane "vertical_scroll_margin": 5, "wrap_guides": [80], "tabs": { @@ -94,6 +95,7 @@ "toml": true, "typos": true, "typst": true, + "vale": true, "verilog": true, "vhdl": true }, @@ -106,8 +108,13 @@ "Nix": { "tab_size": 2, "format_on_save": "off" + }, + "TOML": { + // TODO: fix lsp config in zed + "format_on_save": "off" } }, + // https://zed.dev/docs/configuring-zed#lsp "lsp": { // "pyright": { "enabled": false }, // "basedpyright": { "enabled": false }, @@ -139,6 +146,15 @@ "path": "typos-lsp" } }, + "taplo": { + // https://taplo.tamasfe.dev/configuration/formatter-options.html + // TODO: this causes error? + "settings": { + // "formatting": { + "align_comments": false + // } + } + }, "nil": { "initialization_options": { "formatting": { "command": ["nixfmt"] } @@ -164,6 +180,7 @@ } }, "file_types": { + "Shell Script": [".env.*", ".envrc"], "CMake": ["CMakeLists.txt"] } } diff --git a/snippets/shell script.json b/snippets/shell script.json index 1e68481..bec73ae 100644 --- a/snippets/shell script.json +++ b/snippets/shell script.json @@ -20,6 +20,11 @@ "body": "if ${2:[[ $1 ]]}; then\n\t$0\nfi", "description": "Bash snippet 'if'" }, + "elif": { + "prefix": "elif", + "body": "elif ${2:[[ $1 ]]}; then$0", + "description": "Bash snippet 'elif'" + }, "while": { "prefix": "while", "body": "while read ${1:line}; do\n\t$2\ndone$0",