shimun/nvim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(nvim): various lsps

Browse Source
This commit is contained in:
u2515h
2024-01-25 20:22:20 +01:00
parent d7e30ca465
commit 499892baac
3 changed files with 123 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
completion.lua
View File

@@ -109,3 +109,12 @@ lspconfig.clangd.setup({cmd = {(deps["clang-tools_path"] .. "/bin/clangd")}})
lspconfig.bashls.setup({ lspconfig.bashls.setup({
cmd = {(deps["bash-language-server_path"] .. "/bin/bash-language-server")} cmd = {(deps["bash-language-server_path"] .. "/bin/bash-language-server")}
}) })
lspconfig.pylsp.setup({
cmd = { (deps["python-lsp-server_path"] .. "/bin/pylsp") },
})
lspconfig.lua_ls.setup({
cmd = { (deps["lua-lsp_path"] .. "/bin/lua-lsp") },
})
lspconfig.yamlls.setup({
cmd = { (deps["yaml-language-server_path"] .. "/bin/yaml-language-server"), "--stdio" },
})

178
default.nix
View File

@@ -1,7 +1,18 @@
{ config, pkgs, lib, ... }: with lib; let {
rust-analyzer = if (pkgs ? rust-analyzer-nightly && config.class ? dev) then pkgs.rust-analyzer-nightly else pkgs.rust-analyzer; config,
rust-sdk = with pkgs; if config.class ? dev then pkgs,
symlinkJoin lib,
...
}:
with lib; let
rust-analyzer =
if (pkgs ? rust-analyzer-nightly && config.class ? dev)
then pkgs.rust-analyzer-nightly
else pkgs.rust-analyzer;
rust-sdk = with pkgs;
if config.class ? dev
then
symlinkJoin
{ {
name = "nvim-fenix"; name = "nvim-fenix";
paths = [ paths = [
@@ -15,16 +26,19 @@
]) ])
cargo-watch cargo-watch
]; ];
} else symlinkJoin { name = "nvim-rust"; paths = [ rustc cargo rustfmt clippy cargo-watch ]; }; }
in else
{ symlinkJoin {
name = "nvim-rust";
paths = [rustc cargo rustfmt clippy cargo-watch];
};
in {
programs.neovim = { programs.neovim = {
# https://github.com/nix-community/home-manager/blob/master/modules/programs/neovim.nix # https://github.com/nix-community/home-manager/blob/master/modules/programs/neovim.nix
enable = true; enable = true;
vimAlias = true; vimAlias = true;
withNodeJs = true; withNodeJs = true;
extraPackages = with pkgs; [ fzf xclip fish ]; extraPackages = with pkgs; [fzf xclip fish];
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [
vim-fugitive vim-fugitive
git-blame-nvim git-blame-nvim
@@ -58,7 +72,11 @@ in
cmp-calc cmp-calc
cmp-cmdline cmp-cmdline
rustaceanvim rustaceanvim
(if config.programs.neovim.package.version == "0.10.0" then throw "lsp-inlayhints-nvim may be removed" else lsp-inlayhints-nvim) # https://github.com/mrcjkb/rustaceanvim/discussions/46#discussioncomment-7620822 (
if config.programs.neovim.package.version == "0.10.0"
then throw "lsp-inlayhints-nvim may be removed"
else lsp-inlayhints-nvim
) # https://github.com/mrcjkb/rustaceanvim/discussions/46#discussioncomment-7620822
plenary-nvim plenary-nvim
crates-nvim crates-nvim
nvim-lspconfig nvim-lspconfig
@@ -66,59 +84,87 @@ in
telescope-undo-nvim telescope-undo-nvim
oil-nvim oil-nvim
]; ];
extraLuaConfig = extraLuaConfig = let
let # tries to compute a package set required to make package resolution in lua
# tries to compute a package set required to make package resolution in lua # via deps["pkg"] work
# via deps["pkg"] work inherit (builtins) head tail hasAttr getAttr;
packages = file: pkg = parts: pkgs: let
let rem = tail parts;
out = builtins.readFile (pkgs.runCommandLocal "extract-deps" subset =
{ nativeBuildInputs = [ pkgs.gnused ]; __contentAddressed = true; } '' if hasAttr (head parts) pkgs
sed -nr 's/.*(deps\["(.*)_path"\]).*/\2/p' ${file} | uniq > $out then getAttr (head parts) pkgs
''); else throw "no attr ${name}";
names = lib.splitString "\n" out; in
in if rem == []
filter (name: name != "") names; then subset
paths = (listToAttrs (map (name: { inherit name; value = builtins.getAttr name pkgs; }) (packages "${confDir}/*.lua"))) // { else builtins.addErrorContext "${concatStringsSep "." parts}" (pkg rem subset);
getPkg = name: let parts = builtins.split "\\." name; in pkg parts pkgs;
packages = file: let
out = builtins.readFile (pkgs.runCommandLocal "extract-deps"
{
nativeBuildInputs = [pkgs.gnused];
__contentAddressed = true;
} ''
sed -nr 's/.*(deps\["(.*)_path"\]).*/\2/p' ${file} | uniq > $out
'');
names = lib.splitString "\n" out;
in
filter (name: name != "") names;
paths =
(listToAttrs (map
(name: {
inherit name;
value = getPkg name;
})
(packages "${confDir}/*.lua")))
// {
lldb = pkgs.lldb; lldb = pkgs.lldb;
rust_analyzer = rust-analyzer; rust_analyzer = rust-analyzer;
typst_lsp = pkgs.typst-lsp; typst_lsp = pkgs.typst-lsp;
inherit (pkgs.python3Packages) python-lsp-server;
inherit (pkgs.luajitPackages) lua-lsp;
inherit (pkgs.nodePackages) typescript-language-server bash-language-server; inherit (pkgs.nodePackages) typescript-language-server bash-language-server;
}; };
pathsLua = pkgs.writeTextFile { pathsLua = pkgs.writeTextFile {
name = "nvim-deps.lua"; name = "nvim-deps.lua";
text = '' text = ''
deps = {} deps = {}
${concatStringsSep "\n " (mapAttrsToList (name: path: ''deps["${name}_path"] = "${path}"'') paths)} ${concatStringsSep "\n " (mapAttrsToList (name: path: ''deps["${name}_path"] = "${path}"'') paths)}
return deps return deps
''; '';
}; };
confDir = lib.sourceFilesBySuffices ./. [ "lua" "vim" ]; confDir = lib.sourceFilesBySuffices ./. ["lua" "vim"];
in in
with lib; '' with lib; ''
vim.cmd [[source ${confDir}/init.vim]] vim.cmd [[source ${confDir}/init.vim]]
package.path = package.path .. ";${confDir}/?.lua;${pathsLua};" package.path = package.path .. ";${confDir}/?.lua;${pathsLua};"
dofile("${confDir}/init.lua") dofile("${confDir}/init.lua")
''; '';
}; };
programs.git.ignores = [ ".nvim_session" ]; programs.git.ignores = [".nvim_session"];
xdg.configFile."nvim/coc-settings.json".text = xdg.configFile."nvim/coc-settings.json".text = let
let preferProjectEnv = binName: alternate:
preferProjectEnv = binName: alternate: pkgs.writeShellScript "${binName}-switcher" '' pkgs.writeShellScript "${binName}-switcher" ''
if command -v ${binName}; then if command -v ${binName}; then
${binName} ''${@} ${binName} ''${@}
else else
${alternate} ''${@} ${alternate} ''${@}
fi fi
''; '';
addSDK = { name, lsp, sdk }: with pkgs; runCommandLocal name addSDK = {
name,
lsp,
sdk,
}:
with pkgs;
runCommandLocal name
{ {
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [makeWrapper];
} '' } ''
makeWrapper ${lsp} $out \ makeWrapper ${lsp} $out \
--prefix PATH : ${lib.makeBinPath sdk} --prefix PATH : ${lib.makeBinPath sdk}
''; '';
in in
builtins.toJSON { builtins.toJSON {
python = { python = {
pythonPath = preferProjectEnv "python3" (pkgs.python3 + "/bin/python3"); pythonPath = preferProjectEnv "python3" (pkgs.python3 + "/bin/python3");
@@ -140,67 +186,69 @@ in
fullFunctionSignatures.enable = true; # https://github.com/rust-lang/rust-analyzer/pull/15582 fullFunctionSignatures.enable = true; # https://github.com/rust-lang/rust-analyzer/pull/15582
snippets = { snippets = {
"return Err(..)" = { "return Err(..)" = {
postfix = [ "reterr" ]; postfix = ["reterr"];
body = ''return Err($${receiver});''; body = ''return Err($${receiver});'';
description = "return expression as Err"; description = "return expression as Err";
scope = "expr"; scope = "expr";
}; };
"format!(..)" = { "format!(..)" = {
postfix = [ "fmt" ]; postfix = ["fmt"];
body = ''format!($${receiver})''; body = ''format!($${receiver})'';
description = "use receiver as format string"; description = "use receiver as format string";
scope = "expr"; scope = "expr";
}; };
"wrap { .. }" = { "wrap { .. }" = {
postfix = [ "brace" "wrap" ]; postfix = ["brace" "wrap"];
body = ''{$${receiver}}''; body = ''{$${receiver}}'';
description = "wrap this type in { .. }"; description = "wrap this type in { .. }";
scope = "expr"; scope = "expr";
}; };
"async move { .. }" = { "async move { .. }" = {
postfix = [ "asyncm" ]; postfix = ["asyncm"];
body = ''async move {$${receiver}}''; body = ''async move {$${receiver}}'';
description = "wrap this type in async move { .. }"; description = "wrap this type in async move { .. }";
scope = "expr"; scope = "expr";
}; };
"try { .. }" = { "try { .. }" = {
postfix = [ "try" ]; postfix = ["try"];
body = ''let result: Result<_,_> = try {$${receiver}};''; body = ''let result: Result<_,_> = try {$${receiver}};'';
description = "wrap this type in try { .. }"; description = "wrap this type in try { .. }";
scope = "expr"; scope = "expr";
}; };
"while let Some(item) = { .. } {}" = { "while let Some(item) = { .. } {}" = {
postfix = [ "letwhile" ]; postfix = ["letwhile"];
body = ''while let Some(item) = $${receiver} {}''; body = ''while let Some(item) = $${receiver} {}'';
description = "wrap this type in while let Some"; description = "wrap this type in while let Some";
scope = "expr"; scope = "expr";
}; };
"let $x = $x.clone()" = { "let $x = $x.clone()" = {
postfix = [ "cloned" ]; postfix = ["cloned"];
body = ''let $${receiver} = $${receiver}.clone();''; body = ''let $${receiver} = $${receiver}.clone();'';
description = "clone a variable into a new binding"; description = "clone a variable into a new binding";
scope = "expr"; scope = "expr";
}; };
"let $x = $x.into()" = { "let $x = $x.into()" = {
postfix = [ "into" ]; postfix = ["into"];
body = ''let $${receiver} = $${receiver}.clone();''; body = ''let $${receiver} = $${receiver}.clone();'';
description = "call into() and create a new binding"; description = "call into() and create a new binding";
scope = "expr"; scope = "expr";
}; };
"assert_eq!($x, .. );" = { "assert_eq!($x, .. );" = {
postfix = [ "asseq" ]; postfix = ["asseq"];
body = ''assert_eq!($${receiver}, );''; body = ''assert_eq!($${receiver}, );'';
description = "create an assertion for the expression"; description = "create an assertion for the expression";
scope = "expr"; scope = "expr";
}; };
}; };
}; };
procMacro = { enable = true; attributes.enable = true; }; procMacro = {
enable = true;
attributes.enable = true;
};
serverPath = addSDK { serverPath = addSDK {
name = "rust-env"; name = "rust-env";
lsp = "${rust-analyzer}/bin/rust-analyzer"; lsp = "${rust-analyzer}/bin/rust-analyzer";
sdk = [ rust-sdk ]; sdk = [rust-sdk];
}; };
imports.group.enable = true; imports.group.enable = true;
inlayHints = { inlayHints = {
@@ -223,7 +271,7 @@ in
enable = true; enable = true;
experimental.enable = true; experimental.enable = true;
}; };
files.excludeDirs = [ "result" "target" ]; files.excludeDirs = ["result" "target"];
extraEnv = { extraEnv = {
RA_LOG = "debug"; RA_LOG = "debug";
}; };
@@ -231,14 +279,14 @@ in
languageserver = { languageserver = {
ccls = { ccls = {
command = preferProjectEnv "ccls" "${pkgs.ccls}/bin/ccls"; command = preferProjectEnv "ccls" "${pkgs.ccls}/bin/ccls";
filetypes = [ "c" "cc" "cpp" "c++" "objc" "objcpp" ]; filetypes = ["c" "cc" "cpp" "c++" "objc" "objcpp"];
rootPatterns = [ ".ccls" "compile_commands.json" ".git/" ".hg/" ]; rootPatterns = [".ccls" "compile_commands.json" ".git/" ".hg/"];
initializationOptions = { initializationOptions = {
cache = { cache = {
directory = "${config.xdg.cacheHome}/ccls"; directory = "${config.xdg.cacheHome}/ccls";
}; };
}; };
clang.extraOptions = [ "-std=c++20" ]; clang.extraOptions = ["-std=c++20"];
}; };
nix = { nix = {
command = "${pkgs.nil}/bin/nil"; command = "${pkgs.nil}/bin/nil";
@@ -248,15 +296,15 @@ in
autoEvalInputs = true; autoEvalInputs = true;
}; };
maxMemoryMB = 1024 * 4; maxMemoryMB = 1024 * 4;
rootPatterns = [ "flake.nix" ]; rootPatterns = ["flake.nix"];
filetypes = [ "nix" ]; filetypes = ["nix"];
}; };
diagnostic-languageserver = { diagnostic-languageserver = {
filetypes = { filetypes = {
sh = [ "${pkgs.shellcheck}/bin/shellcheck" ]; sh = ["${pkgs.shellcheck}/bin/shellcheck"];
}; };
}; };
cSpell = { diagnosticLevel = "hint"; }; cSpell = {diagnosticLevel = "hint";};
}; };
}; };
home.sessionVariables = rec { home.sessionVariables = rec {

1
init.lua
View File

@@ -239,3 +239,4 @@ lspconfig.nil_ls.setup {
require("lsp-inlayhints").setup() require("lsp-inlayhints").setup()
require("completion") require("completion")
require("rust")