Update config file

1 files changed, 46 insertions, 15 deletions

diff --git a/init.lua b/init.lua
index 534e1b3..1864aee 100644
--- a/init.lua
+++ b/init.lua
@@ -1,8 +1,9 @@
--- require("config.lsp")
+---@diagnostic disable: undefined-global
 local option = vim.opt
 local keymap = vim.keymap
 vim.g.loaded_netrw = 1
 vim.g.loaded_netrwPlugin = 1
+vim.g.rustfmt_autosave = 1
 
 --Basic Editor Setup
 option.nu = true
@@ -11,6 +12,7 @@ option.softtabstop = 2
 option.shiftwidth = 2
 option.expandtab = true
 option.smartindent = true
+option.ruler = false
 option.wrap = false
 option.swapfile = false
 option.hlsearch = false
@@ -40,17 +42,7 @@ vim.g.vimtex_view_method = "zathura"
 vim.g.vimtex_compiler_method = "latexrun"
 vim.g.gitgutter_set_sign_backgrounds = 1
 
---Keybinds
-vim.g.mapleader = " "
-keymap.set("n", "<leader>e", vim.cmd.NvimTreeToggle)
-keymap.set("n", "<leader>z", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
-keymap.set("n", "<leader>a", "ggVG")
-keymap.set("n", "<leader>y", "cc")
-keymap.set("n", "<C-c>", "yy")
-keymap.set("n", "<C-v>", "p")
-keymap.set("n", "<C-z>", "u")
-keymap.set("v", "J", ":m '>+1<CR>gv=gv")
-keymap.set("v", "K", ":m '<-2<CR>gv=gv")
+
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
 if not vim.loop.fs_stat(lazypath) then
   vim.fn.system({
@@ -76,6 +68,10 @@ require("lazy").setup({
   "williamboman/mason.nvim",
   "nvim-tree/nvim-web-devicons",
   "williamboman/mason-lspconfig.nvim",
+  'nvimdev/lspsaga.nvim',
+  config = function()
+    require('lspsaga').setup({})
+  end,
   'nvim-telescope/telescope.nvim',
   tag = '0.1.5',
   dependencies = { 'nvim-lua/plenary.nvim' },
@@ -120,8 +116,27 @@ vim.api.nvim_create_autocmd("BufWritePre", {
 local lsp_servers = {
   clangd = {},
   lua_ls = {},
+  rust_analyzer = {
+    imports = {
+      granularity = {
+        group = 'module',
+      },
+      prefix = 'self',
+    },
+    cargo = {
+      buildScripts = {
+        enable = true,
+      },
+    },
+    procMacro = {
+      enable = true,
+    },
+  },
 }
 
+
+require('lspsaga').setup({})
+
 require("mason").setup()
 require("mason-lspconfig").setup {
   ensure_installed = lsp_servers,
@@ -142,9 +157,6 @@ for lsp, settings in pairs(lsp_servers) do
   }))
 end
 
-require("nvim-tree").setup()
-
--- OR setup with some options
 require("nvim-tree").setup({
   sort = {
     sorter = "case_sensitive",
@@ -189,8 +201,27 @@ highlight StatusLineNc ctermfg=none guifg=none
 highlight StatusLine ctermbg=none guibg=none
 highlight StatusLine ctermfg=none guifg=none
 
+highlight NvimTreeWinSeparator ctermfg=none guifg=none
+highlight CursorColumn ctermfg=none guifg=none
+highlight CursorLine ctermbg=none guibg=none
+
+highlight VertSplit ctermbg=none guibg=none
+
 highlight DiagnosticVirtualTextError ctermbg=none guibg=none
 highlight DiagnosticVirtualTextWarn ctermbg=none guibg=none
 highlight DiagnosticVirtualTextInfo ctermbg=none guibg=none
 highlight DiagnosticVirtualTextHint ctermbg=none guibg=none
 ]])
+
+--Keybinds
+vim.g.mapleader = " "
+keymap.set("n", "<leader>e", vim.cmd.NvimTreeToggle)
+keymap.set("n", "<leader>z", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
+keymap.set("n", "<leader>a", "ggVG")
+keymap.set("n", "<leader>y", "cc")
+keymap.set("n", "<C-c>", "yy")
+keymap.set("n", "<C-v>", "p")
+keymap.set("n", "<C-z>", "u")
+keymap.set("v", "J", ":m '>+1<CR>gv=gv")
+keymap.set("v", "K", ":m '<-2<CR>gv=gv")
+keymap.set("n", "<leader>ca", "<cmd>Lspsaga code_action<cr>")