From 859c175d5a63daf4cef88d3c02d91057ecda884b Mon Sep 17 00:00:00 2001
From: Christian Nieves <cnieves@google.com>
Date: Sat, 21 Sep 2024 11:56:20 -0500
Subject: [PATCH] fix lsplines

---
 config/.config/nvim/lazy-lock.json   |  3 ---
 tmux/.tmux/plugins/tmux-continuum    |  2 +-
 vim/.vim/lua/plugins/diagnostics.lua | 30 ++++++++++++++--------------
 vim/.vim/lua/plugins/lsp.lua         |  2 ++
 vim/.vim/lua/plugins/rust.lua        | 23 ++++++++++-----------
 5 files changed, 28 insertions(+), 32 deletions(-)
 delete mode 100644 config/.config/nvim/lazy-lock.json

diff --git a/config/.config/nvim/lazy-lock.json b/config/.config/nvim/lazy-lock.json
deleted file mode 100644
index 337400b..0000000
--- a/config/.config/nvim/lazy-lock.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" }
-}
diff --git a/tmux/.tmux/plugins/tmux-continuum b/tmux/.tmux/plugins/tmux-continuum
index 0698e8f..3e4bc35 160000
--- a/tmux/.tmux/plugins/tmux-continuum
+++ b/tmux/.tmux/plugins/tmux-continuum
@@ -1 +1 @@
-Subproject commit 0698e8f4b17d6454c71bf5212895ec055c578da0
+Subproject commit 3e4bc35da41f956c873aea716c97555bf1afce5d
diff --git a/vim/.vim/lua/plugins/diagnostics.lua b/vim/.vim/lua/plugins/diagnostics.lua
index 8b449f2..a4b78c7 100644
--- a/vim/.vim/lua/plugins/diagnostics.lua
+++ b/vim/.vim/lua/plugins/diagnostics.lua
@@ -39,21 +39,21 @@ return {
 
 			require("lsp_lines").setup()
 
-			vim.schedule(function()
-				vim.diagnostic.config({
-					severity_sort = true,
-					virtual_text = false,
-					virtual_improved = {
-						severity = { min = vim.diagnostic.severity.WARN },
-						current_line = "hide",
-					},
-					virtual_lines = {
-						severity = { min = vim.diagnostic.severity.HINT },
-						highlight_whole_line = false,
-						only_current_line = true,
-					},
-				})
-			end)
+			-- vim.schedule(function()
+			vim.diagnostic.config({
+				severity_sort = true,
+				virtual_text = false,
+				virtual_improved = {
+					severity = { min = vim.diagnostic.severity.WARN },
+					current_line = "hide",
+				},
+				virtual_lines = {
+					severity = { min = vim.diagnostic.severity.HINT },
+					highlight_whole_line = false,
+					only_current_line = true,
+				},
+			})
+			-- end)
 		end,
 		keys = {
 			{
diff --git a/vim/.vim/lua/plugins/lsp.lua b/vim/.vim/lua/plugins/lsp.lua
index 103c67e..4471ae6 100644
--- a/vim/.vim/lua/plugins/lsp.lua
+++ b/vim/.vim/lua/plugins/lsp.lua
@@ -99,6 +99,8 @@ return {
 		},
   -- stylua: ignore
 		keys = {
+			{ "<leader>F", "<cmd>lua vim.lsp.buf.format()<CR>" },
+
 			{ "<leader>rn", "<cmd>lua vim.lsp.buf.rename()<CR>" },
 			-- { "?", "<cmd>lua vim.lsp.buf.code_action()<CR>" },
 			{ "L", "<cmd>lua vim.lsp.buf.hover()<CR>" },
diff --git a/vim/.vim/lua/plugins/rust.lua b/vim/.vim/lua/plugins/rust.lua
index 1e49786..dbb9fbc 100644
--- a/vim/.vim/lua/plugins/rust.lua
+++ b/vim/.vim/lua/plugins/rust.lua
@@ -1,24 +1,21 @@
 return {
 	{
-		"vxpm/ferris.nvim",
-		ft = "rust",
-		config = function()
-			local capabilities = vim.lsp.protocol.make_client_capabilities()
-			capabilities.offsetEncoding = { "utf-16" }
-			require("lspconfig").rust_analyzer.setup({
-				-- offset_encoding = "utf-8",
-				-- capabilities,
-				settings = { ["rust-analyzer"] = {} },
-			})
-		end,
+		"mrcjkb/rustaceanvim",
+		version = "^5", -- Recommended
+		lazy = false, -- This plugin is already lazy
 	},
 	{
 		"saecki/crates.nvim",
 		ft = "rust",
-		version = "v0.3.0",
 		dependencies = { "nvim-lua/plenary.nvim" },
 		config = function()
-			require("crates").setup()
+			require("crates").setup({
+				completion = {
+					cmp = {
+						enabled = true,
+					},
+				},
+			})
 		end,
 	},
 }