Merge pull request #49 from NotAShelf/feature/elixir

feat: elixir language support
This commit is contained in:
NotAShelf 2023-04-17 01:51:51 +03:00 committed by GitHub
commit de36937154
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 168 additions and 20 deletions

View file

@ -33,6 +33,7 @@ inputs: let
nvimCodeActionMenu.enable = true; nvimCodeActionMenu.enable = true;
trouble.enable = true; trouble.enable = true;
lspSignature.enable = true; lspSignature.enable = true;
elixir.enable = isMaximal;
rust.enable = isMaximal; rust.enable = isMaximal;
python = isMaximal; python = isMaximal;
clang.enable = isMaximal; clang.enable = isMaximal;

View file

@ -321,6 +321,38 @@
"type": "github" "type": "github"
} }
}, },
"elixir-ls": {
"flake": false,
"locked": {
"lastModified": 1681462421,
"narHash": "sha256-pIwZFiCLJ0f7OXi1iTza04KSn7rpFpvUsNYrFh0FoEM=",
"owner": "elixir-lsp",
"repo": "elixir-ls",
"rev": "85cfc5604edeadb0a6a683c41abff60a0c959de7",
"type": "github"
},
"original": {
"owner": "elixir-lsp",
"repo": "elixir-ls",
"type": "github"
}
},
"elixir-tools": {
"flake": false,
"locked": {
"lastModified": 1681453321,
"narHash": "sha256-7QgWrdq4p5t8WVnFhL5P948JFPR0i2C06kisxl30D2U=",
"owner": "elixir-tools",
"repo": "elixir-tools.nvim",
"rev": "8ccb696c048eca667486ee005f4386c0db8c5e14",
"type": "github"
},
"original": {
"owner": "elixir-tools",
"repo": "elixir-tools.nvim",
"type": "github"
}
},
"fidget-nvim": { "fidget-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -1319,6 +1351,8 @@
"dashboard-nvim": "dashboard-nvim", "dashboard-nvim": "dashboard-nvim",
"diffview-nvim": "diffview-nvim", "diffview-nvim": "diffview-nvim",
"dressing-nvim": "dressing-nvim", "dressing-nvim": "dressing-nvim",
"elixir-ls": "elixir-ls",
"elixir-tools": "elixir-tools",
"fidget-nvim": "fidget-nvim", "fidget-nvim": "fidget-nvim",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",

View file

@ -92,22 +92,27 @@
url = "github:neovim/nvim-lspconfig"; url = "github:neovim/nvim-lspconfig";
flake = false; flake = false;
}; };
lspsaga = { lspsaga = {
url = "github:tami5/lspsaga.nvim"; url = "github:tami5/lspsaga.nvim";
flake = false; flake = false;
}; };
lspkind = { lspkind = {
url = "github:onsails/lspkind-nvim"; url = "github:onsails/lspkind-nvim";
flake = false; flake = false;
}; };
trouble = { trouble = {
url = "github:folke/trouble.nvim"; url = "github:folke/trouble.nvim";
flake = false; flake = false;
}; };
nvim-treesitter-context = { nvim-treesitter-context = {
url = "github:lewis6991/nvim-treesitter-context"; url = "github:lewis6991/nvim-treesitter-context";
flake = false; flake = false;
}; };
nvim-lightbulb = { nvim-lightbulb = {
url = "github:kosayoda/nvim-lightbulb"; url = "github:kosayoda/nvim-lightbulb";
flake = false; flake = false;
@ -117,18 +122,22 @@
url = "github:weilbith/nvim-code-action-menu"; url = "github:weilbith/nvim-code-action-menu";
flake = false; flake = false;
}; };
lsp-signature = { lsp-signature = {
url = "github:ray-x/lsp_signature.nvim"; url = "github:ray-x/lsp_signature.nvim";
flake = false; flake = false;
}; };
null-ls = { null-ls = {
url = "github:jose-elias-alvarez/null-ls.nvim"; url = "github:jose-elias-alvarez/null-ls.nvim";
flake = false; flake = false;
}; };
sqls-nvim = { sqls-nvim = {
url = "github:nanotee/sqls.nvim"; url = "github:nanotee/sqls.nvim";
flake = false; flake = false;
}; };
rust-tools = { rust-tools = {
url = "github:simrat39/rust-tools.nvim"; url = "github:simrat39/rust-tools.nvim";
flake = false; flake = false;
@ -139,6 +148,16 @@
flake = false; flake = false;
}; };
elixir-ls = {
url = "github:elixir-lsp/elixir-ls";
flake = false;
};
elixir-tools = {
url = "github:elixir-tools/elixir-tools.nvim";
flake = false;
};
# Copying/Registers # Copying/Registers
registers = { registers = {
url = "github:tversteeg/registers.nvim"; url = "github:tversteeg/registers.nvim";

View file

@ -79,6 +79,8 @@ with lib; let
"vim-repeat" "vim-repeat"
"smartcolumn" "smartcolumn"
"project-nvim" "project-nvim"
"elixir-ls"
"elixir-tools"
]; ];
# You can either use the name of the plugin or a package. # You can either use the name of the plugin or a package.
pluginsType = with types; pluginsType = with types;

View file

@ -19,25 +19,20 @@ in {
[ [
"nvim-lspconfig" "nvim-lspconfig"
"null-ls" "null-ls"
(
if (config.vim.autocomplete.enable && (config.vim.autocomplete.type == "nvim-cmp"))
then "cmp-nvim-lsp"
else null
)
(
if cfg.sql
then "sqls-nvim"
else null
)
] ]
++ ( ++ optionals (cfg.rust.enable) [
if cfg.rust.enable "crates-nvim"
then [ "rust-tools"
"crates-nvim" ]
"rust-tools" ++ optionals (cfg.elixir.enable) [
] "elixir-ls"
else [] ]
); ++ optionals ((config.vim.autocomplete.enable) && (config.vim.autocomplete.type == "nvim-cmp")) [
"cmp-nvim-lsp"
]
++ optionals (cfg.sql) [
"sqls-nvim"
];
vim.configRC.lsp = nvim.dag.entryAnywhere '' vim.configRC.lsp = nvim.dag.entryAnywhere ''
${ ${
@ -346,6 +341,13 @@ in {
cmd = { "${pkgs.nodePackages.typescript-language-server}/bin/typescript-language-server", "--stdio" } cmd = { "${pkgs.nodePackages.typescript-language-server}/bin/typescript-language-server", "--stdio" }
} }
''} ''}
${writeIf cfg.elixir.enable ''
lspconfig.elixirls.setup {
cmd = { "${lib.getExe pkgs.elixir-ls}" },
on_attach = on_attach
}
''}
''; '';
} }
); );

View file

@ -11,7 +11,8 @@
./lsp-signature ./lsp-signature
./lightbulb ./lightbulb
# flutter-tools # language specific modules
./flutter-tools-nvim ./flutter-tools-nvim # dart & flutter
./elixir # elixir
]; ];
} }

View file

@ -0,0 +1,67 @@
{
config,
lib,
pkgs,
...
}:
with lib;
with builtins; let
cfg = config.vim.lsp.elixir;
in {
config = mkIf (cfg.enable) {
vim.startPlugins = [
"elixir-tools"
"plenary-nvim"
];
vim.luaConfigRC.elixir-tools = nvim.dag.entryAnywhere ''
local elixir = require("elixir")
local elixirls = require("elixir.elixirls")
elixir.setup {
elixirls = {
-- alternatively, point to an existing elixir-ls installation (optional)
-- not currently supported by elixirls, but can be a table if you wish to pass other args `{"path/to/elixirls", "--foo"}`
cmd = "${lib.getExe pkgs.elixir-ls}",
-- default settings, use the `settings` function to override settings
settings = elixirls.settings {
dialyzerEnabled = true,
fetchDeps = false,
enableTestLenses = false,
suggestSpecs = false,
},
on_attach = function(client, bufnr)
local map_opts = { buffer = true, noremap = true}
-- run the codelens under the cursor
vim.keymap.set("n", "<space>r", vim.lsp.codelens.run, map_opts)
-- remove the pipe operator
vim.keymap.set("n", "<space>fp", ":ElixirFromPipe<cr>", map_opts)
-- add the pipe operator
vim.keymap.set("n", "<space>tp", ":ElixirToPipe<cr>", map_opts)
vim.keymap.set("v", "<space>em", ":ElixirExpandMacro<cr>", map_opts)
-- bindings for standard LSP functions.
vim.keymap.set("n", "<space>df", "<cmd>lua vim.lsp.buf.format()<cr>", map_opts)
vim.keymap.set("n", "<space>gd", "<cmd>lua vim.diagnostic.open_float()<cr>", map_opts)
vim.keymap.set("n", "<space>dt", "<cmd>lua vim.lsp.buf.definition()<cr>", map_opts)
vim.keymap.set("n", "<space>K", "<cmd>lua vim.lsp.buf.hover()<cr>", map_opts)
vim.keymap.set("n", "<space>gD","<cmd>lua vim.lsp.buf.implementation()<cr>", map_opts)
vim.keymap.set("n", "<space>1gD","<cmd>lua vim.lsp.buf.type_definition()<cr>", map_opts)
-- keybinds for fzf-lsp.nvim: https://github.com/gfanto/fzf-lsp.nvim
-- you could also use telescope.nvim: https://github.com/nvim-telescope/telescope.nvim
-- there are also core vim.lsp functions that put the same data in the loclist
vim.keymap.set("n", "<space>gr", ":References<cr>", map_opts)
vim.keymap.set("n", "<space>g0", ":DocumentSymbols<cr>", map_opts)
vim.keymap.set("n", "<space>gW", ":WorkspaceSymbols<cr>", map_opts)
vim.keymap.set("n", "<leader>d", ":Diagnostics<cr>", map_opts)
end
}
}
'';
};
}

View file

@ -0,0 +1,6 @@
_: {
imports = [
./config.nix
./elixir-tools.nix
];
}

View file

@ -0,0 +1,10 @@
{
config,
lib,
...
}:
with lib;
with builtins; {
options.vim.lsp.elixir = {
};
}

View file

@ -65,6 +65,10 @@ in {
}; };
}; };
elixir = {
enable = mkEnableOption "Elixir LSP";
};
sql = mkEnableOption "SQL Language LSP"; sql = mkEnableOption "SQL Language LSP";
go = mkEnableOption "Go language LSP"; go = mkEnableOption "Go language LSP";
ts = mkEnableOption "TS language LSP"; ts = mkEnableOption "TS language LSP";

View file

@ -45,6 +45,8 @@ with builtins; {
graphql graphql
json json
zig zig
elixir
heex
] ]
++ (optional config.vim.notes.orgmode.enable org); # add orgmode grammar if enabled ++ (optional config.vim.notes.orgmode.enable org); # add orgmode grammar if enabled
description = '' description = ''