diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua
index b2e5dbdf..11dad762 100644
--- a/.config/nvim/lua/config/keymaps.lua
+++ b/.config/nvim/lua/config/keymaps.lua
@@ -74,8 +74,6 @@ map("n", "<leader>sp", ":Telescope lazy<CR>", { desc = "Plugins (Lazy)" })
 
 map("n", "<leader>si", ":Telescope import<CR>", { desc = "Imports" })
 
-map("n", "<leader>sI", ":Gitignore<CR>", { desc = "Gitignore" })
-
 map("n", "<leader>cC", ":ConformInfo<CR>", { desc = "Conform Info" })
 
 -- map(
diff --git a/.config/nvim/lua/plugins/diffview.lua b/.config/nvim/lua/plugins/diffview.lua
deleted file mode 100644
index 18cfcfb5..00000000
--- a/.config/nvim/lua/plugins/diffview.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-return {
-  {
-    "sindrets/diffview.nvim",
-    keys = {
-      { "<Leader>gdd", "<cmd>DiffviewFileHistory<CR>", desc = "Diff File History" },
-      { "<Leader>gdo", "<cmd>DiffviewOpen<CR>", desc = "Open Diff View" },
-      { "<Leader>gdc", "<cmd>DiffviewClose<CR>", desc = "Close Diff View" },
-    },
-    opts = {},
-  },
-}
diff --git a/.config/nvim/lua/plugins/git.lua b/.config/nvim/lua/plugins/git.lua
new file mode 100644
index 00000000..500beb15
--- /dev/null
+++ b/.config/nvim/lua/plugins/git.lua
@@ -0,0 +1,27 @@
+return {
+  {
+    "sindrets/diffview.nvim",
+    keys = {
+      { "<leader>gd", "<cmd>DiffviewFileHistory<CR>", desc = "Diff File History" },
+    },
+    opts = {},
+  },
+  {
+    "akinsho/git-conflict.nvim",
+    opts = {
+      default_mappings = false,
+      highlights = {
+        incoming = "DiffAdd",
+        current = "DiffText",
+      },
+    },
+    keys = {
+      { "<leader>gci", "<cmd>GitConflictChooseTheirs<cr>", desc = "Choose Their Changes" },
+      { "<leader>gco", "<cmd>GitConflictChooseOurs<cr>", desc = "Choose Our Changes" },
+      { "<leader>gcb", "<cmd>GitConflictChooseBoth<cr>", desc = "Choose Both changes" },
+      { "<leader>gcl", "<cmd>GitConflictListQf<cr>", desc = "Git Conflict Quicklist" },
+      { "[g", "<cmd>GitConflictPrevConflict<cr>", desc = "Prev Git Conflict" },
+      { "]g", "<cmd>GitConflictPrevConflict<cr>", desc = "Next Git Conflict" },
+    },
+  },
+}
diff --git a/.config/nvim/lua/plugins/gitignore.lua b/.config/nvim/lua/plugins/gitignore.lua
deleted file mode 100644
index ce319333..00000000
--- a/.config/nvim/lua/plugins/gitignore.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-return {
-    {
-        "wintermute-cell/gitignore.nvim",
-        cmd = "Gitignore",
-        requires = {
-            "nvim-telescope/telescope.nvim",
-        },
-    },
-}
diff --git a/.config/nvim/lua/plugins/hardtime.lua b/.config/nvim/lua/plugins/hardtime.lua
index f3acc3c4..07f66e96 100644
--- a/.config/nvim/lua/plugins/hardtime.lua
+++ b/.config/nvim/lua/plugins/hardtime.lua
@@ -3,6 +3,10 @@ return {
     "m4xshen/hardtime.nvim",
     dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim" },
     enabled = false,
+    event = "VeryLazy",
+    keys = {
+      { "<leader>uH", "<cmd>Hardtime toggle<CR>", desc = "Toggle Hardtime" },
+    },
     opts = {
       disabled_filetypes = {
         "qf",
@@ -12,11 +16,10 @@ return {
         "mason",
         "oil",
         "neo-tree",
-        "floaterm",
         "symbols-outline",
         "vim-be-good",
       },
-      disable_mouse = false,
+      restriction_mode = "hint",
       restricted_keys = {
         ["h"] = { "n", "x" },
         ["l"] = { "n", "x" },
diff --git a/.config/nvim/lua/plugins/rayso.lua b/.config/nvim/lua/plugins/rayso.lua
new file mode 100644
index 00000000..09113cca
--- /dev/null
+++ b/.config/nvim/lua/plugins/rayso.lua
@@ -0,0 +1,12 @@
+return {
+  {
+    "TobinPalmer/rayso.nvim",
+    cmd = { "Rayso" },
+    keys = {
+      { "<leader>cS", "<cmd>Rayso<cr>", desc = "Screenshot code" },
+    },
+    opts = {
+      open_cmd = "librewolf",
+    },
+  },
+}
diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua
index 44c31032..d1a4ab6f 100644
--- a/.config/nvim/lua/plugins/telescope.lua
+++ b/.config/nvim/lua/plugins/telescope.lua
@@ -116,8 +116,8 @@ return {
       { "<leader>fr", "<cmd>Telescope oldfiles<cr>", desc = "Recent" },
       { "<leader>fR", Util.telescope("oldfiles", { cwd = vim.loop.cwd() }), desc = "Recent (cwd)" },
       -- git
-      { "<leader>gc", "<cmd>Telescope git_commits<CR>", desc = "commits" },
-      { "<leader>gs", "<cmd>Telescope git_status<CR>", desc = "status" },
+      { "<leader>gC", "<cmd>Telescope git_commits<CR>", desc = "Commits" },
+      { "<leader>gs", "<cmd>Telescope git_status<CR>", desc = "Status" },
       -- search
       { '<leader>s"', "<cmd>Telescope registers<cr>", desc = "Registers" },
       {
diff --git a/.config/nvim/lua/plugins/which-key.lua b/.config/nvim/lua/plugins/which-key.lua
index 93fa8002..3a1ee84a 100644
--- a/.config/nvim/lua/plugins/which-key.lua
+++ b/.config/nvim/lua/plugins/which-key.lua
@@ -24,7 +24,6 @@ return {
         ["<leader>x"] = { name = "+diagnostics/quickfix" },
         ["<leader>cc"] = { name = "+compile" },
         ["<leader>cP"] = { name = "+packages" },
-        ["<leader>gd"] = { name = "+diff" },
         ["<leader>gw"] = { name = "+worktrees" },
         ["<leader>cR"] = { name = "+refactor" },
         ["<leader>D"] = { name = "+database" },
@@ -33,6 +32,7 @@ return {
         ["<leader>db"] = { name = "+Breakpoints" },
         ["<leader>sr"] = { name = "+replace" },
         ["<leader>dP"] = { name = "+python" },
+        ["<leader>gc"] = { name = "+conflicts" },
       },
     },
     config = function(_, opts)