From 763b9e3340299185240ec45b9c9b67602ce994ec Mon Sep 17 00:00:00 2001
From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
Date: Wed, 19 Jun 2024 07:15:25 +0200
Subject: fix(modules/nvim): Update to the newest nixVim version

This includes replacing the deprecated `lua = true` pattern with a raw
lua value and using the new name for `nil_ls`: `nil-ls`
---
 modules/home/conf/nvim/plgs/lsp/keymaps/default.nix        |  6 ++----
 modules/home/conf/nvim/plgs/lsp/servers/default.nix        |  2 +-
 modules/home/conf/nvim/plgs/lsp/servers/servers/nil-ls.nix | 10 ++++++++++
 modules/home/conf/nvim/plgs/lsp/servers/servers/nil_ls.nix | 10 ----------
 4 files changed, 13 insertions(+), 15 deletions(-)
 create mode 100644 modules/home/conf/nvim/plgs/lsp/servers/servers/nil-ls.nix
 delete mode 100644 modules/home/conf/nvim/plgs/lsp/servers/servers/nil_ls.nix

(limited to 'modules/home/conf/nvim/plgs/lsp')

diff --git a/modules/home/conf/nvim/plgs/lsp/keymaps/default.nix b/modules/home/conf/nvim/plgs/lsp/keymaps/default.nix
index e176461e..b1276639 100644
--- a/modules/home/conf/nvim/plgs/lsp/keymaps/default.nix
+++ b/modules/home/conf/nvim/plgs/lsp/keymaps/default.nix
@@ -53,18 +53,16 @@
     keymaps = [
       {
         key = "<space>f";
-        action = "function() vim.lsp.buf.format { async = true } end";
-        lua = true;
+        action.__raw = "function() vim.lsp.buf.format { async = true } end";
         options.desc = "[F]ormat the current buffer (asynchronously)";
       }
       {
         key = "<space>wl";
-        action = ''
+        action.__raw = ''
           function()
             print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
           end
         '';
-        lua = true;
         options.desc = "[W]orkspace folders [l]ist";
       }
     ];
diff --git a/modules/home/conf/nvim/plgs/lsp/servers/default.nix b/modules/home/conf/nvim/plgs/lsp/servers/default.nix
index 1f59ae4e..605046d4 100644
--- a/modules/home/conf/nvim/plgs/lsp/servers/default.nix
+++ b/modules/home/conf/nvim/plgs/lsp/servers/default.nix
@@ -6,7 +6,7 @@
     ./servers/quick-lint-js.nix
     ./servers/ltex.nix
     ./servers/lua-ls.nix
-    ./servers/nil_ls.nix
+    ./servers/nil-ls.nix
     ./servers/openscad.nix
     ./servers/ruff-lsp.nix
     ./servers/rust-analyzer.nix
diff --git a/modules/home/conf/nvim/plgs/lsp/servers/servers/nil-ls.nix b/modules/home/conf/nvim/plgs/lsp/servers/servers/nil-ls.nix
new file mode 100644
index 00000000..ab9e643b
--- /dev/null
+++ b/modules/home/conf/nvim/plgs/lsp/servers/servers/nil-ls.nix
@@ -0,0 +1,10 @@
+{...}: {
+  programs.nixvim.plugins.lsp.servers = {
+    nil-ls = {
+      enable = true;
+      settings = {
+        formatting.command = ["alejandra"];
+      };
+    };
+  };
+}
diff --git a/modules/home/conf/nvim/plgs/lsp/servers/servers/nil_ls.nix b/modules/home/conf/nvim/plgs/lsp/servers/servers/nil_ls.nix
deleted file mode 100644
index f0cccbdc..00000000
--- a/modules/home/conf/nvim/plgs/lsp/servers/servers/nil_ls.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{...}: {
-  programs.nixvim.plugins.lsp.servers = {
-    nil_ls = {
-      enable = true;
-      settings = {
-        formatting.command = ["alejandra"];
-      };
-    };
-  };
-}
-- 
cgit 1.4.1