From 327f149a421b699f036f3008a8d48d757a886402 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Sat, 19 Jul 2025 00:08:27 +0200 Subject: [PATCH] helix/languages: drop scls helix master support buffer completion now. --- packages/helix/languages.nix | 56 +++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/packages/helix/languages.nix b/packages/helix/languages.nix index 5283023..5d51dd6 100644 --- a/packages/helix/languages.nix +++ b/packages/helix/languages.nix @@ -17,7 +17,6 @@ nil, ruff, shfmt, - simple-completion-language-server, typescript-language-server, vscode-langservers-extracted, zls, @@ -90,12 +89,6 @@ auto-format = true; language-servers = ["dprint" "typescript-language-server"]; } - { - name = "jjdescription"; - scope = "source.jjdescription"; - file-types = ["jjdescription"]; - language-servers = ["scls"]; - } { name = "json"; formatter = mark "json"; @@ -104,11 +97,11 @@ name = "markdown"; auto-format = true; formatter = mark "md"; - language-servers = ["scls" "taplo"]; + language-servers = ["taplo"]; } { name = "nix"; - language-servers = ["nil" "scls" "deadnix"]; + language-servers = ["nil"]; } { name = "qml"; @@ -172,12 +165,27 @@ }; rust-analyzer = { - config = { + config.rust-analyzer = { + checkOnSave.command = "clippy"; + procMacro.enable = true; + cargo = { + loadOutDirsFromCheck = true; + features = "all"; + }; + assist = { + preferSelf = true; + }; check = { command = "clippy"; extraArgs = ["--" "-W" "clippy::pedantic" "-W" "clippy::nursery" "-W" "clippy::perf"]; }; - cargo.features = "all"; + lens = { + references = true; + methodReferences = true; + }; + completion.autoimport.enable = true; + experimental.procAttrMacros = true; + interpret.tests = true; }; }; @@ -220,26 +228,22 @@ nil = { command = getExe new-nil; # alejandro - config.nil.formatting.command = ["${getExe alejandra}" "-q"]; + config.nil = { + formatting.command = ["${getExe alejandra}" "-q"]; + diagnostics = { + bindingEndHintMinLines = 3; + }; + nix.flake = { + autoArchive = true; + # autoEvalInputs = true; + nixpkgsInputName = "nixpkgs"; + }; + }; }; deadnix = { command = getExe new-deadnix; }; - scls = { - command = getExe simple-completion-language-server; - config = { - max_completion_items = 100; # set max completion results len for each group: words, snippets, unicode-input - feature_words = true; # enable completion by word - feature_snippets = true; # enable snippets - snippets_first = true; # completions will return before snippets by default - snippets_inline_by_word_tail = false; # suggest snippets by WORD tail, for example text `xsq|` become `x^2|` when snippet `sq` has body `^2` - feature_unicode_input = false; # enable "unicode input" - feature_paths = false; # enable path completion - feature_citations = false; # enable citation completion (only on `citation` feature enabled) - }; - }; - typescript-language-server = { command = getExe typescript-language-server; args = ["--stdio"];