From a490b9c345d1b7694bf1bdc84c00ebd123a07649 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Fri, 19 May 2023 07:50:40 +0100 Subject: [PATCH] Re-enable neo-tree as complement to oil Add extra shortcuts to Alpha, convert all icons to md style --- lua/plugins/alpha.lua | 12 +++++++----- lua/plugins/neotree.lua | 8 -------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/lua/plugins/alpha.lua b/lua/plugins/alpha.lua index 2323544..cddb017 100644 --- a/lua/plugins/alpha.lua +++ b/lua/plugins/alpha.lua @@ -14,13 +14,15 @@ return { dashboard.section.header.val = vim.split(logo, "\n") dashboard.section.buttons.val = { - dashboard.button("f", " " .. " Find file", "Telescope find_files "), - dashboard.button("r", " " .. " Recent files", "Telescope oldfiles "), - dashboard.button("o", "󱏒 " .. " Oil file browser", "Oil "), + dashboard.button("f", "󰍉 " .. " Find file", "Telescope find_files "), + dashboard.button("r", "󱀲 " .. " Recent files", "Telescope oldfiles "), + dashboard.button("o", "󰪶 " .. " Oil file browser", "Oil "), + dashboard.button("n", "󱏒 " .. " Neo-tree", "Neotree float "), dashboard.button("g", "󰊢 " .. " Git status", "Neogit "), - dashboard.button("c", " " .. " Config", "e $MYVIMRC "), + dashboard.button("c", "󰢻 " .. " Config", "e $MYVIMRC "), dashboard.button("l", "󰒲 " .. " Lazy", "Lazy"), - dashboard.button("q", " " .. " Quit", "qa"), + dashboard.button("h", "󰋖 " .. " Help", "Telescope help_tags "), + dashboard.button("q", "󰗼 " .. " Quit", "qa"), } for _, button in ipairs(dashboard.section.buttons.val) do button.opts.hl = "AlphaButtons" diff --git a/lua/plugins/neotree.lua b/lua/plugins/neotree.lua index 007beaa..f71c181 100644 --- a/lua/plugins/neotree.lua +++ b/lua/plugins/neotree.lua @@ -1,6 +1,5 @@ return { "nvim-neo-tree/neo-tree.nvim", - enabled = false, branch = "v2.x", dependencies = { "nvim-lua/plenary.nvim", @@ -9,15 +8,8 @@ return { }, cmd = "Neotree", init = function() - vim.g.loaded_netrw = 1 - vim.g.loaded_netrwPlugin = 1 vim.g.neo_tree_remove_legacy_commands = 1 vim.keymap.set("n", "nn", "Neotree left reveal reveal_force_cwd") - vim.keymap.set("n", "nb", "Neotree toggle show buffers right") - if vim.fn.argc() == 1 then - local stat = vim.loop.fs_stat(vim.fn.argv(0)) - if stat and stat.type == "directory" then require "neo-tree" end - end end, config = true, opts = {