diff --git a/.luarc.json b/.luarc.json new file mode 100644 index 0000000..cb4643f --- /dev/null +++ b/.luarc.json @@ -0,0 +1,5 @@ +{ + "diagnostics.globals": [ + "NIX" + ] +} \ No newline at end of file diff --git a/flake.nix b/flake.nix index eda7cf3..49e12ad 100644 --- a/flake.nix +++ b/flake.nix @@ -63,6 +63,12 @@ "nvim_plugin-mfussenegger/nvim-lint" = nvim-lint; "nvim_plugin-stevearc/conform.nvim" = conform-nvim; "nvim_plugin-neovim/nvim-lspconfig" = nvim-lspconfig; + "nvim_plugin-hrsh7th/nvim-cmp" = nvim-cmp; + "nvim_plugin-L3MON4D3/LuaSnip" = luasnip; + "nvim_plugin-saadparwaiz1/cmp_luasnip" = cmp_luasnip; + "nvim_plugin-hrsh7th/cmp-nvim-lsp" = cmp-nvim-lsp; + "nvim_plugin-hrsh7th/cmp-path" = cmp-path; + "nvim_plugin-folke/neodev.nvim" = neodev-nvim; }; # This will be how we put any nix related stuff into our lua config luaNixGlobal = "NIX=" + lib.generators.toLua { multiline = false; indent = false; } ({ @@ -96,6 +102,7 @@ # LSPs lua-language-server nodePackages.typescript-language-server + nodePackages.pyright # curl # http requests TODO # nodePackages.cspell TODO diff --git a/init.lua b/init.lua index 6a947c4..ad190dc 100644 --- a/init.lua +++ b/init.lua @@ -1,3 +1,4 @@ +---@diagnostic disable: undefined-global if NIX then -- Add my lua dir to the path. THIS IS NOT RECURSIVE! -- For recursive we can do something like this: https://github.com/RingOfStorms/nvim/blob/0b833d555c69e88b450a10eec4e39a782bad1037/init.lua#L1-L17 @@ -42,7 +43,7 @@ end local function getSpec() if NIX then -- Convert plugins to use nix store, this auto sets the `dir` property for us on all plugins. - function convertPluginToNixStore(plugin) + local function convertPluginToNixStore(plugin) local p = ensure_table(plugin) if p.enabled == false then return plugin diff --git a/lua/plugins/cmp_autocompletion.lua b/lua/plugins/cmp_autocompletion.lua new file mode 100644 index 0000000..9b25d0a --- /dev/null +++ b/lua/plugins/cmp_autocompletion.lua @@ -0,0 +1,102 @@ +return { + "hrsh7th/nvim-cmp", + event = "InsertEnter", + dependencies = { + -- Snippet Engine & its associated nvim-cmp source + { + "L3MON4D3/LuaSnip", + dependencies = { + -- TODO use or remove this? + -- `friendly-snippets` contains a variety of premade snippets. + -- See the README about individual language/framework/plugin snippets: + -- https://github.com/rafamadriz/friendly-snippets + -- { + -- 'rafamadriz/friendly-snippets', + -- config = function() + -- require('luasnip.loaders.from_vscode').lazy_load() + -- end, + -- }, + }, + }, + "saadparwaiz1/cmp_luasnip", + + -- Adds other completion capabilities. + -- nvim-cmp does not ship with all sources by default. They are split + -- into multiple repos for maintenance purposes. + "hrsh7th/cmp-nvim-lsp", + "hrsh7th/cmp-path", + }, + config = function() + -- See `:help cmp` + local cmp = require("cmp") + local luasnip = require("luasnip") + luasnip.config.setup({}) + + cmp.setup({ + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end, + }, + completion = { completeopt = "menu,menuone,noinsert" }, + + -- For an understanding of why these mappings were + -- chosen, you will need to read `:help ins-completion` + -- + -- No, but seriously. Please read `:help ins-completion`, it is really good! + mapping = cmp.mapping.preset.insert({ + -- Select the [n]ext item + [""] = cmp.mapping.select_next_item(), + -- Select the [p]revious item + [""] = cmp.mapping.select_prev_item(), + + -- Scroll the documentation window [b]ack / [f]orward + [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping.scroll_docs(4), + + -- Accept ([y]es) the completion. + -- This will auto-import if your LSP supports it. + -- This will expand snippets if the LSP sent a snippet. + [""] = cmp.mapping.confirm({ select = true }), + + -- If you prefer more traditional completion keymaps, + -- you can uncomment the following lines + --[''] = cmp.mapping.confirm { select = true }, + --[''] = cmp.mapping.select_next_item(), + --[''] = cmp.mapping.select_prev_item(), + + -- Manually trigger a completion from nvim-cmp. + -- Generally you don't need this, because nvim-cmp will display + -- completions whenever it has completion options available. + [""] = cmp.mapping.complete({}), + + -- Think of as moving to the right of your snippet expansion. + -- So if you have a snippet that's like: + -- function $name($args) + -- $body + -- end + -- + -- will move you to the right of each of the expansion locations. + -- is similar, except moving you backwards. + [""] = cmp.mapping(function() + if luasnip.expand_or_locally_jumpable() then + luasnip.expand_or_jump() + end + end, { "i", "s" }), + [""] = cmp.mapping(function() + if luasnip.locally_jumpable(-1) then + luasnip.jump(-1) + end + end, { "i", "s" }), + + -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: + -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps + }), + sources = { + { name = "nvim_lsp" }, + { name = "luasnip" }, + { name = "path" }, + }, + }) + end, +} diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 18cc4c1..adebcd9 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -7,13 +7,14 @@ return { { "williamboman/mason-lspconfig.nvim", enabled = not NIX }, { "WhoIsSethDaniel/mason-tool-installer.nvim", enabled = not NIX }, + -- TODO revisit if I want this or not, is this already solved? -- Useful status updates for LSP. -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})` -- { "j-hui/fidget.nvim", opts = {} }, -- `neodev` configures Lua LSP for your Neovim config, runtime and plugins -- used for completion, annotations and signatures of Neovim apis - -- { "folke/neodev.nvim", opts = {} }, + { "folke/neodev.nvim", opts = {}, main = "neodev" }, }, config = function() vim.api.nvim_create_autocmd("LspAttach", { @@ -35,10 +36,6 @@ return { map("gD", vim.lsp.buf.declaration, "Goto Declaration") local client = vim.lsp.get_client_by_id(event.data.client_id) - -- The following autocommand is used to enable inlay hints in your - -- code, if the language server you are using supports them - -- - -- This may be unwanted, since they displace some of your code if client and client.server_capabilities.inlayHintProvider and vim.lsp.inlay_hint then map("lth", function() vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled()) @@ -56,9 +53,11 @@ return { }) local capabilities = vim.lsp.protocol.make_client_capabilities() - -- TODO - -- capabilities = vim.tbl_deep_extend("force", capabilities, require("cmp_nvim_lsp").default_capabilities()) + U.safeRequire("cmp_nvim_lsp", function(c) + capabilities = vim.tbl_deep_extend("force", capabilities, c.default_capabilities()) + end) + -- TODO finish porting over lsp configs: https://github.com/RingOfStorms/nvim/blob/master/lua/plugins/lsp.lua local servers = { -- clangd = {}, -- gopls = {}, @@ -70,8 +69,15 @@ return { -- https://github.com/pmizio/typescript-tools.nvim -- -- But for many setups, the LSP (`tsserver`) will work just fine - tsserver = {}, - + tsserver = { + -- typescript/javascript + implicitProjectConfiguration = { + checkJs = true, + }, + }, + pyright = { + -- python + }, lua_ls = { -- cmd = { ... }, -- filetypes = { ...},