fix(helix): update config to new structure

This commit is contained in:
Felix Schröter 2023-11-27 23:00:33 +01:00
parent 59180784c7
commit 9a392c80bb
Signed by: felschr
GPG key ID: 671E39E6744C807D

View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { pkgs, ... }:
{ {
# @TODO for direnv to work needs to be started from project folder # @TODO for direnv to work needs to be started from project folder
@ -6,19 +6,7 @@
enable = true; enable = true;
package = pkgs.unstable.helix; package = pkgs.unstable.helix;
languages.language = [ languages.language = [
{ { name = "rust"; }
name = "rust";
config.rust-analyzer = {
cargo.buildScripts.enable = true;
checkOnSave.command = "clippy";
procMacro.enable = true;
procMacro.ignored = {
# cfg_eval can cause types to be unavailable
core = [ "cfg_eval" ];
cfg_eval = [ "cfg_eval" ];
};
};
}
{ {
name = "nix"; name = "nix";
formatter.command = "nixfmt"; formatter.command = "nixfmt";
@ -28,6 +16,20 @@
formatter.command = "topiary"; formatter.command = "topiary";
} }
]; ];
languages.language_server = {
rust-analyzer = {
config.rust-analyzer = {
cargo.buildScripts.enable = true;
checkOnSave.command = "clippy";
procMacro.enable = true;
procMacro.ignored = {
# See https://github.com/rust-lang/rust-analyzer/issues/15800
# core = [ "cfg_eval" ];
# cfg_eval = [ "cfg_eval" ];
};
};
};
};
settings = { settings = {
theme = "github_dark"; theme = "github_dark";
editor = { editor = {