From 4b212bf384750cc9b9d8886a79b0fbed8a2b6a61 Mon Sep 17 00:00:00 2001 From: Patrick Auernig Date: Sat, 6 Jan 2024 14:24:41 +0100 Subject: [PATCH] Update plugins Actuall remove overseer plugin Replace nvim-tree with oil.nvim --- lazy-lock.json | 23 ++++++++--------- lua/valeth/plugins/fancy.lua | 5 ---- lua/valeth/plugins/init.lua | 12 ++++++++- lua/valeth/plugins/lualine.lua | 15 ----------- lua/valeth/plugins/nvim_tree.lua | 44 -------------------------------- lua/valeth/plugins/statuscol.lua | 4 +++ 6 files changed, 26 insertions(+), 77 deletions(-) delete mode 100644 lua/valeth/plugins/nvim_tree.lua diff --git a/lazy-lock.json b/lazy-lock.json index 8511add..81f050b 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,6 +1,6 @@ { "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, - "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, + "LuaSnip": { "branch": "master", "commit": "68153ebb03e65d8a437c6240553645c57f17cf99" }, "ayu-nvim": { "branch": "fold-column-fg", "commit": "552034625fedac4a5487459618c80bc9e233f6f4" }, "cloak.nvim": { "branch": "main", "commit": "951b163e55ce7639eb320c450bde9283c4fe968b" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, @@ -10,31 +10,30 @@ "dressing.nvim": { "branch": "master", "commit": "94b0d24483d56f3777ee0c8dc51675f21709318c" }, "formatter.nvim": { "branch": "master", "commit": "cb4778b8432f1ae86dae4634c0b611cb269a4c2f" }, "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, - "gitsigns.nvim": { "branch": "main", "commit": "d195f0c35ced5174d3ecce1c4c8ebb3b5bc23fa9" }, + "gitsigns.nvim": { "branch": "main", "commit": "3e6e91b09f0468c32d3b96dcacf4b947f037ce25" }, "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" }, "indent-blankline.nvim": { "branch": "master", "commit": "877c1db2bf957300097dd5348a665666a4d900cb" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, - "lsp-zero.nvim": { "branch": "v2.x", "commit": "84771a9ec7f7d1fecec8bb84c0c97d811e4b08ec" }, + "lsp-zero.nvim": { "branch": "v2.x", "commit": "2c1e776fd28f001438f12b1d9cee8933a0a40934" }, "lspkind.nvim": { "branch": "master", "commit": "7f26cf5e27e2bd910ce0ea00c514da2bf97423b8" }, "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "0989bdf4fdf7b5aa4c74131d7ffccc3f399ac788" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "f0cd12f7a8a310c58cecebddb6b219ffad1cfd0f" }, - "mason.nvim": { "branch": "main", "commit": "a09da6ac634926a299dd439da08bdb547a8ca011" }, - "neodev.nvim": { "branch": "main", "commit": "7cb4f7f29c6bf6f1d21a37f6dd6d12ba64266b09" }, - "neogit": { "branch": "master", "commit": "525b7cb4dacc4b7d50dc31475d293c0b97d10a7b" }, + "mason.nvim": { "branch": "main", "commit": "e110bc3be1a7309617cecd77bfe4bf86ba1b8134" }, + "neodev.nvim": { "branch": "main", "commit": "be8d4d4cab6c13c6a572269c9d6a63774baba9a0" }, + "neogit": { "branch": "master", "commit": "93bf00cd5db1e88ea0ca9105e83f7e97896a7cd2" }, "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-dap": { "branch": "master", "commit": "debd7c2f80eaf20c5f5df25db8d8c1b9b18f4421" }, "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" }, - "nvim-lspconfig": { "branch": "master", "commit": "9bedcfed749755e43fc8bed46f85ce2044fe3b77" }, - "nvim-notify": { "branch": "master", "commit": "ebcdd8219e2a2cbc0a4bef68002f6867f1fde269" }, - "nvim-tree.lua": { "branch": "master", "commit": "f779abaf2a6aba20107cb84bb468599327128202" }, + "nvim-lspconfig": { "branch": "master", "commit": "796394fd19fb878e8dbc4fd1e9c9c186ed07a5f4" }, + "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" }, "nvim-treesitter": { "branch": "master", "commit": "63260da18bf273c76b8e2ea0db84eb901cab49ce" }, "nvim-treesitter-context": { "branch": "master", "commit": "652ec514d6ba8bc4a3c2de76c855fe668e2c7196" }, "nvim-treesitter-endwise": { "branch": "master", "commit": "4c344ffc8d54d7e1ba2cefaaa2c10ea93aa1cc2d" }, "nvim-ufo": { "branch": "main", "commit": "c6d88523f574024b788f1c3400c5d5b9bb1a0407" }, - "nvim-web-devicons": { "branch": "master", "commit": "cff25ce621e6d15fae0b0bfe38c00be50ce38468" }, - "overseer.nvim": { "branch": "master", "commit": "78e893394cef6efee05f31bd65f6dff08b0bac09" }, + "nvim-web-devicons": { "branch": "master", "commit": "db0c864375c198cacc171ff373e76bfce2a85045" }, + "oil.nvim": { "branch": "master", "commit": "a128e6f75c6a71b7b9ac7ea663949a5209771cd5" }, "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, "rainbow_csv.nvim": { "branch": "main", "commit": "a520dabf1c74d7d7d8341dd3f3570063ef51b3aa" }, diff --git a/lua/valeth/plugins/fancy.lua b/lua/valeth/plugins/fancy.lua index eb086f9..5319cd1 100644 --- a/lua/valeth/plugins/fancy.lua +++ b/lua/valeth/plugins/fancy.lua @@ -35,9 +35,4 @@ return { vim.notify = notify end }, - - { - "lewis6991/gitsigns.nvim", - opts = {}, - }, } diff --git a/lua/valeth/plugins/init.lua b/lua/valeth/plugins/init.lua index dd678f9..f14472d 100644 --- a/lua/valeth/plugins/init.lua +++ b/lua/valeth/plugins/init.lua @@ -10,5 +10,15 @@ return { opts = {}, }, - "nvim-lua/plenary.nvim", + { + "stevearc/oil.nvim", + dependencies = { + "nvim-lua/plenary.nvim" + }, + opts = {}, + cmd = { "Oil" }, + keys = { + { "ft", "Oil", mode = "n" } + }, + }, } diff --git a/lua/valeth/plugins/lualine.lua b/lua/valeth/plugins/lualine.lua index 88bb5c9..ceb0582 100644 --- a/lua/valeth/plugins/lualine.lua +++ b/lua/valeth/plugins/lualine.lua @@ -4,23 +4,9 @@ local spec = { spec.dependencies = { "nvim-tree/nvim-web-devicons", - "stevearc/overseer.nvim", } spec.config = function() - local overseer = require("overseer") - - local task_status = { - "overseer", - colored = true, - symbols = { - [overseer.STATUS.FAILURE] = "✗ ", - [overseer.STATUS.CANCELED] = "o ", - [overseer.STATUS.SUCCESS] = "✓ ", - [overseer.STATUS.RUNNING] = "⟳ ", - }, - } - require("lualine").setup({ sections = { lualine_b = { @@ -32,7 +18,6 @@ spec.config = function() }, }, lualine_x = { - task_status, "encoding", { "fileformat", icons_enabled = false }, "filetype" diff --git a/lua/valeth/plugins/nvim_tree.lua b/lua/valeth/plugins/nvim_tree.lua deleted file mode 100644 index e24c57e..0000000 --- a/lua/valeth/plugins/nvim_tree.lua +++ /dev/null @@ -1,44 +0,0 @@ -local spec = { - "nvim-tree/nvim-tree.lua", -} - -spec.dependencies = { - "nvim-tree/nvim-web-devicons" -} - -spec.keys = { - { "ft", "NvimTreeToggle", mode = "n" }, -} - -spec.config = function() - local nvim_tree = require("nvim-tree") - local nvim_tree_api = require("nvim-tree.api") - - - local function kmap_opts(bufnr, desc) - return { - desc = "nvim-tree: " .. desc, - buffer = bufnr, - noremap = true, - silent = true, - nowait = true - } - end - - local function on_attach(bufnr) - nvim_tree_api.config.mappings.default_on_attach(bufnr) - - vim.keymap.set("n", "", nvim_tree_api.tree.close, kmap_opts(bufnr, "Close")) - end - - nvim_tree.setup({ - view = { - float = { - enable = true - } - }, - on_attach = on_attach, - }) -end - -return spec diff --git a/lua/valeth/plugins/statuscol.lua b/lua/valeth/plugins/statuscol.lua index ca30dec..ba036a5 100644 --- a/lua/valeth/plugins/statuscol.lua +++ b/lua/valeth/plugins/statuscol.lua @@ -3,6 +3,10 @@ local spec = { lazy = true, } +spec.dependencies = { + "lewis6991/gitsigns.nvim", +} + spec.config = function() local statuscol = require("statuscol") local builtin = require("statuscol.builtin")