flake.lock

@@ -8,11 +8,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1681092193,
+        "lastModified": 1677757546,
-        "narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=",
+        "narHash": "sha256-tA1ukoluctzLVyWRaKtD4KlTwgXbUsGB5vcyni1OJ9I=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af",
+        "rev": "86bb69b0b1e10d99a30c4352f230f03106dd0f8a",
         "type": "github"
       },
       "original": {
@@ -24,11 +24,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1681091990,
+        "lastModified": 1677779205,
-        "narHash": "sha256-ifIzhksUBZKp5WgCuoVhDY32qaEplXp7khzrB6zkaFc=",
+        "narHash": "sha256-6DBjL9wjq86p2GczmwnHtFRnWPBPItc67gapWENBgX8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ea96b4af6148114421fda90df33cf236ff5ecf1d",
+        "rev": "96e18717904dfedcd884541e5a92bf9ff632cf39",
         "type": "github"
       },
       "original": {
@@ -40,11 +40,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1681036984,
+        "lastModified": 1678654296,
-        "narHash": "sha256-AbScJXshYzbeUKHh+Y3OICc3iAtr+NqJ3Xb81GW+ptU=",
+        "narHash": "sha256-aVfw3ThpY7vkUeF1rFy10NAkpKDS2imj3IakrzT0Occ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fd531dee22c9a3d4336cc2da39e8dd905e8f3de4",
+        "rev": "5a1dc8acd977ff3dccd1328b7c4a6995429a656b",
         "type": "github"
       },
       "original": {

home-manager/neovim/default.nix

@@ -49,7 +49,7 @@ in
     xclip
 
     # language servers
-    lua-language-server
+    sumneko-lua-language-server
     rnix-lsp
     terraform-ls
     tflint
@@ -62,7 +62,7 @@ in
     nodePackages.typescript-language-server
     nodePackages.typescript
     nodePackages.dockerfile-language-server-nodejs
-    nodePackages.vscode-langservers-extracted
+    nodePackages.vscode-html-languageserver-bin
     lldb
     vscode-extensions.vadimcn.vscode-lldb
   ];
@@ -105,7 +105,6 @@ in
         vim-illuminate
         registers-nvim
         pre-commit-nvim
-        vim-surround
 
         # git
         gitsigns-nvim

home-manager/neovim/lspconfig.lua

@@ -6,13 +6,9 @@ local on_attach = function(client, bufnr)
     end
 
     local function format_buffer()
-        vim.lsp.buf.format({
+        vim.lsp.buf.format({ timeout_ms = 3000, async = false, filter = function(formatter)
-            timeout_ms = 3000,
+            return formatter.name ~= "tsserver" and formatter.name ~= "volar"
-            async = false,
+        end })
-            filter = function(formatter)
-                return formatter.name ~= "tsserver" and formatter.name ~= "volar"
-            end
-        })
     end
 
     local telescope = require("telescope.builtin")
@@ -54,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, options)
+    override = function(root_dir, library)
         if require("neodev.util").has_file(root_dir, "/etc/nixos") then
-            options.enabled = true
+            library.enabled = true
-            options.plugins = true
+            library.plugins = true
         end
     end,
 })
@@ -67,8 +63,6 @@ local capabilities = require("cmp_nvim_lsp").default_capabilities(lsp_status.cap
 local servers = {
     ["bashls"] = {},
     ["dockerls"] = {},
-    ["jsonls"] = {},
-    ["lua_ls"] = {},
     ["pylsp"] = {
         pylsp = {
             plugins = {
@@ -80,6 +74,7 @@ local servers = {
     },
     ["pyright"] = {},
     ["rnix"] = {},
+    ["sumneko_lua"] = {},
     ["terraformls"] = {},
     ["tflint"] = {},
     ["tsserver"] = {},
@@ -135,6 +130,7 @@ null_ls.setup({
         null_ls.builtins.diagnostics.eslint_d,
         null_ls.builtins.diagnostics.tsc,
     },
+
     on_attach = on_attach,
 })