From f25a55cfaddcd1d5b2f1b07f8f151803dc7c4b75 Mon Sep 17 00:00:00 2001
From: u2515h <root@nixos>
Date: Sat, 6 Jan 2024 22:04:48 +0100
Subject: [PATCH] feat(nvim): switch rust-tools to rustaceanvim

---
 completion.lua |  8 ++++++--
 default.nix    |  2 +-
 rust.lua       | 40 ++++++++++++++++++++--------------------
 3 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/completion.lua b/completion.lua
index 7528723..ec4e811 100644
--- a/completion.lua
+++ b/completion.lua
@@ -22,8 +22,12 @@ autocmd CursorHold * lua vim.diagnostic.open_float(nil, { focusable = false })
 vim.opt.spell = true
 vim.opt.spelllang = {'en_us'}
 vim.lsp.handlers["textDocument/publishDiagnostics"] =
-    vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics,
-                 {virtual_text = true})
+    vim.lsp.with(
+    vim.lsp.diagnostic.on_publish_diagnostics,
+    {
+        virtual_text = true,
+    }
+)
 -- Completion Plugin Setup
 local cmp = require 'cmp'
 cmp.setup({
diff --git a/default.nix b/default.nix
index 0511177..c3265c2 100644
--- a/default.nix
+++ b/default.nix
@@ -62,7 +62,7 @@ in
       (if config.programs.neovim.package.version == "0.10.0" then throw "lsp-inlayhints-nvim may be removed" else lsp-inlayhints-nvim) # https://github.com/mrcjkb/rustaceanvim/discussions/46#discussioncomment-7620822
       cmp-conventionalcommits
       cmp-calc
-      rust-tools-nvim
+      rustaceanvim
       plenary-nvim
       crates-nvim
       nvim-lspconfig
diff --git a/rust.lua b/rust.lua
index 96821a4..f8c3b06 100644
--- a/rust.lua
+++ b/rust.lua
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 local nvim_lsp = require 'lspconfig'
 local c = vim.lsp.protocol.make_client_capabilities()
 local deps = require("nvim-deps")
@@ -122,26 +121,29 @@ vim.g.rustaceanvim = {
             require('crates').setup()
             local keymap_opts = {buffer = bufnr}
             -- Hover actions
-            -- call twice to focus
+	    -- call twice to focus
             vim.keymap.set("n", "<leader>K",
-                           function()
-                vim.cmd.RustLsp {'hover', 'actions'}
-            end, keymap_opts)
+                           function() 
+				   vim.cmd.RustLsp { 'hover', 'actions' }
+			   end, keymap_opts)
             -- Code action groups
             vim.keymap.set("n", "<leader>as",
-                           function()
-                vim.cmd.RustLsp {'hover', 'actions'}
-            end, keymap_opts)
-            vim.keymap.set('n', '<leader>cc',
-                           function() vim.cmd.RustLsp('openCargo') end,
-                           keymap_opts)
-            vim.keymap.set('n', '<leader>cr', function()
-                vim.cmd.RustLsp {'runnables', 'last' --[[ optional ]] }
-            end, keymap_opts)
-            vim.keymap.set('n', '<leader>cd', function()
-                vim.cmd.RustLsp {'debuggables', 'last' --[[ optional ]] }
-            end, keymap_opts)
-            --            vim.keymap.set("n", "g0", vim.lsp.buf.document_symbol, keymap_opts)
+                           function() 
+				   vim.cmd.RustLsp { 'hover', 'actions' }
+			   end, keymap_opts)
+            vim.keymap.set('n', '<leader>cc', 
+                           function() 
+				   vim.cmd.RustLsp('openCargo')
+			   end, keymap_opts)
+            vim.keymap.set('n', '<leader>cr', 
+                           function() 
+				   vim.cmd.RustLsp {'runnables', 'last' --[[ optional ]] }
+			   end, keymap_opts)
+            vim.keymap.set('n', '<leader>cd', 
+                           function() 
+				   vim.cmd.RustLsp {'debuggables', 'last' --[[ optional ]] }
+			   end, keymap_opts)
+--            vim.keymap.set("n", "g0", vim.lsp.buf.document_symbol, keymap_opts)
             local diag_float_grp = vim.api.nvim_create_augroup(
                                        "DiagnosticFloat", {clear = true})
             vim.api.nvim_create_autocmd("CursorHold", {
@@ -166,7 +168,6 @@ vim.g.rustaceanvim = {
         }
     }
 }
-=======
 local rt = require("rust-tools")
 local deps = require("nvim-deps")
 
@@ -347,4 +348,3 @@ rt.setup(
   },
 }
 )
->>>>>>> 5df3a02 (wip: feat(nvim/rust-tools): begin migration)