fix: revert to rust.vim, fix weird cmp behavior

3 files changed, 13 insertions, 4 deletions

diff --git a/lua/pml68/plugins/completion.lua b/lua/pml68/plugins/completion.lua
index 82f275e..561ab22 100644
--- a/lua/pml68/plugins/completion.lua
+++ b/lua/pml68/plugins/completion.lua
@@ -18,7 +18,6 @@ return {
     "hrsh7th/cmp-nvim-lsp",
     "hrsh7th/cmp-buffer",
     "hrsh7th/cmp-path",
-    "hrsh7th/cmp-emoji"
   },
   config = function()
     require("pml68.configs.cmp")
diff --git a/lua/pml68/plugins/guard.lua b/lua/pml68/plugins/guard.lua
index 8f0ddd0..bfae097 100644
--- a/lua/pml68/plugins/guard.lua
+++ b/lua/pml68/plugins/guard.lua
@@ -3,12 +3,11 @@ return {
   dependencies = {
     "nvimdev/guard-collection"
   },
-  event = { "BufReadPost", "BufNewFile" },
+  ft = { "c", "cpp", "h", "json", "go", "lua" },
   config = function()
     local ft = require("guard.filetype")
 
     ft("c,cpp,h"):fmt("clang-format")
-    ft("rust"):fmt("lsp")
     ft("json"):fmt({
       cmd = "jq",
       stdin = true
diff --git a/lua/pml68/plugins/lang-specific.lua b/lua/pml68/plugins/lang-specific.lua
index 782e207..8b664e3 100644
--- a/lua/pml68/plugins/lang-specific.lua
+++ b/lua/pml68/plugins/lang-specific.lua
@@ -15,6 +15,17 @@ return {
   },
   -- Rust
   {
+    "rust-lang/rust.vim",
+    ft = "rust",
+    init = function()
+      vim.g.rustfmt_autosave = 1
+    end,
+    config = function()
+      vim.keymap.set("n", "<leader>rts", "<cmd>RustTest<CR>")
+      vim.keymap.set("n", "<leader>rta", "<cmd>RustTest!<CR>")
+    end
+  },
+  {
     "saecki/crates.nvim",
     tag = "stable",
     dependencies = "hrsh7th/nvim-cmp",
@@ -35,6 +46,6 @@ return {
     ft = "tex",
     init = function()
       vim.g.vimtex_view_method = 'mupdf'
-    end
+    end,
   },
 }