Merge remote-tracking branch 'refs/remotes/origin/nixos' into nixos

modules/programs/nvim/default.nix

@@ -36,12 +36,13 @@ in
             nixd
             nixpkgs-fmt
             nodePackages.bash-language-server
-            nodePackages.jsonlint
+            python3Packages.python-lsp-server
+            python3Packages.ruff-lsp
             shellcheck
             shfmt
+            stable.yamlfix
             statix
             taplo
-            stable.yamlfix
             yamllint
           ];
         extraLuaConfig = readFile ./options.lua;

modules/programs/nvim/plugins/lua/null-ls-nvim.lua

@@ -10,7 +10,6 @@ null_ls.setup({
     null_ls.builtins.diagnostics.deadnix,
     null_ls.builtins.diagnostics.dotenv_linter,
     null_ls.builtins.diagnostics.fish,
-    null_ls.builtins.diagnostics.jsonlint,
     null_ls.builtins.diagnostics.shellcheck,
     null_ls.builtins.diagnostics.statix,
     null_ls.builtins.diagnostics.trail_space,

modules/programs/nvim/plugins/lua/nvim-lspconfig.lua

@@ -23,12 +23,7 @@ local lspconfig = require("lspconfig")
 local on_attach_def = function(client, bufnr)
   require("which-key").register({
     K = {
-      function()
-        local winid = require("ufo").peekFoldedLinesUnderCursor()
-        if not winid then
-          vim.lsp.buf.hover()
-        end
-      end,
+      vim.lsp.buf.hover,
       "Hover",
     },
     ["<leader>"] = {
@@ -102,7 +97,7 @@ local on_attach_def = function(client, bufnr)
     }
     local timeout = vim.tbl_contains(slow_lsp_servers, client.name, {}) and 500 or 0
     vim.defer_fn(function()
-      vim.lsp.inlay_hint.enable(bufnr, true)
+      vim.lsp.inlay_hint.enable(true, { bufnr })
     end, timeout)
   end
 end