From f8c4864659d8ffdb5c451b8f62866f80755e3eb0 Mon Sep 17 00:00:00 2001 From: 409 Date: Thu, 1 Aug 2024 12:23:27 +0200 Subject: [PATCH] feat: added oil --- init.lua | 1 - lazy-lock.json | 9 +++++---- lua/409/autocmd.lua | 5 ----- lua/409/plugins/navigation.lua | 27 +++++++++++++++++++++++++++ lua/409/plugins/statusline.lua | 2 +- lua/409/plugins/util.lua | 10 +++++----- lua/409/remap.lua | 2 +- 7 files changed, 39 insertions(+), 17 deletions(-) diff --git a/init.lua b/init.lua index 93ee423..84a7194 100644 --- a/init.lua +++ b/init.lua @@ -1,2 +1 @@ require("409").setup() - diff --git a/lazy-lock.json b/lazy-lock.json index 9bcbdc5..375587f 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,6 +1,6 @@ { "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, - "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, + "LuaSnip": { "branch": "master", "commit": "7552e6504ee95a9c8cfc6db53e389122ded46cd4" }, "barbecue.nvim": { "branch": "main", "commit": "cd7e7da622d68136e13721865b4d919efd6325ed" }, "catppuccin": { "branch": "main", "commit": "10eda02ea4faa7d1f94e77a3410a4ae91c25c5f5" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -27,14 +27,15 @@ "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, - "nvim-lspconfig": { "branch": "master", "commit": "fdc44768a09a65140aa00c92872a5381ad486485" }, + "nvim-lspconfig": { "branch": "master", "commit": "e9b1c95d29ca9e479fc39896b31d24eed96b40a3" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, "nvim-tree-docs": { "branch": "master", "commit": "5db023d783da1e55339e5e25caaf72a59597e626" }, - "nvim-treesitter": { "branch": "master", "commit": "65310b64eee19a6e74e1b6f607a9f46f751290fe" }, + "nvim-treesitter": { "branch": "master", "commit": "d13f0183ba93f9b5aba7359146f294abfffff9c3" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "6b5f95aa4d24f2c629a74f2c935c702b08dbde62" }, "nvim-web-devicons": { "branch": "master", "commit": "5be6c4e685618b99c3210a69375b38a1202369b4" }, + "oil.nvim": { "branch": "master", "commit": "fcca212c2e966fc3dec1d4baf888e670631d25d1" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, - "tailwind-tools.nvim": { "branch": "master", "commit": "9baed3c610bc80299046db02d26e5deb66323c36" }, + "tailwind-tools.nvim": { "branch": "master", "commit": "7f1dda9ac3fb0460dfa4243656e8f00e36856385" }, "telescope.nvim": { "branch": "master", "commit": "10b8a82b042caf50b78e619d92caf0910211973d" }, "tiny-devicons-auto-colors.nvim": { "branch": "main", "commit": "9be4af5b1bc1f26a11206ed7ce8bf44312e7941a" }, "todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" }, diff --git a/lua/409/autocmd.lua b/lua/409/autocmd.lua index 5e16074..be819d6 100644 --- a/lua/409/autocmd.lua +++ b/lua/409/autocmd.lua @@ -3,11 +3,6 @@ vim.api.nvim_create_autocmd({ "FileType" }, { command = "setlocal ts=2 sts=2 sw=2 expandtab indentkeys-=0# indentkeys-=<:>", }) -vim.api.nvim_create_autocmd({ "FileType" }, { - pattern = { "netrw" }, - command = "nnoremap TmuxNavigateRight", -}) - vim.api.nvim_create_autocmd({ "TextYankPost" }, { command = "lua vim.highlight.on_yank {higroup='Visual',timeout=100}", }) diff --git a/lua/409/plugins/navigation.lua b/lua/409/plugins/navigation.lua index 706a631..405f7d3 100644 --- a/lua/409/plugins/navigation.lua +++ b/lua/409/plugins/navigation.lua @@ -163,4 +163,31 @@ return { end end, }, + { + "stevearc/oil.nvim", + lazy = false, + opts = { + keymaps = { + [""] = false, + [""] = false, + [""] = false, + }, + }, + keys = { + { + "pv", + ":Oil", + desc = "File explorer (Oil)", + }, + { + "ppv", + function() + require("oil").open_float() + end, + desc = "Floating file explorer (Oil)", + }, + }, + dependencies = { "nvim-tree/nvim-web-devicons" }, + config = true, + }, } diff --git a/lua/409/plugins/statusline.lua b/lua/409/plugins/statusline.lua index 70497c4..ee35c3b 100644 --- a/lua/409/plugins/statusline.lua +++ b/lua/409/plugins/statusline.lua @@ -113,7 +113,7 @@ return { ---Filetypes not to enable winbar in. --- ---@type string[] - exclude_filetypes = { "netrw", "toggleterm" }, + exclude_filetypes = { "netrw", "toggleterm", "oil" }, }, config = true, }, diff --git a/lua/409/plugins/util.lua b/lua/409/plugins/util.lua index 8e94a94..4d7f88c 100644 --- a/lua/409/plugins/util.lua +++ b/lua/409/plugins/util.lua @@ -16,14 +16,14 @@ return { }, }, }, - "nvim-tree/nvim-web-devicons", + { "nvim-tree/nvim-web-devicons" }, { "rachartier/tiny-devicons-auto-colors.nvim", dependencies = { "nvim-tree/nvim-web-devicons" }, - event = "VeryLazy", - config = function() - require("tiny-devicons-auto-colors").setup() - end + event = "VeryLazy", + config = function() + require("tiny-devicons-auto-colors").setup() + end, }, { "RRethy/vim-illuminate", diff --git a/lua/409/remap.lua b/lua/409/remap.lua index 2e7015a..d609c67 100755 --- a/lua/409/remap.lua +++ b/lua/409/remap.lua @@ -1,4 +1,4 @@ -vim.keymap.set("n", "pv", vim.cmd.Ex) +-- vim.keymap.set("n", "pv", vim.cmd.Ex) vim.keymap.set("v", "J", ":m '>+1gv=gv") vim.keymap.set("v", "K", ":m '<-2gv=gv")