From 9c60b5872cef84349a0c713483f456b8e13440c0 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Fri, 17 Jan 2025 14:35:18 +0800 Subject: [PATCH] wrap helix with lsp and formatter, and add some config for helix --- flake.nix | 4 +- home/modules/helix/default.nix | 148 ++++++++++++++++++--- nixos/configurations/Tytonidae/default.nix | 2 - overlays/modifications/helix.nix | 7 +- pkgs/default.nix | 1 + pkgs/helix.nix | 42 ++++++ 6 files changed, 176 insertions(+), 28 deletions(-) create mode 100644 pkgs/helix.nix diff --git a/flake.nix b/flake.nix index 1acb65a..810f9ef 100644 --- a/flake.nix +++ b/flake.nix @@ -122,8 +122,8 @@ nixosModules.default = import ./nixos/modules; overlays = { - modifications = (import ./overlays/modifications { inherit inputs; }); - additions = (import ./overlays/additions { inherit inputs; }); + modifications = (import ./overlays/modifications { inherit inputs outputs; }); + additions = (import ./overlays/additions { inherit inputs outputs; }); }; nixosConfigurations = diff --git a/home/modules/helix/default.nix b/home/modules/helix/default.nix index d6e5203..a27c774 100644 --- a/home/modules/helix/default.nix +++ b/home/modules/helix/default.nix @@ -17,14 +17,7 @@ }; extraPackages = lib.mkOption { type = lib.types.listOf lib.types.package; - default = with pkgs; [ - taplo - markdown-oxide - nixd - deno - nixfmt-rfc-style - nodePackages_latest.vscode-json-languageserver - ]; + default = [ ]; example = ( with pkgs; [ @@ -53,20 +46,131 @@ config; languages = { language-server = { - vscode-json-languageserver = { - command = "vscode-json-languageserver"; - args = [ "--stdio" ]; - config = { - provideFormatter = true; - json = { - validate = { - enable = true; - }; - }; - }; + fish-lsp = { + command = "fish-lsp"; + args = [ + "start" + ]; }; }; language = [ + { + name = "nix"; + formatter = { + command = "nixfmt"; + args = [ "-" ]; + }; + } + { + name = "xml"; + formatter = { + command = "xmllint"; + args = [ + "--format" + "-" + ]; + }; + } + { + name = "typst"; + formatter = { + command = "typstyle"; + }; + } + { + name = "c"; + formatter = { + command = "clang-format"; + }; + } + { + name = "cpp"; + formatter = { + command = "clang-format"; + }; + } + { + name = "python"; + formatter = { + command = "ruff"; + args = [ + "format" + "-s" + "--line-length" + "88" + "-" + ]; + }; + language-servers = [ + "pyright" + "ruff" + ]; + } + { + name = "go"; + formatter = { + command = "goimports"; + }; + } + { + name = "awk"; + formatter = { + command = "awk"; + timeout = 5; + args = [ + "--file=/dev/stdin" + "--pretty-print=/dev/stdout" + ]; + }; + } + { + name = "fish"; + language-servers = [ + "fish-lsp" + ]; + } + { + name = "yaml"; + formatter = { + command = "deno"; + args = [ + "fmt" + "-" + "--ext" + "yaml" + ]; + }; + } + { + name = "html"; + formatter = { + command = "deno"; + args = [ + "fmt" + "-" + "--ext" + "html" + ]; + }; + language-servers = [ + "vscode-html-language-server" + ]; + } + { + name = "css"; + formatter = { + command = "deno"; + args = [ + "fmt" + "-" + "--ext" + "css" + ]; + }; + language-servers = [ + "vscode-css-language-server" + ]; + } { name = "toml"; formatter = { @@ -92,7 +196,7 @@ { name = "json"; language-servers = [ - "vscode-json-languageserver" + "vscode-json-language-server" ]; formatter = { command = "deno"; @@ -107,7 +211,7 @@ { name = "jsonc"; language-servers = [ - "vscode-json-languageserver" + "vscode-json-language-server" ]; formatter = { command = "deno"; @@ -122,6 +226,6 @@ ]; }; }; - home.packages = cfg.extraPackages; + # home.packages = cfg.extraPackages; }; } diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index 5d4eb86..168f01f 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -58,8 +58,6 @@ git vim helix - nixd - nixfmt-rfc-style element-desktop discord-ptb diff --git a/overlays/modifications/helix.nix b/overlays/modifications/helix.nix index 21756b5..340c16e 100644 --- a/overlays/modifications/helix.nix +++ b/overlays/modifications/helix.nix @@ -1,9 +1,12 @@ -{ inputs, ... }: +{ + outputs, + ... +}: final: prev: let inherit (final) stdenv; inherit (stdenv.hostPlatform) system; in { - helix = inputs.helix.packages."${system}".default; + helix = outputs.packages."${system}".helix; } diff --git a/pkgs/default.nix b/pkgs/default.nix index 5347e18..465544b 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -5,6 +5,7 @@ }: { pinentry-selector = pkgs.callPackage ./pinentry-selector.nix { }; + helix = pkgs.callPackage ./helix.nix { inherit inputs; }; } // ( let diff --git a/pkgs/helix.nix b/pkgs/helix.nix new file mode 100644 index 0000000..183e104 --- /dev/null +++ b/pkgs/helix.nix @@ -0,0 +1,42 @@ +{ + lib, + pkgs, + inputs, + ... +}: +pkgs.runCommand "helix-wrapped" + { + buildInputs = [ pkgs.makeWrapper ]; + } + '' + mkdir -p $out/bin + makeWrapper "${lib.getExe inputs.helix.packages."${pkgs.system}".default}" $out/bin/hx \ + --prefix PATH : ${ + lib.makeBinPath ( + with pkgs; + [ + clang-tools + libxml2 + typstyle + pyright + ruff + gotools + yaml-language-server + taplo + markdown-oxide + nixd + deno + nixfmt-rfc-style + vscode-langservers-extracted + fish-lsp + gopls + golangci-lint-langserver + tinymist + delve + lldb + rust-analyzer + nil + ] + ) + } + ''