From 4b7e56c757f781274615e7ab959899649432a409 Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Tue, 11 Apr 2023 07:39:46 +0200 Subject: [PATCH 1/5] feat: replace sumneko with lua-language-server --- home-manager/neovim/default.nix | 2 +- home-manager/neovim/lspconfig.lua | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/home-manager/neovim/default.nix b/home-manager/neovim/default.nix index ff6f38c..153f1ec 100644 --- a/home-manager/neovim/default.nix +++ b/home-manager/neovim/default.nix @@ -49,7 +49,7 @@ in xclip # language servers - sumneko-lua-language-server + lua-language-server rnix-lsp terraform-ls tflint diff --git a/home-manager/neovim/lspconfig.lua b/home-manager/neovim/lspconfig.lua index c023f00..844c1ca 100644 --- a/home-manager/neovim/lspconfig.lua +++ b/home-manager/neovim/lspconfig.lua @@ -50,10 +50,10 @@ lsp_status.register_progress() -- setup lua language server for init.nvim and nvim plugin development require("neodev").setup({ - override = function(root_dir, library) + override = function(root_dir, options) if require("neodev.util").has_file(root_dir, "/etc/nixos") then - library.enabled = true - library.plugins = true + options.enabled = true + options.plugins = true end end, }) @@ -63,6 +63,7 @@ local capabilities = require("cmp_nvim_lsp").default_capabilities(lsp_status.cap local servers = { ["bashls"] = {}, ["dockerls"] = {}, + ["lua_ls"] = {}, ["pylsp"] = { pylsp = { plugins = { @@ -74,7 +75,6 @@ local servers = { }, ["pyright"] = {}, ["rnix"] = {}, - ["sumneko_lua"] = {}, ["terraformls"] = {}, ["tflint"] = {}, ["tsserver"] = {}, From d443c729a90ae6b19b102a2c6f8eb96bbec82627 Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Tue, 11 Apr 2023 07:40:10 +0200 Subject: [PATCH 2/5] feat: add json language server --- home-manager/neovim/default.nix | 2 +- home-manager/neovim/lspconfig.lua | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/home-manager/neovim/default.nix b/home-manager/neovim/default.nix index 153f1ec..e0dba01 100644 --- a/home-manager/neovim/default.nix +++ b/home-manager/neovim/default.nix @@ -62,7 +62,7 @@ in nodePackages.typescript-language-server nodePackages.typescript nodePackages.dockerfile-language-server-nodejs - nodePackages.vscode-html-languageserver-bin + nodePackages.vscode-langservers-extracted lldb vscode-extensions.vadimcn.vscode-lldb ]; diff --git a/home-manager/neovim/lspconfig.lua b/home-manager/neovim/lspconfig.lua index 844c1ca..630d9c8 100644 --- a/home-manager/neovim/lspconfig.lua +++ b/home-manager/neovim/lspconfig.lua @@ -63,6 +63,7 @@ local capabilities = require("cmp_nvim_lsp").default_capabilities(lsp_status.cap local servers = { ["bashls"] = {}, ["dockerls"] = {}, + ["jsonls"] = {}, ["lua_ls"] = {}, ["pylsp"] = { pylsp = { From 94e81693d930132721cb22acf5df845bec3c72f2 Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Tue, 11 Apr 2023 07:40:22 +0200 Subject: [PATCH 3/5] style: auto-format --- home-manager/neovim/lspconfig.lua | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/home-manager/neovim/lspconfig.lua b/home-manager/neovim/lspconfig.lua index 630d9c8..55dbefa 100644 --- a/home-manager/neovim/lspconfig.lua +++ b/home-manager/neovim/lspconfig.lua @@ -6,9 +6,13 @@ local on_attach = function(client, bufnr) end local function format_buffer() - vim.lsp.buf.format({ timeout_ms = 3000, async = false, filter = function(formatter) - return formatter.name ~= "tsserver" and formatter.name ~= "volar" - end }) + vim.lsp.buf.format({ + timeout_ms = 3000, + async = false, + filter = function(formatter) + return formatter.name ~= "tsserver" and formatter.name ~= "volar" + end + }) end local telescope = require("telescope.builtin") @@ -131,7 +135,6 @@ null_ls.setup({ null_ls.builtins.diagnostics.eslint_d, null_ls.builtins.diagnostics.tsc, }, - on_attach = on_attach, }) From 4d5b1c1630f7049964cf9a4d364a5685e4f5aa6d Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Tue, 11 Apr 2023 07:40:34 +0200 Subject: [PATCH 4/5] feat: add vim-surround --- home-manager/neovim/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/neovim/default.nix b/home-manager/neovim/default.nix index e0dba01..cd495e2 100644 --- a/home-manager/neovim/default.nix +++ b/home-manager/neovim/default.nix @@ -105,6 +105,7 @@ in vim-illuminate registers-nvim pre-commit-nvim + vim-surround # git gitsigns-nvim From 4c14041ca73bfbe9f78c6034d7f9afce2ffc66cb Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Tue, 11 Apr 2023 07:41:58 +0200 Subject: [PATCH 5/5] chore: nix flake update --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 2539955..5a21cde 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1677757546, - "narHash": "sha256-tA1ukoluctzLVyWRaKtD4KlTwgXbUsGB5vcyni1OJ9I=", + "lastModified": 1681092193, + "narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=", "owner": "nix-community", "repo": "home-manager", - "rev": "86bb69b0b1e10d99a30c4352f230f03106dd0f8a", + "rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af", "type": "github" }, "original": { @@ -24,11 +24,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1677779205, - "narHash": "sha256-6DBjL9wjq86p2GczmwnHtFRnWPBPItc67gapWENBgX8=", + "lastModified": 1681091990, + "narHash": "sha256-ifIzhksUBZKp5WgCuoVhDY32qaEplXp7khzrB6zkaFc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "96e18717904dfedcd884541e5a92bf9ff632cf39", + "rev": "ea96b4af6148114421fda90df33cf236ff5ecf1d", "type": "github" }, "original": { @@ -40,11 +40,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1678654296, - "narHash": "sha256-aVfw3ThpY7vkUeF1rFy10NAkpKDS2imj3IakrzT0Occ=", + "lastModified": 1681036984, + "narHash": "sha256-AbScJXshYzbeUKHh+Y3OICc3iAtr+NqJ3Xb81GW+ptU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5a1dc8acd977ff3dccd1328b7c4a6995429a656b", + "rev": "fd531dee22c9a3d4336cc2da39e8dd905e8f3de4", "type": "github" }, "original": {