nvim: migrate filer from fern to dirvish

3 files changed, 7 insertions, 39 deletions

diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 8c9320c..e6bbbd6 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -6,8 +6,6 @@
   "copilot.vim": { "branch": "release", "commit": "9484e35cf222e9360e05450622a884f95c662c4c" },
   "denops.vim": { "branch": "main", "commit": "c057cdff217e3f7de9f19c8da270b23523bb19a4" },
   "emmet-vim": { "branch": "master", "commit": "def5d57a1ae5afb1b96ebe83c4652d1c03640f4d" },
-  "fern-hijack.vim": { "branch": "master", "commit": "f65524899231b15528066744e714fb344abf0892" },
-  "fern.vim": { "branch": "main", "commit": "928d355e4c06e08eb3c9062485a661f1d37b01d1" },
   "foldCC.vim": { "branch": "master", "commit": "344335d27349b837d33dc7757de0cb7930ac33ae" },
   "hop.nvim": { "branch": "v2", "commit": "90db1b2c61b820e230599a04fedcd2679e64bd07" },
   "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
@@ -23,6 +21,7 @@
   "vim-altr": { "branch": "master", "commit": "fba055cf3b83a1ada5b05d694fbefd024aa93289" },
   "vim-asterisk": { "branch": "master", "commit": "77e97061d6691637a034258cc415d98670698459" },
   "vim-clang-format": { "branch": "master", "commit": "6b791825ff478061ad1c57b21bb1ed5a5fd0eb29" },
+  "vim-dirvish": { "branch": "master", "commit": "b660af1fa07fe1d44d4eb3ea5242334f6c2766ca" },
   "vim-easy-align": { "branch": "master", "commit": "12dd6316974f71ce333e360c0260b4e1f81169c3" },
   "vim-jplus": { "branch": "master", "commit": "6aaa729f4afeccf430eb3077034d362f5034aa10" },
   "vim-niceblock": { "branch": "master", "commit": "9302f527eefc0fde8df983cbb9710ad52c4213b5" },
diff --git a/.config/nvim/lua/init/05-appearance.lua b/.config/nvim/lua/init/05-appearance.lua
index e218252..3c184e6 100644
--- a/.config/nvim/lua/init/05-appearance.lua
+++ b/.config/nvim/lua/init/05-appearance.lua
@@ -123,30 +123,17 @@ function vimrc.statusline.filename(bufnr)
       return '*scratch*'
    end
 
-   local simplify_bufname
-   if vim.b[bufnr].fern then
-      simplify_bufname = function(bufname)
-         bufname = F['fern#fri#parse'](bufname).path
-         if vim.startswith(bufname, 'file://') then
-            bufname = bufname:sub(#'file://' + 1)
-         end
-         return bufname
-      end
-   else
-      simplify_bufname = function(bufname) return bufname end
-   end
-
-   local this_path = simplify_bufname(F.expand(('#%s:p'):format(bufnr)))
+   local this_path = F.expand(('#%s:p'):format(bufnr))
    local other_paths = {}
    for b = 1, F.bufnr('$') do
       if F.bufexists(b) and b ~= bufnr then
-         other_paths[#other_paths+1] = simplify_bufname(F.bufname(b))
+         other_paths[#other_paths+1] = F.bufname(b)
       end
    end
 
    local result = uniquify.uniquify(this_path, other_paths)
-   if vim.b[bufnr].fern then
-      return '[fern] ' .. result .. '/'
+   if vim.bo[bufnr].filetype == 'dirvish' then
+      return '[dir] ' .. result .. '/'
    else
       return result
    end
diff --git a/.config/nvim/lua/vimrc/plugins.lua b/.config/nvim/lua/vimrc/plugins.lua
index 092cae2..7b4f5dc 100644
--- a/.config/nvim/lua/vimrc/plugins.lua
+++ b/.config/nvim/lua/vimrc/plugins.lua
@@ -252,27 +252,9 @@ return {
          vim.keymap.set('n', 'gfa', '<Plug>(altr-forward)')
       end,
    },
-   -- Full-featured filer.
+   -- Simple filer.
    {
-      'lambdalisue/fern.vim',
-      lazy = true,
-      cmd = {'Fern'},
-      config = function()
-         local vimrc = require('vimrc')
-
-         vimrc.autocmd('FileType', {
-            pattern = {'fern'},
-            callback = function()
-               if vim.fn.hasmapto('<Plug>(fern-action-open:tabedit)', 'n') == 1 then
-                  vim.keymap.del('n', 't', { buffer = true })
-               end
-            end,
-         })
-      end,
-   },
-   -- Fern plugin: hijack Netrw.
-   {
-      'lambdalisue/fern-hijack.vim',
+      'justinmk/vim-dirvish',
    },
    -- Appearance {{{1
    -- Show highlight.