Revert "disable oil, enable mini.files"

This reverts commit 75eae3f174.

nvim/.config/nvim/README.md

@@ -54,6 +54,20 @@ Git shortcuts:
 - `[h`, `]h`, `[H`, `]H` jump to hunks
 - `<leader>th` — toggle the expanded hunk view
 
+Refresh shortcuts (oil and buffers):
+
+- `gR` refresh the current buffer
+- `<F5>` refresh the current buffer
+
+Oil usage:
+
+- `<leader>dl` opens the file browser
+- `-`, `<BS>` goes to the parent directory
+- `<A-h>` also goes to the parent directory
+- `<A-l>` opens the selected file or enters the selected directory
+- `<C-p>` previews the selected entry
+- `gx` opens the file in external viewer
+
 Toggle shortcuts:
 
 - `<leader>tw` toggle soft wrap

nvim/.config/nvim/lua/romanzy/keymaps.lua

@@ -29,7 +29,7 @@ end
 
 map("n", "<leader><leader>r", ":source ~/.config/nvim/init.lua<CR>", { desc = "reload init.lua" })
 map("n", "<leader><leader>h", telescope_picker("keymaps"), { desc = "show keymaps" })
-map("n", "<leader>e", open_mini_files_at_current_buffer, { desc = "open mini.files" })
+map("n", "<leader>dl", "<Cmd>Oil<CR>", { desc = "open oil" })
 map("n", "<leader>ff", telescope_picker("find_files"), { desc = "find files" })
 map("n", "<leader>fg", telescope_picker("live_grep"), { desc = "live grep" })
 map("n", "<leader>fb", telescope_picker("buffers"), { desc = "find buffers" })

nvim/.config/nvim/lua/romanzy/plugins/mini.lua

@@ -10,7 +10,7 @@ local icons = require("mini.icons")
 local input = require("mini.input")
 local clue = require("mini.clue")
 local completion = require("mini.completion")
-local files = require("mini.files")
+local icons = require("mini.icons")
 local git = require("mini.git")
 local diff = require("mini.diff")
 local statusline = require("mini.statusline")
@@ -56,7 +56,7 @@ clue.setup({
     },
 })
 
-files.setup(require("romanzy.custom.mini_files").setup())
+icons.setup({})
 
 git.setup({})
 

nvim/.config/nvim/lua/romanzy/plugins/oil.lua

@@ -1,89 +1,89 @@
--- vim.pack.add({
---     {
---         src = "https://github.com/stevearc/oil.nvim",
---         name = "oil.nvim",
---     },
---     {
---         src = "https://github.com/malewicz1337/oil-git.nvim",
---         name = "oil-git.nvim",
---     },
--- })
---
--- local function set_oil_git_highlights()
---     vim.api.nvim_set_hl(0, "OilGitAdded", { link = "MiniDiffSignAdd" })
---     vim.api.nvim_set_hl(0, "OilGitUntracked", { link = "MiniDiffSignAdd" })
---     vim.api.nvim_set_hl(0, "OilGitModifiedStaged", { link = "MiniDiffSignChange" })
---     vim.api.nvim_set_hl(0, "OilGitModifiedUnstaged", { link = "MiniDiffSignChange" })
---     vim.api.nvim_set_hl(0, "OilGitRenamed", { link = "MiniDiffSignChange" })
---     vim.api.nvim_set_hl(0, "OilGitCopied", { link = "MiniDiffSignChange" })
---     vim.api.nvim_set_hl(0, "OilGitDeleted", { link = "MiniDiffSignDelete" })
---     vim.api.nvim_set_hl(0, "OilGitConflict", { link = "MiniDiffSignDelete" })
---     vim.api.nvim_set_hl(0, "OilGitIgnored", { link = "Comment" })
--- end
---
--- require("oil").setup({
---     keymaps = {
---         ["<C-h>"] = false,
---         ["<C-j>"] = false,
---         ["<C-k>"] = false,
---         ["<C-l>"] = false,
---         ["gR"] = "actions.refresh", -- replaces default <C-l> behavior
---         ["<F5>"] = "actions.refresh",
---         ["<C-s>"] = false,
---         ["<C-p>"] = { "actions.preview", opts = { vertical = true, split = "belowright" } },
---         ["<BS>"] = { "actions.parent", mode = "n" },
---     },
---     view_options = {
---         show_hidden = true,
---         is_hidden_file = function(_, _)
---             return false
---         end,
---         is_always_hidden = function(name, _)
---             return name == ".git"
---         end,
---     },
--- })
---
--- local oil_git_trie = require("oil-git.trie")
--- local oil_git_lookup = oil_git_trie.lookup
---
--- -- ugly internal monkey patch to not show partially git-ignored foldres as grey
--- rawset(oil_git_trie, "lookup", function(root, entry_path, git_root, exclude_ignored)
---     local status = oil_git_lookup(root, entry_path, git_root, exclude_ignored)
---     if status ~= "!!" or exclude_ignored then
---         return status
---     end
---
---     local relative_path = entry_path:sub(#git_root + 2)
---     local node = root
---     for segment in relative_path:gmatch("[^/\\]+") do
---         node = node.children[segment]
---         if not node then
---             return nil
---         end
---     end
---
---     -- oil-git normally propagates an ignored child's status to every parent.
---     -- Only grey a directory when Git reported that directory itself as ignored.
---     if not node.is_dir_ignored then
---         return nil
---     end
---
---     return status
--- end)
---
--- require("oil-git").setup({
---     show_file_highlights = true,
---     show_directory_highlights = true,
---     show_ignored_files = true,
---     show_ignored_directories = true,
---     show_file_symbols = true,
---     show_directory_symbols = true,
---     symbol_position = "none",
--- })
---
--- set_oil_git_highlights()
--- vim.api.nvim_create_autocmd("ColorScheme", {
---     group = vim.api.nvim_create_augroup("romanzy_oil_git_highlights", { clear = true }),
---     callback = set_oil_git_highlights,
--- })
+vim.pack.add({
+    {
+        src = "https://github.com/stevearc/oil.nvim",
+        name = "oil.nvim",
+    },
+    {
+        src = "https://github.com/malewicz1337/oil-git.nvim",
+        name = "oil-git.nvim",
+    },
+})
+
+local function set_oil_git_highlights()
+    vim.api.nvim_set_hl(0, "OilGitAdded", { link = "MiniDiffSignAdd" })
+    vim.api.nvim_set_hl(0, "OilGitUntracked", { link = "MiniDiffSignAdd" })
+    vim.api.nvim_set_hl(0, "OilGitModifiedStaged", { link = "MiniDiffSignChange" })
+    vim.api.nvim_set_hl(0, "OilGitModifiedUnstaged", { link = "MiniDiffSignChange" })
+    vim.api.nvim_set_hl(0, "OilGitRenamed", { link = "MiniDiffSignChange" })
+    vim.api.nvim_set_hl(0, "OilGitCopied", { link = "MiniDiffSignChange" })
+    vim.api.nvim_set_hl(0, "OilGitDeleted", { link = "MiniDiffSignDelete" })
+    vim.api.nvim_set_hl(0, "OilGitConflict", { link = "MiniDiffSignDelete" })
+    vim.api.nvim_set_hl(0, "OilGitIgnored", { link = "Comment" })
+end
+
+require("oil").setup({
+    keymaps = {
+        ["<C-h>"] = false,
+        ["<C-j>"] = false,
+        ["<C-k>"] = false,
+        ["<C-l>"] = false,
+        ["gR"] = "actions.refresh", -- replaces default <C-l> behavior
+        ["<F5>"] = "actions.refresh",
+        ["<C-s>"] = false,
+        ["<C-p>"] = { "actions.preview", opts = { vertical = true, split = "belowright" } },
+        ["<BS>"] = { "actions.parent", mode = "n" },
+    },
+    view_options = {
+        show_hidden = true,
+        is_hidden_file = function(_, _)
+            return false
+        end,
+        is_always_hidden = function(name, _)
+            return name == ".git"
+        end,
+    },
+})
+
+local oil_git_trie = require("oil-git.trie")
+local oil_git_lookup = oil_git_trie.lookup
+
+-- ugly internal monkey patch to not show partially git-ignored foldres as grey
+rawset(oil_git_trie, "lookup", function(root, entry_path, git_root, exclude_ignored)
+    local status = oil_git_lookup(root, entry_path, git_root, exclude_ignored)
+    if status ~= "!!" or exclude_ignored then
+        return status
+    end
+
+    local relative_path = entry_path:sub(#git_root + 2)
+    local node = root
+    for segment in relative_path:gmatch("[^/\\]+") do
+        node = node.children[segment]
+        if not node then
+            return nil
+        end
+    end
+
+    -- oil-git normally propagates an ignored child's status to every parent.
+    -- Only grey a directory when Git reported that directory itself as ignored.
+    if not node.is_dir_ignored then
+        return nil
+    end
+
+    return status
+end)
+
+require("oil-git").setup({
+    show_file_highlights = true,
+    show_directory_highlights = true,
+    show_ignored_files = true,
+    show_ignored_directories = true,
+    show_file_symbols = true,
+    show_directory_symbols = true,
+    symbol_position = "none",
+})
+
+set_oil_git_highlights()
+vim.api.nvim_create_autocmd("ColorScheme", {
+    group = vim.api.nvim_create_augroup("romanzy_oil_git_highlights", { clear = true }),
+    callback = set_oil_git_highlights,
+})