raf/neovim-flake
1
0
Fork 0
mirror of https://github.com/NotAShelf/neovim-flake.git synced 2024-12-19 10:59:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #233 from FrothyMarrow/fix-lua-highlighting

Browse source 
languages/lua: fix lua highlighting in several plugins
This commit is contained in:
NotAShelf 2024-02-20 16:10:03 +00:00 committed by GitHub
commit 94f18af742
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
modules/languages/lua.nix
View file

@ -27,33 +27,35 @@ in {
}; };
}; };
config = mkIf cfg.enable (mkMerge [ config = mkMerge [
(mkIf cfg.treesitter.enable { (mkIf cfg.treesitter.enable {
vim.treesitter.enable = true; vim.treesitter.enable = true;
vim.treesitter.grammars = [cfg.treesitter.package]; vim.treesitter.grammars = [cfg.treesitter.package];
}) })
(mkIf cfg.lsp.enable { (mkIf cfg.enable (mkMerge [
vim.lsp.lspconfig.enable = true; (mkIf cfg.lsp.enable {
vim.lsp.lspconfig.sources.lua-lsp = '' vim.lsp.lspconfig.enable = true;
lspconfig.lua_ls.setup { vim.lsp.lspconfig.sources.lua-lsp = ''
capabilities = capabilities; lspconfig.lua_ls.setup {
on_attach = default_on_attach; capabilities = capabilities;
${optionalString cfg.lsp.neodev.enable "before_init = require('neodev.lsp').before_init;"} on_attach = default_on_attach;
cmd = ${ ${optionalString cfg.lsp.neodev.enable "before_init = require('neodev.lsp').before_init;"}
if isList cfg.lsp.package cmd = ${
then nvim.lua.expToLua cfg.lsp.package if isList cfg.lsp.package
else ''{"${getExe cfg.lsp.package}"}'' then nvim.lua.expToLua cfg.lsp.package
}; else ''{"${getExe cfg.lsp.package}"}''
} };
''; }
}) '';
})
(mkIf cfg.lsp.neodev.enable { (mkIf cfg.lsp.neodev.enable {
vim.startPlugins = ["neodev-nvim"]; vim.startPlugins = ["neodev-nvim"];
vim.luaConfigRC.neodev = nvim.dag.entryBefore ["lua-lsp"] '' vim.luaConfigRC.neodev = nvim.dag.entryBefore ["lua-lsp"] ''
require("neodev").setup({}) require("neodev").setup({})
''; '';
}) })
]); ]))
];
} }