added odin to overseer

lua/config/lazy.lua

@@ -6,7 +6,7 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
   if vim.v.shell_error ~= 0 then
     vim.api.nvim_echo({
       { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
-      { out, "WarningMsg" },
+      { out,                            "WarningMsg" },
       { "\nPress any key to exit..." },
     }, true, {})
     vim.fn.getchar()
@@ -30,8 +30,6 @@ require("lazy").setup({
         colorscheme = "catppuccin-mocha",
       },
     },
-    -- Import LazyVim extras for the picker
-    { import = "lazyvim.plugins.extras.editor.telescope" },
     -- Import LazyVim extras for languages
     { import = "lazyvim.plugins.extras.lang.go" },
     { import = "lazyvim.plugins.extras.lang.json" },

lua/plugins/editor.lua

@@ -82,7 +82,6 @@ return {
         { "<leader>D", group = "Database" },
         { "<leader>f", group = "Find" },
         { "<leader>g", group = "Git" },
-        { "<leader>gx", group = "Conflict" },
         { "<leader>o", group = "Overseer" },
         { "<leader>s", group = "Search / Symbols" },
         { "<leader>t", group = "Test" },

lua/plugins/git.lua

@@ -12,67 +12,4 @@ return {
       },
     },
   },
-  {
-    "madmaxieee/unclash.nvim",
-    lazy = false,
-    opts = {
-      action_buttons = {
-        enabled = true,
-      },
-      annotations = {
-        enabled = true,
-      },
-    },
-    keys = {
-      {
-        "]x",
-        function()
-          require("unclash").next_conflict()
-        end,
-        desc = "Next Conflict",
-      },
-      {
-        "[x",
-        function()
-          require("unclash").prev_conflict()
-        end,
-        desc = "Prev Conflict",
-      },
-      {
-        "<leader>gxc",
-        function()
-          require("unclash").accept_current()
-        end,
-        desc = "Accept Current (Conflict)",
-      },
-      {
-        "<leader>gxi",
-        function()
-          require("unclash").accept_incoming()
-        end,
-        desc = "Accept Incoming (Conflict)",
-      },
-      {
-        "<leader>gxb",
-        function()
-          require("unclash").accept_both()
-        end,
-        desc = "Accept Both (Conflict)",
-      },
-      {
-        "<leader>gxm",
-        function()
-          require("unclash").open_merge_editor()
-        end,
-        desc = "Open Merge Editor (Conflict)",
-      },
-      {
-        "<leader>gxp",
-        function()
-          require("unclash.snacks").pick()
-        end,
-        desc = "Pick Conflicts (Snacks)",
-      },
-    },
-  },
 }

renovate.json

@@ -1,3 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json"
-}