From a9af3cd9e5a0eec7f68c81c6fb050ca60f9b07ec Mon Sep 17 00:00:00 2001 From: Oliver Davies <oliver@oliverdavies.dev> Date: Mon, 17 Mar 2025 23:05:33 +0000 Subject: [PATCH] Revert "Remove oil.nvim" This reverts commit 30880dd786173ec17ab084366148fba89137e03f. --- nix/modules/home-manager/cli/neovim.nix | 1 + nvim/after/ftplugin/netrw.lua | 5 ----- nvim/plugin/netrw.lua | 5 ++++- nvim/plugin/oil.lua | 16 ++++++++++++++++ 4 files changed, 21 insertions(+), 6 deletions(-) delete mode 100644 nvim/after/ftplugin/netrw.lua create mode 100644 nvim/plugin/oil.lua diff --git a/nix/modules/home-manager/cli/neovim.nix b/nix/modules/home-manager/cli/neovim.nix index 747c14e3..206fcdac 100644 --- a/nix/modules/home-manager/cli/neovim.nix +++ b/nix/modules/home-manager/cli/neovim.nix @@ -27,6 +27,7 @@ in harpoon2 mini-nvim nvim-web-devicons + oil-nvim phpactor refactoring-nvim standard-vim diff --git a/nvim/after/ftplugin/netrw.lua b/nvim/after/ftplugin/netrw.lua deleted file mode 100644 index 591d53c9..00000000 --- a/nvim/after/ftplugin/netrw.lua +++ /dev/null @@ -1,5 +0,0 @@ -local opt = vim.opt_local - -opt.cursorline = false -opt.number = true -opt.relativenumber = true diff --git a/nvim/plugin/netrw.lua b/nvim/plugin/netrw.lua index ff775278..1feb376d 100644 --- a/nvim/plugin/netrw.lua +++ b/nvim/plugin/netrw.lua @@ -1,3 +1,6 @@ -vim.keymap.set("n", "-", vim.cmd.Ex) +vim.keymap.set("n", "<leader>pv", vim.cmd.Ex) vim.g.netrw_banner = 0 +vim.g.netrw_browse_split = 0 +vim.g.netrw_liststyle = 3 +vim.g.netrw_winsize = 20 diff --git a/nvim/plugin/oil.lua b/nvim/plugin/oil.lua new file mode 100644 index 00000000..5799eb20 --- /dev/null +++ b/nvim/plugin/oil.lua @@ -0,0 +1,16 @@ +require("oil").setup { + columns = { "icon" }, + + keymaps = { + ["<C-h>"] = false, + ["<M-h>"] = "actions.select_split", + }, + + skip_confirm_for_simple_edits = true, + + view_options = { + show_hidden = true, + }, +} + +vim.keymap.set("n", "-", "<Cmd>Oil<cr>", { desc = "Open parent directory" })