diff options
Diffstat (limited to 'lua/plugins')
| -rw-r--r-- | lua/plugins/fugitive.lua | 6 | ||||
| -rw-r--r-- | lua/plugins/oil.lua | 34 |
2 files changed, 38 insertions, 2 deletions
diff --git a/lua/plugins/fugitive.lua b/lua/plugins/fugitive.lua index e52a4c6..56c525a 100644 --- a/lua/plugins/fugitive.lua +++ b/lua/plugins/fugitive.lua @@ -13,8 +13,10 @@ return { { "<leader>gp", "<cmd>G pull<CR>" }, -- G.it P.ull { "<leader>gf", "<cmd>G fetch<CR>" }, -- G.it F.etch { "<leader>ds", "<cmd>Gvdiffsplit!<CR>" }, -- G.it D.iff S.plit - { "<leader>dh", "<cmd>diffget //2<CR>" }, - { "<leader>dl", "<cmd>diffget //3<CR>" }, + { "<leader>dh", "<cmd>diffget //2 | diffupdate<CR>" }, + { "<leader>dl", "<cmd>diffget //3 | diffupdate<CR>" }, + { "<leader>de", "<cmd>only<CR>" }, -- D.iff E.xit + -- NOTE: dp (no leader) is already set to diffput | diffupdate by default }, }, { diff --git a/lua/plugins/oil.lua b/lua/plugins/oil.lua new file mode 100644 index 0000000..0a912b7 --- /dev/null +++ b/lua/plugins/oil.lua @@ -0,0 +1,34 @@ +return { + "stevearc/oil.nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, + config = function() + require("oil").setup({ + columns = { "icon" }, + keymaps = { + ["<C-h>"] = false, + ["<M-h>"] = "actions.select_split", + }, + view_options = { + show_hidden = true, + }, + }) + end, + keys = { + + { -- Floating Oil window + "<leader>-", + function() + require("oil").toggle_float() + end, + mode = "n", + desc = "Toggle floating Oil window", + }, + + { -- Open parent directory + "-", + "<cmd>Oil<CR>", + mode = "n", + desc = "Open parent directory", + }, + }, +} |