diff --git a/flake.lock b/flake.lock index 6975955..8ce3c10 100644 --- a/flake.lock +++ b/flake.lock @@ -172,11 +172,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1663146586, - "narHash": "sha256-VCGdyEc5TF0uq+gdU+jesjZcNxptomDunvGtElmAD9I=", + "lastModified": 1667969101, + "narHash": "sha256-GL53T705HO7Q/KVfbb5STx8AxFs8YgaGY8pvAZC+O7U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "125efbd96af28ea5d60e00a3eed832ea3f49a93b", + "rev": "bbf77421ac51a7c93f5f0f760da99e4dbce614fa", "type": "github" }, "original": { @@ -186,6 +186,23 @@ "type": "github" } }, + "nlsp-settings-nvim": { + "flake": false, + "locked": { + "lastModified": 1668009753, + "narHash": "sha256-Zy+TPa2aei9ku3eibOXMHCOZ0awqQfjPUdsJok5P088=", + "owner": "tamago324", + "repo": "nlsp-settings.nvim", + "rev": "effb5f50b2ad7d6070e429635384345ca4be078e", + "type": "github" + }, + "original": { + "owner": "tamago324", + "repo": "nlsp-settings.nvim", + "rev": "effb5f50b2ad7d6070e429635384345ca4be078e", + "type": "github" + } + }, "nvim-cmp": { "flake": false, "locked": { @@ -333,6 +350,7 @@ "luasnip": "luasnip", "neoformat": "neoformat", "nixpkgs": "nixpkgs", + "nlsp-settings-nvim": "nlsp-settings-nvim", "nvim-cmp": "nvim-cmp", "nvim-lspconfig": "nvim-lspconfig", "nvim-orgmode": "nvim-orgmode", diff --git a/flake.nix b/flake.nix index 419fc2f..08853f8 100644 --- a/flake.nix +++ b/flake.nix @@ -61,6 +61,12 @@ flake = false; }; + # https://github.com/tamago324/nlsp-settings.nvim + nlsp-settings-nvim = { + url = "github:tamago324/nlsp-settings.nvim?rev=effb5f50b2ad7d6070e429635384345ca4be078e"; + flake = false; + }; + # https://github.com/glepnir/lspsaga.nvim lspsaga-nvim = { url = "github:glepnir/lspsaga.nvim?rev=f33bc99d0ed3ed691a58b3339decf4e1933c3f9e"; @@ -168,6 +174,7 @@ "gitsigns-nvim" # lsp "nvim-lspconfig" + "nlsp-settings-nvim" "lspsaga-nvim" "luasnip" "nvim-cmp" diff --git a/plugins/lsp/default.nix b/plugins/lsp/default.nix index d8e82fa..2eefce3 100644 --- a/plugins/lsp/default.nix +++ b/plugins/lsp/default.nix @@ -1,4 +1,5 @@ { nvim-lspconfig +, nlsp-settings-nvim , lspsaga-nvim , luasnip , nvim-cmp @@ -9,7 +10,7 @@ let inherit (builtins) readFile; - lsp = [ nvim-lspconfig lspsaga-nvim ]; + lsp = [ nvim-lspconfig nlsp-settings-nvim lspsaga-nvim ]; snippets = [ luasnip ]; completions = [ nvim-cmp # Autocompletion diff --git a/plugins/lsp/lspconfig.lua b/plugins/lsp/lspconfig.lua index f516bc9..63f4a76 100644 --- a/plugins/lsp/lspconfig.lua +++ b/plugins/lsp/lspconfig.lua @@ -1,5 +1,6 @@ local lsp_config = require("lspconfig") local saga = require("lspsaga") +local nlsp_settings = require("nlspsettings") -- See: https://github.com/glepnir/lspsaga.nvim#configuration saga.init_lsp_saga({ @@ -56,6 +57,9 @@ end local capabilities = vim.lsp.protocol.make_client_capabilities() capabilities = require("cmp_nvim_lsp").update_capabilities(capabilities) +-- for local configurations +nlsp_settings.setup({}) + ------------------------------------------------------------------------------- -- See: https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md --