oil ftw

diff --git a/init.lua b/init.lua
index 59b0b13fc3939b86352aa7e2ce2a9574b57f84c4..03e28868fc0df12c45e1880a03788442365dbb7f 100644 (file)
--- a/init.lua
+++ b/init.lua
@@ -24,7 +24,7 @@ vim.cmd.colorscheme('codeclocks')
 
 -- Autocmd ============================================================================================================
 vim.api.nvim_create_autocmd("BufRead", {
-  pattern = "*", -- Apply to all files
+  pattern = "*",
   callback = function()
     if vim.fn.haslocaldir() == 1 then
       vim.cmd("silent! loadview")

diff --git a/lazy-lock.json b/lazy-lock.json
index b16515f0e6e8dd62c2552c262e3270c04015ec1b..3ed0b3cd1e5594686c96f2157b450daba6e72005 100644 (file)
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -6,12 +6,14 @@
   "lualine.nvim": { "branch": "master", "commit": "1517caa8fff05e4b4999857319d3b0609a7f57fa" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "43894adcf10bb1190c2184bd7c1750e8ea2b3dce" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
+  "mini.icons": { "branch": "main", "commit": "86a633f0dffcfd80110bac86681dbf4b5c37ba5c" },
   "neogit": { "branch": "master", "commit": "89d13fb9898619774d359a3900959181d60dd02f" },
   "no-neck-pain.nvim": { "branch": "main", "commit": "53c8ef094c86e8897be2dcce0259d35914f6cdc0" },
   "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
   "nvim-lspconfig": { "branch": "master", "commit": "f012c1b176f0e3c71f40eb309bdec0316689462e" },
   "nvim-treesitter": { "branch": "master", "commit": "37427012d1c77c544356bfff0c9acc88fd3256bc" },
   "nvim-web-devicons": { "branch": "master", "commit": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c" },
+  "oil.nvim": { "branch": "master", "commit": "ab887d926c2665a708fbe9e6c4654042cc5f4c60" },
   "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
   "render-markdown.nvim": { "branch": "main", "commit": "7f0143e9adf7140c8e3fa33a5bdf193d7a8f0429" },
   "telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" }

diff --git a/lua/keybindings.lua b/lua/keybindings.lua
index d2dda4f471f92143127adb1e8eef80ad95bdc7e0..fd8d440e41e589fc8ece18d0fa5cfb476bb9578b 100644 (file)
--- a/lua/keybindings.lua
+++ b/lua/keybindings.lua
@@ -4,8 +4,8 @@ P.setup = function()
   vim.g.mapleader = vim.keycode ' '
 
   -- Utils
-  vim.keymap.set('n', '<leader>H', function() vim.cmd [[nohl]] end)
-  vim.keymap.set('n', '<leader>`', function() vim.cmd [[Neogit]] end)
+  vim.keymap.set('n', '<leader>H', function() vim.cmd("nohl") end)
+  vim.keymap.set('n', '<leader>`', function() vim.cmd("Neogit") end)
 
   vim.keymap.set('n', '<leader>[', function()
     if (vim.api.nvim_get_option_value("number", {})) then
@@ -18,73 +18,44 @@ P.setup = function()
   end)
 
   -- Find (fzf)
-  vim.keymap.set('n', '<leader>ff', function() vim.cmd [[FzfLua files]] end)
-  vim.keymap.set('n', '<leader>ft', function() vim.cmd [[FzfLua grep_visual]] end)
-  vim.keymap.set('n', '<leader>fm', function() vim.cmd [[FzfLua marks]] end)
+  vim.keymap.set('n', '<leader>ff', function() vim.cmd("FzfLua files") end)
+  vim.keymap.set('n', '<leader>ft', function() vim.cmd("FzfLua grep_visual") end)
+  vim.keymap.set('n', '<leader>fm', function() vim.cmd("FzfLua marks") end)
 
   -- Buffers/Windows (inplace)
-  local function open_term()
-    vim.cmd [[term]]
-    vim.cmd [[startinsert]]
-  end
+  local function open_term() vim.cmd("term | startinsert") end
 
-  vim.keymap.set('n', '<leader>e', function() vim.cmd [[Explore]] end)
-  vim.keymap.set('n', '<leader>c', function() vim.cmd [[quit]] end)
+  vim.keymap.set('n', '<leader>e', function() vim.cmd("Oil") end)
+  vim.keymap.set('n', '<leader>c', function() vim.cmd("quit") end)
   vim.keymap.set('n', '<leader>T', open_term)
 
   -- Buffers/Windows (horizontal)
-  vim.keymap.set('n', '<leader>se', function() vim.cmd [[Hexplore]] end)
-  vim.keymap.set('n', '<leader>ss', function()
-    vim.cmd [[split]]
-    vim.cmd [[wincmd j]]
-  end)
+  vim.keymap.set('n', '<leader>se', function() vim.cmd("split | wincmd j | Oil") end)
+  vim.keymap.set('n', '<leader>ss', function() vim.cmd("split | wincmd j") end)
   vim.keymap.set('n', '<leader>sT', function()
-    vim.cmd [[split]]
-    vim.cmd [[wincmd j]]
+    vim.cmd("split | wincmd j")
     open_term()
   end)
 
   -- Buffers/Windows (vertical)
-  vim.keymap.set('n', '<leader>ve', function() vim.cmd [[Vexplore!]] end)
-  vim.keymap.set('n', '<leader>vs', function()
-    vim.cmd [[vsplit]]
-    vim.cmd [[wincmd l]]
-  end)
+  vim.keymap.set('n', '<leader>ve', function() vim.cmd("vsplit | wincmd l | Oil") end)
+  vim.keymap.set('n', '<leader>vs', function() vim.cmd("vsplit | wincmd l") end)
   vim.keymap.set('n', '<leader>vT', function()
-    vim.cmd [[vsplit]]
-    vim.cmd [[wincmd l]]
+    vim.cmd("vsplit | wincmd l")
     open_term()
   end)
 
   -- Tabs
-  local function open_texplore()
-    vim.cmd [[Texplore]]
-  end
-  local function open_tterm()
-    vim.cmd [[tabnew]]
-    vim.cmd [[term]]
-    vim.cmd [[startinsert]]
-  end
-  local function next_tab()
-    vim.cmd [[tabn]]
-  end
-  local function prev_tab()
-    vim.cmd [[tabp]]
-  end
-  local function new_tab()
-    vim.cmd [[tabnew]]
-  end
-
   local function close_tab()
     local total_tabs = #vim.api.nvim_list_tabpages()
     if total_tabs > 1 then vim.cmd [[tabc]] end
   end
-  vim.keymap.set('n', '<leader>te', open_texplore)
-  vim.keymap.set('n', '<leader>tn', next_tab)
-  vim.keymap.set('n', '<leader>tp', prev_tab)
-  vim.keymap.set('n', '<leader>tT', open_tterm)
+  vim.keymap.set('n', '<leader>te', function() vim.cmd("tabnew | Oil") end)
+  vim.keymap.set('n', '<leader>tn', function() vim.cmd("tabn") end)
+  vim.keymap.set('n', '<leader>tp', function() vim.cmd("tabp") end)
+  vim.keymap.set('n', '<leader>tT', function() vim.cmd("tabnew | term | startinsert") end)
+  vim.keymap.set('n', '<leader>tN', function() vim.cmd("tabnew") end)
   vim.keymap.set('n', '<leader>tc', close_tab)
-  vim.keymap.set('n', '<leader>tN', new_tab)
 end
 
 return P

diff --git a/lua/plugins.lua b/lua/plugins.lua
index 552539d7f891b7e0a2aeec2c03c8c9abae827091..2933513960769ee539615600085215b02bd2791e 100644 (file)
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -15,8 +15,25 @@ vim.opt.rtp:prepend(lazypath)
 
 require("lazy").setup({
   { "ibhagwan/fzf-lua" },
-  { "shortcuts/no-neck-pain.nvim", version = "*" },
+  { "shortcuts/no-neck-pain.nvim",               version = "*" },
   { 'MeanderingProgrammer/render-markdown.nvim', opts = {} },
+  {
+    'stevearc/oil.nvim',
+    opts = {},
+    dependencies = { { "echasnovski/mini.icons", opts = {} } },
+    lazy = false,
+    config = function()
+      require("oil").setup({
+        win_options = {
+          winbar = "%{v:lua.require('oil').get_current_dir()}",
+        },
+        columns = { "icon", "type", "size", "mtime" },
+        view_options = {
+          show_hidden = true,
+        }
+      })
+    end
+  },
   {
     'nvim-lualine/lualine.nvim',
     dependencies = { 'nvim-tree/nvim-web-devicons' },