3 files changed, 47 insertions, 99 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>")
diff --git a/lua/config/editor.lua b/lua/config/editor.lua
index a4ce545..0649006 100644
--- a/lua/config/editor.lua
+++ b/lua/config/editor.lua
@@ -18,7 +18,7 @@ option.signcolumn = "number"
 option.autoindent = true
 option.clipboard = "unnamedplus"
 option.termguicolors = false
-option.fillchars='eob: '
+option.fillchars = 'eob: '
 
 -- Setup Editor Theme
 vim.cmd([[
diff --git a/lua/config/plugins.lua b/lua/config/plugins.lua
deleted file mode 100644
index dd09a4d..0000000
--- a/lua/config/plugins.lua
+++ /dev/null
@@ -1,83 +0,0 @@
--- vim.cmd([[packadd packer.nvim]])
--- return require("packer").startup(function(use)
---   use("neovim/nvim-lspconfig")
---   use("lervag/vimtex")
---   use({
---     "VonHeikemen/lsp-zero.nvim",
---     requires = {
---       { "neovim/nvim-lspconfig" },
---       { "williamboman/mason.nvim" },
---       { "williamboman/mason-lspconfig.nvim" },
---       { "hrsh7th/nvim-cmp" },
---       { "hrsh7th/cmp-buffer" },
---       { "hrsh7th/cmp-path" },
---       { "saadparwaiz1/cmp_luasnip" },
---       { "hrsh7th/cmp-nvim-lsp" },
---       { "hrsh7th/cmp-nvim-lua" },
---       { "rafamadriz/friendly-snippets" },
---     },
---   })
---   use({
---     "L3MON4D3/LuaSnip",
---     tag = "v2.*",
---     run = "make install_jsregexp",
---   })
---   use({
---     "iamcco/markdown-preview.nvim",
---     run = "cd app && npm install",
---     setup = function()
---       vim.g.mkdp_filetypes = { "markdown" }
---     end,
---     ft = { "markdown" },
---   })
---   use({
---     "windwp/nvim-autopairs",
---     config = function()
---       require("nvim-autopairs").setup({})
---     end,
---   })
--- end)
-
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
-  vim.fn.system({
-    "git",
-    "clone",
-    "--filter=blob:none",
-    "https://github.com/folke/lazy.nvim.git",
-    "--branch=stable", -- latest stable release
-    lazypath,
-  })
-end
-
-vim.opt.rtp:prepend(lazypath)
-require("lazy").setup({
-  "nvim-lua/plenary.nvim",
-  "airblade/vim-gitgutter",
-  "nvim-treesitter/nvim-treesitter",
-  "neovim/nvim-lspconfig",
-  'nvim-telescope/telescope.nvim', tag = '0.1.5',
-  dependencies = { 'nvim-lua/plenary.nvim' },
-  "windwp/nvim-autopairs",
-  config = function()
-    require("nvim-autopairs").setup({})
-  end,
-  { 'nvim-telescope/telescope-fzf-native.nvim', 
-  build = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build', 
-  keys= {
-    {"<leader>/", false},
-    { "<leader>f", "<cmd>Telescope find_files<cr>", desc = "Find Files" },
-    { "<leader>g", "<cmd>Telescope live_grep<cr>", desc = "Grep" },
-    { "<leader>b", "<cmd>Telescope buffers<cr>", desc = "Grep" },
-  }
-},
-{
-  'numToStr/Comment.nvim',
-  lazy = false,
-},
-
-{
-  "ms-jpq/coq_nvim", 
-}, 
-})
-