X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/12678e61610c212cc1c3f0b601f5d15dc5f23f64..c4b190f4d9decd70fb423e2b6263c1f7faf13259:/nvim/lua/plugins/editor.lua

diff --git a/nvim/lua/plugins/editor.lua b/nvim/lua/plugins/editor.lua
index 1ec7312..3ee014b 100644
--- a/nvim/lua/plugins/editor.lua
+++ b/nvim/lua/plugins/editor.lua
@@ -1,24 +1,22 @@
-local Util = require("lazyvim.util")
-
 ---@type LazyPluginSpec
 return {
   {
     "nvim-telescope/telescope.nvim",
     keys = {
-      { "<leader>fF", Util.telescope("files", { cwd = false }), desc = "Find Files (cwd)" },
+      { "<leader>fF", LazyVim.pick("files", { cwd = false }), desc = "Find Files (cwd)" },
       -- from lazyvim
       { "<leader>,", "<cmd>Telescope buffers show_all_buffers=true<cr>", desc = "Switch Buffer" },
-      { "<leader>/", Util.telescope("live_grep"), desc = "Grep (root dir)" },
+      { "<leader>/", LazyVim.pick("live_grep"), desc = "Grep (root dir)" },
       { "<leader>:", "<cmd>Telescope command_history<cr>", desc = "Command History" },
-      { "<leader><space>", Util.telescope("files"), desc = "Find Files (root dir)" },
+      { "<leader><space>", LazyVim.pick("files"), desc = "Find Files (root dir)" },
       { "<leader><space>", false },
       -- find
       { "<leader>fb", "<cmd>Telescope buffers sort_lastused=true<CR>", desc = "Buffers" },
-      -- { "<leader>ff", Util.telescope("files"), desc = "Find Files (root dir)" },
+      -- { "<leader>ff", LazyVim.pick("files"), desc = "Find Files (root dir)" },
       { "<leader>ff", false }, -- fswitch
-      { "<leader>fF", Util.telescope("files", { cwd = false }), desc = "Find Files (cwd)" },
+      { "<leader>fF", LazyVim.pick("files", { cwd = false }), desc = "Find Files (cwd)" },
       { "<leader>fr", "<cmd>Telescope oldfiles<cr>", desc = "Recent" },
-      { "<leader>fR", Util.telescope("oldfiles", { cwd = vim.loop.cwd() }), desc = "Recent (cwd)" },
+      { "<leader>fR", LazyVim.pick("oldfiles", { cwd = vim.loop.cwd() }), desc = "Recent (cwd)" },
       -- git
       -- { "<leader>gc", "<cmd>Telescope git_commits<CR>", desc = "commits" },
       { "<leader>gc", false },
@@ -31,8 +29,8 @@ return {
       { "<leader>sC", "<cmd>Telescope commands<cr>", desc = "Commands" },
       { "<leader>sd", "<cmd>Telescope diagnostics bufnr=0<cr>", desc = "Document diagnostics" },
       { "<leader>sD", "<cmd>Telescope diagnostics<cr>", desc = "Workspace diagnostics" },
-      { "<leader>sg", Util.telescope("live_grep"), desc = "Grep (root dir)" },
-      { "<leader>sG", Util.telescope("live_grep", { cwd = false }), desc = "Grep (cwd)" },
+      { "<leader>sg", LazyVim.pick("live_grep"), desc = "Grep (root dir)" },
+      { "<leader>sG", LazyVim.pick("live_grep", { cwd = false }), desc = "Grep (cwd)" },
       { "<leader>sh", "<cmd>Telescope help_tags<cr>", desc = "Help Pages" },
       { "<leader>sH", "<cmd>Telescope highlights<cr>", desc = "Search Highlight Groups" },
       { "<leader>sk", "<cmd>Telescope keymaps<cr>", desc = "Key Maps" },
@@ -40,12 +38,12 @@ return {
       { "<leader>sm", "<cmd>Telescope marks<cr>", desc = "Jump to Mark" },
       { "<leader>so", "<cmd>Telescope vim_options<cr>", desc = "Options" },
       { "<leader>sR", "<cmd>Telescope resume<cr>", desc = "Resume" },
-      { "<leader>sw", Util.telescope("grep_string"), desc = "Word (root dir)" },
-      { "<leader>sW", Util.telescope("grep_string", { cwd = false }), desc = "Word (cwd)" },
-      { "<leader>uC", Util.telescope("colorscheme", { enable_preview = true }), desc = "Colorscheme with preview" },
+      { "<leader>sw", LazyVim.pick("grep_string"), desc = "Word (root dir)" },
+      { "<leader>sW", LazyVim.pick("grep_string", { cwd = false }), desc = "Word (cwd)" },
+      { "<leader>uC", LazyVim.pick("colorscheme", { enable_preview = true }), desc = "Colorscheme with preview" },
       -- {
       --   "<leader>ss",
-      --   Util.telescope("lsp_document_symbols", {
+      --   LazyVim.pick("lsp_document_symbols", {
       --     symbols = {
       --       "Class",
       --       "Function",
@@ -64,7 +62,7 @@ return {
       { "<leader>ss", false }, -- use for snippets below
       {
         "<leader>sS",
-        Util.telescope("lsp_dynamic_workspace_symbols", {
+        LazyVim.pick("lsp_dynamic_workspace_symbols", {
           symbols = {
             "Class",
             "Function",
@@ -92,8 +90,33 @@ return {
     end,
     keys = { { "<leader>ss", "<cmd>Telescope luasnip<cr>", desc = "Snippets" } },
   },
+  {
+    "stevearc/oil.nvim",
+    opts = {
+      keymaps = {
+        ["g?"] = "actions.show_help",
+        ["<CR>"] = "actions.select",
+        ["<C-s>"] = "actions.select_vsplit",
+        ["<C-h>"] = false,  -- used to be actions.select_split
+        ["<C-t>"] = "actions.select_tab",
+        ["<C-p>"] = "actions.preview",
+        ["<C-c>"] = "actions.close",
+        ["<C-l>"] = false, -- used to be actions.refresh
+        ["-"] = "actions.parent",
+        ["_"] = "actions.open_cwd",
+        ["`"] = "actions.cd",
+        ["~"] = "actions.tcd",
+        ["gs"] = "actions.change_sort",
+        ["gx"] = "actions.open_external",
+        ["g."] = "actions.toggle_hidden",
+        ["g\\"] = "actions.toggle_trash",
+      },
+    },
+    dependencies = {"nvim-tree/nvim-web-devicons"},
+  },
   {
     "neo-tree.nvim",
+    enabled = false,
     lazy = false,
     opts = {
       filesystem = {