Merge branch 'master' of https://gitea.brudi.xyz/kenobi/dotfiles

nvim/lazy-lock.json

@@ -49,4 +49,3 @@
   "vim-illuminate": { "branch": "master", "commit": "76f28e858f1caae87bfa45fb4fd09e4b053fc45b" },
   "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" },
   "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" }
-}

nvim/lua/config/keymaps.lua

@@ -18,3 +18,5 @@ end
 
 map("t", "<Esc><Esc>", [[<C-\><C-n>]], {})
 map("", "tl", require("lsp_lines").toggle, { desc = "Toggle lsp_lines" })
+map("n", "mgg", ":diffget //2<CR>", {})
+map("n", "mgh", ":diffget //3<CR>", {})

nvim/lua/config/lazy.lua

@@ -15,6 +15,7 @@ require("lazy").setup({
     -- { import = "lazyvim.plugins.extras.lang.json" },
     -- { import = "lazyvim.plugins.extras.ui.mini-animate" },
     -- import/override with your plugins
+    { import = "lazyvim.plugins.extras.dap.core" },
     { import = "plugins" },
   },
   defaults = {

nvim/lua/config/options.lua

@@ -4,7 +4,6 @@
 --
 
 local opt = vim.opt
-local diag = vim.diagnostic
 opt.scrolloff = 999
-diag.config({ virtual_text = false })
+vim.diagnostic.config({ virtual_text = false })
 opt.title = true

nvim/lua/plugins/disabled.lua

@@ -0,0 +1,8 @@
+return {
+  "nvim-lspconfig",
+  opts = {
+    diagnostics = {
+      virtual_text = false,
+    },
+  },
+}

nvim/lua/plugins/fugitive.lua

@@ -0,0 +1,3 @@
+return {
+  "tpope/vim-fugitive",
+}