feat: update some stuff

configs/nvim/lua/core/keymappings.lua

@@ -14,7 +14,7 @@ g.mapleader = " "
 -- Allows to easily exit terminal mode
 -- map('t', '<Esc>', [[<C-\><C-n>]], remap)
 
-map("n", "<C-o>", ":Telescope find_files<CR>", options)
+map("n", "<C-o>", ":Telescope find_files preview={timeout=1000}<CR>", options)
 map("n", "<C-f>", ":lua require'telescope.builtin'.live_grep{ cwd = vim.fn.getcwd() }<CR>", options)
 -- map("n", "<C-p>", ":Telescope command_center<CR>", options)
 map("n", "<Leader><Leader>", "za", remap)
@@ -28,15 +28,14 @@ map("n", "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>", options)
 
 map("n", "K", "<cmd>Lspsaga hover_doc<CR>", { silent = true })
 -- map("n", "<leader>o", "<cmd>LSoutlineToggle<CR>", { silent = true })
-map("n", "<leader>e", "<cmd>Lspsaga show_cursor_diagnostics<CR>", { silent = true })
-map("n", "<Leader>rn", "<cmd>Lspsaga rename<CR>", options)
+map("n", "<leader>e", "<cmd>lua vim.lsp.buf.hover()<CR>", { silent = true })
+map("n", "<Leader>rn", "<cmd>lua vim.lsp.buf.rename()<CR>", options)
 map({ "n", "v" }, "<leader>c", "<cmd>Lspsaga code_action<CR>", { silent = true })
-map({ "n", "v" }, "gr", "Lspsaga lsp_finder<CR>", options)
+map({ "n", "v" }, "gr", "<cmd>Lspsaga lsp_finder<CR>", options)
 
 map("n", "<leader>t", ":TroubleToggle<CR>", remap)
 
-map("n", "<leader>t", translate, remap)
-map("v", "<leader>t", translate, remap)
+map({ "n", "v" }, "<leader>t", translate, remap)
 
 -- DAP Functionality
 map("n", "<Leader>b", ":lua require('dap').toggle_breakpoint()<CR>", options)

configs/nvim/lua/core/options.lua

@@ -2,7 +2,7 @@
 -- General --
 -------------
 local set = vim.opt
-local g = vim.g;
+local g = vim.g
 set.swapfile = false -- Don't use swapfile
 set.updatetime = 0 -- Faster completion
 set.encoding = "utf-8" -- The encoding displayed
@@ -73,6 +73,6 @@ vim.diagnostic.config({
 -----------------
 set.hidden = true -- Required to keep multiple buffers open multiple buffers
 set.timeoutlen = 500 -- By default timeoutlen is 1000 ms
-set.lazyredraw = true -- Disable lazyredraw
+set.lazyredraw = false -- Disable lazyredraw
 set.synmaxcol = 240 -- Max column for syntax highlight
 set.updatetime = 700 -- ms to wait for trigger an event

configs/nvim/lua/core/plugins.lua

@@ -41,15 +41,22 @@ return packer.startup(function(use)
     "petertriho/nvim-scrollbar",
     config = function()
       require("configs.scrollbar")
-    end
+    end,
   })
   use({
     "lewis6991/gitsigns.nvim",
     config = function()
-      require('gitsigns').setup()
-    end
+      require("gitsigns").setup()
+    end,
   })
   use("akinsho/nvim-toggleterm.lua")
+  use({
+    "akinsho/git-conflict.nvim",
+    tag = "*",
+    config = function()
+      require("git-conflict").setup()
+    end,
+  })
 
   use({
     "rcarriga/nvim-notify",
@@ -102,12 +109,8 @@ return packer.startup(function(use)
   -- Lsp Setup --
   ---------------
 
+  use("arkav/lualine-lsp-progress")
   use("neovim/nvim-lspconfig")
-  use({ 'j-hui/fidget.nvim',
-    config = function()
-      require('fidget').setup()
-    end
-  })
   use("williamboman/mason.nvim")
   use("williamboman/mason-lspconfig.nvim")
   use("jose-elias-alvarez/null-ls.nvim")
@@ -137,7 +140,6 @@ return packer.startup(function(use)
   use({
     "hrsh7th/nvim-cmp",
     requires = {
-
       "rafamadriz/friendly-snippets",
       "saadparwaiz1/cmp_luasnip",
       "L3MON4D3/LuaSnip",
@@ -205,7 +207,8 @@ return packer.startup(function(use)
   --------------------
   -- IDE Type Stuff --
   --------------------
-  use({ "ThePrimeagen/git-worktree.nvim",
+  use({
+    "ThePrimeagen/git-worktree.nvim",
     config = function()
       require("git-worktree").setup()
     end,
@@ -220,7 +223,7 @@ return packer.startup(function(use)
   -- Dap Debugger -- Have not yet been able to set this up
   use({ "mfussenegger/nvim-dap" })
   use({ "rcarriga/nvim-dap-ui" })
-  use { "mxsdev/nvim-dap-vscode-js", requires = { "mfussenegger/nvim-dap" } }
+  use({ "mxsdev/nvim-dap-vscode-js", requires = { "mfussenegger/nvim-dap" } })
 
   use("editorconfig/editorconfig-vim")
   use({