development: use rustaceanvim for rust, add dap plugins

3 files changed, 80 insertions, 23 deletions

diff --git a/dotfiles/vim/ftplugin/rust.lua b/dotfiles/vim/ftplugin/rust.lua
deleted file mode 100644
index 23a46f1..0000000
--- a/dotfiles/vim/ftplugin/rust.lua
+++ /dev/null
@@ -1,18 +0,0 @@
--- TODO: suffixes, includes
-
-vim.bo.expandtab = true
-vim.bo.shiftwidth = 4
-vim.bo.softtabstop = 4
-vim.bo.textwidth = 99
-
-vim.opt_local.comments = {
-        "s0:/*!",
-        "ex:*/",
-        "s1:/*",
-        "mb:*",
-        "ex:*/",
-        ":///",
-        "://!",
-        "://",
-}
-vim.bo.commentstring = "// %s"
diff --git a/dotfiles/vim/lua/vim-dev.lua b/dotfiles/vim/lua/vim-dev.lua
index 84f3f89..41d94fd 100644
--- a/dotfiles/vim/lua/vim-dev.lua
+++ b/dotfiles/vim/lua/vim-dev.lua
@@ -1,10 +1,73 @@
 local on_attach = require('myConfig.exports').on_attach
 
-require("rust-tools").setup {
+vim.g.rustaceanvim = {
+        -- Plugin configuration
+        tools = {
+        },
+        -- LSP configuration
         server = {
-                cmd = { vim.g.rust_analyzer_path },
+                -- cmd = { vim.g.rust_analyzer_path },
+                on_attach = function(client, bufnr)
+                        on_attach(client, bufnr)
+
+                        vim.keymap.set(
+                                -- {"n", "v"},
+                                "n",
+                                "J",
+                                function() vim.cmd.RustLsp('joinLines') end,
+                                {
+                                        silent = true,
+                                        buffer = bufnr,
+                                        desc = "rust-analyzer join lines",
+                                }
+                        )
+
+                        vim.keymap.set(
+                                "n",
+                                "<M-Up>",
+                                function() vim.cmd.RustLsp({ "moveItem", "up" }) end,
+                                {
+                                        silent = true,
+                                        buffer = bufnr,
+                                        desc = "rust-analyzer move item up",
+                                }
+                        )
+
+                        vim.keymap.set(
+                                "n",
+                                "<M-Down>",
+                                function() vim.cmd.RustLsp({ "moveItem", "down" }) end,
+                                {
+                                        silent = true,
+                                        buffer = bufnr,
+                                        desc = "rust-analyzer move item down",
+                                }
+                        )
+
+                        vim.keymap.set(
+                                "n",
+                                "<leader>sR",
+                                function() vim.cmd.RustLsp('runnables') end,
+                                {
+                                        silent = true,
+                                        buffer = bufnr,
+                                        desc = "rust-analyzer runnables",
+                                }
+                        )
+
+                        vim.keymap.set(
+                                "n",
+                                "<leader>sx",
+                                function() vim.cmd.RustLsp('explainError') end,
+                                {
+                                        silent = true,
+                                        buffer = bufnr,
+                                        desc = "rust-analyzer explain error",
+                                }
+                        )
+                end,
                 settings = {
-                        ["rust-analyzer"] = {
+                        ['rust-analyzer'] = {
                                 checkOnSave = {
                                         command = "clippy",
                                 },
@@ -13,7 +76,6 @@ require("rust-tools").setup {
                                 },
                         },
                 },
-                on_attach = on_attach,
         },
 }
 
@@ -63,3 +125,8 @@ vim.g["pandoc#formatting#extra_equalprg"] = "--reference-links --reference-locat
 
 -- Actions preview
 require("actions-preview").setup()
+
+-- DAP
+require("dapui").setup()
+require("nvim-dap-virtual-text").setup()
+require('telescope').load_extension('dap')
diff --git a/usecases/desktop/development.nix b/usecases/desktop/development.nix
index f52b0b0..19ee25c 100644
--- a/usecases/desktop/development.nix
+++ b/usecases/desktop/development.nix
@@ -83,6 +83,7 @@ in {
       bacon
       cargo-info
       rustup
+      lldb
 
       # Python
       python3Packages.tox
@@ -105,8 +106,15 @@ in {
         neodev-nvim
         nvim-lspconfig
         playground
-        rust-tools-nvim
         vim-grammarous
+
+        # DAP
+        nvim-dap
+        nvim-dap-ui
+        nvim-dap-virtual-text
+        telescope-dap-nvim
+
+        rustaceanvim
       ];
 
       variables = {