diff --git a/nvim/.config/nvim/lua/plugins/git.lua b/nvim/.config/nvim/lua/plugins/git.lua
index 1ba51bf..2b508e2 100644
--- a/nvim/.config/nvim/lua/plugins/git.lua
+++ b/nvim/.config/nvim/lua/plugins/git.lua
@@ -1,13 +1,23 @@
 return {
   -- Git
   {
-    "NeogitOrg/neogit",
+    'NeogitOrg/neogit',
     dependencies = {
-      "nvim-lua/plenary.nvim",
-      "sindrets/diffview.nvim",
-      "nvim-telescope/telescope.nvim",
+      'nvim-lua/plenary.nvim',
+      'sindrets/diffview.nvim',
+      'nvim-telescope/telescope.nvim',
     },
-    config = true
+    config = function()
+      local neogit = require('neogit')
+      neogit.setup()
+      vim.keymap.set('n', '<leader>go', neogit.open, { desc = 'Neo[g]it [O]pen' })
+      vim.keymap.set('n', '<leader>g.', function() neogit.open({ cwd = '%:p:h' }) end,
+        { desc = 'Neo[g]it open in current file repository' })
+      local diffview = require('diffview')
+      vim.keymap.set('n', '<leader>gh', diffview.file_history, { desc = '[G]it [H]istory' })
+      vim.keymap.set('n', '<leader>g%', function() diffview.file_history(nil, { '%' }) end,
+        { desc = '[G]it history for [%] current file' })
+    end
   },
 
   {
diff --git a/nvim/.config/nvim/lua/plugins/harpoon.lua b/nvim/.config/nvim/lua/plugins/harpoon.lua
index 6a072d9..f68a00c 100644
--- a/nvim/.config/nvim/lua/plugins/harpoon.lua
+++ b/nvim/.config/nvim/lua/plugins/harpoon.lua
@@ -6,7 +6,7 @@ return {
     config = function()
       local harpoon = require "harpoon"
       harpoon:setup()
-      vim.keymap.set('n', '<leader>i', function() harpoon:list():append() end, { desc = "Harpoon add new [I]tem" })
+      vim.keymap.set('n', '<leader>i', function() harpoon:list():add() end, { desc = "Harpoon add new [I]tem" })
       vim.keymap.set('n', '<leader>m', function() harpoon.ui:toggle_quick_menu(harpoon:list()) end,
         { desc = "Harpoon [M]enu" })
       for i = 1, 9, 1 do
diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua
index 5189765..aeed533 100644
--- a/nvim/.config/nvim/lua/plugins/init.lua
+++ b/nvim/.config/nvim/lua/plugins/init.lua
@@ -31,8 +31,11 @@ return {
     config = function()
       local tsj = require('treesj')
       tsj.setup({
-        vim.keymap.set('n', '<leader>T', tsj.toggle, { desc = "[T]oggle one-line" }),
+        use_default_keymaps = false,
       })
+      vim.keymap.set('n', '<leader>tg', tsj.toggle, { desc = "[T]ree to[g]gle one-line" })
+      vim.keymap.set('n', '<leader>tj', tsj.join, { desc = "[T]ree [J]oin one-line" })
+      vim.keymap.set('n', '<leader>ts', tsj.split, { desc = "[T]ree [S]plit one-line" })
     end,
   },
 }