From 33e0cf64f77d0c5f4d307d0ff47376f6f69e89b3 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Sun, 11 Jun 2023 08:41:00 +0100 Subject: [PATCH] Delete some plugins Show hidden files in Oil Add extra navbuddy dependencies Load lualine at VeryLazy step --- lua/plugins/alpha.lua | 2 +- lua/plugins/catppuccin.lua | 33 ------------------------- lua/plugins/comment.lua | 3 ++- lua/plugins/lualine.lua | 2 +- lua/plugins/neotree.lua | 45 ---------------------------------- lua/plugins/nvim_autopairs.lua | 15 ------------ lua/plugins/nvim_cmp.lua | 16 +++++++++++- lua/plugins/nvim_navbuddy.lua | 8 +++++- lua/plugins/oil.lua | 12 ++------- lua/plugins/project.lua | 1 + 10 files changed, 29 insertions(+), 108 deletions(-) delete mode 100644 lua/plugins/catppuccin.lua delete mode 100644 lua/plugins/neotree.lua delete mode 100644 lua/plugins/nvim_autopairs.lua diff --git a/lua/plugins/alpha.lua b/lua/plugins/alpha.lua index 8d24eda..e4382ac 100644 --- a/lua/plugins/alpha.lua +++ b/lua/plugins/alpha.lua @@ -18,7 +18,7 @@ return { dashboard.button("t", " " .. " Terminal", "ToggleTerm "), dashboard.button("f", " " .. " Find file", "Telescope find_files "), dashboard.button("r", " " .. " Recent files", "Telescope oldfiles "), - dashboard.button("n", " " .. " Neo-tree", "Neotree "), + dashboard.button("o", " " .. " File browser", "Oil "), dashboard.button("g", "󰊢 " .. " Git status", "Neogit "), dashboard.button("c", " " .. " Config", "e $MYVIMRC "), dashboard.button("l", "󰒲 " .. " Lazy", "Lazy"), diff --git a/lua/plugins/catppuccin.lua b/lua/plugins/catppuccin.lua deleted file mode 100644 index 042f885..0000000 --- a/lua/plugins/catppuccin.lua +++ /dev/null @@ -1,33 +0,0 @@ -return { - "catppuccin/nvim", - cond = not vim.g.vscode, - name = "catppuccin", - lazy = true, - config = true, - opts = { - flavour = "macchiato", - term_colors = true, - transparent_background = true, - integrations = { - alpha = true, - barbar = true, - gitsigns = true, - hop = true, - indent_blankline = { enabled = true, colored_indent_levels = true }, - cmp = true, - markdown = true, - mini = true, - native_lsp = { enabled = true }, - neogit = true, - neotree = true, - noice = true, - notify = true, - navic = { enabled = true }, - treesitter = true, - treesitter_context = true, - telescope = true, - lsp_trouble = true, - which_key = true, - }, - }, -} diff --git a/lua/plugins/comment.lua b/lua/plugins/comment.lua index 3b77f65..42254b9 100644 --- a/lua/plugins/comment.lua +++ b/lua/plugins/comment.lua @@ -1,7 +1,8 @@ return { "numToStr/Comment.nvim", cond = not vim.g.vscode, - event = { "BufReadPre", "BufNewFile" }, + dependencites = { "nvim-treesitter" }, + keys = { "gc", "gb" }, config = true, opts = { ignore = "^$" }, } diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua index 5be93bb..f2bc342 100644 --- a/lua/plugins/lualine.lua +++ b/lua/plugins/lualine.lua @@ -2,7 +2,7 @@ return { "nvim-lualine/lualine.nvim", cond = not vim.g.vscode, dependencies = { "nvim-tree/nvim-web-devicons", "folke/noice.nvim", "folke/tokyonight.nvim" }, - event = { "BufReadPre", "BufNewFile" }, + event = { "VeryLazy" }, config = true, opts = function() return { diff --git a/lua/plugins/neotree.lua b/lua/plugins/neotree.lua deleted file mode 100644 index 791f166..0000000 --- a/lua/plugins/neotree.lua +++ /dev/null @@ -1,45 +0,0 @@ -return { - "nvim-neo-tree/neo-tree.nvim", - cond = not vim.g.vscode, - branch = "v2.x", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended - "MunifTanjim/nui.nvim", - }, - cmd = "Neotree", - init = function() - vim.g.neo_tree_remove_legacy_commands = 1 - vim.keymap.set("n", "nn", "Neotree reveal reveal_force_cwd") - end, - config = true, - opts = { - close_if_last_window = true, - use_popups_for_input = false, - filesystem = { - window = { - mappings = { - ["Z"] = "expand_all_nodes", - [""] = "toggle_node", - }, - }, - filtered_items = { - hide_dotfiles = false, - }, - group_empty_dirs = true, - hijack_netrw_behavior = "open_current", - }, - buffers = { - bind_to_cwd = true, - follow_current_file = true, - group_empty_dirs = true, - }, - git_status = { - group_empty_dirs = true, - }, - source_selector = { - winbar = true, - statusline = false, - }, - }, -} diff --git a/lua/plugins/nvim_autopairs.lua b/lua/plugins/nvim_autopairs.lua deleted file mode 100644 index c708e15..0000000 --- a/lua/plugins/nvim_autopairs.lua +++ /dev/null @@ -1,15 +0,0 @@ -return { - "windwp/nvim-autopairs", - cond = not vim.g.vscode, - lazy = true, - dependencies = { - "nvim-treesitter/nvim-treesitter", - "hrsh7th/nvim-cmp", - }, - config = true, - opts = { - disable_in_macro = true, - disable_in_visualblock = true, - check_ts = true, - }, -} diff --git a/lua/plugins/nvim_cmp.lua b/lua/plugins/nvim_cmp.lua index 4b17bd9..3358b70 100644 --- a/lua/plugins/nvim_cmp.lua +++ b/lua/plugins/nvim_cmp.lua @@ -48,7 +48,21 @@ return { event = "InsertEnter", dependencies = { "hrsh7th/cmp-nvim-lsp", - "windwp/nvim-autopairs", + { + "windwp/nvim-autopairs", + cond = not vim.g.vscode, + lazy = true, + dependencies = { + "nvim-treesitter/nvim-treesitter", + "hrsh7th/nvim-cmp", + }, + config = true, + opts = { + disable_in_macro = true, + disable_in_visualblock = true, + check_ts = true, + }, + }, "saadparwaiz1/cmp_luasnip", "L3MON4D3/LuaSnip", }, diff --git a/lua/plugins/nvim_navbuddy.lua b/lua/plugins/nvim_navbuddy.lua index e4fb29b..05523a9 100644 --- a/lua/plugins/nvim_navbuddy.lua +++ b/lua/plugins/nvim_navbuddy.lua @@ -1,7 +1,13 @@ return { "SmiteshP/nvim-navbuddy", cond = not vim.g.vscode, - dependencies = { "SmiteshP/nvim-navic", "MunifTanjim/nui.nvim", "neovim/nvim-lspconfig" }, + dependencies = { + "SmiteshP/nvim-navic", + "MunifTanjim/nui.nvim", + "neovim/nvim-lspconfig", + "numToStr/Comment.nvim", + "nvim-telescope/telescope.nvim", + }, cmd = { "Navbuddy" }, init = function() vim.keymap.set("n", "na", "Navbuddy") end, config = true, diff --git a/lua/plugins/oil.lua b/lua/plugins/oil.lua index f65bf6f..2d6864a 100644 --- a/lua/plugins/oil.lua +++ b/lua/plugins/oil.lua @@ -12,15 +12,7 @@ return { end, config = true, opts = { - float = { - -- Padding around the floating window - padding = 2, - max_width = 0, - max_height = 0, - border = "rounded", - win_options = { - winblend = 10, - }, - }, + columns = { "icon", "permissions" }, + view_options = { show_hidden = true }, }, } diff --git a/lua/plugins/project.lua b/lua/plugins/project.lua index 2348f67..65a1134 100644 --- a/lua/plugins/project.lua +++ b/lua/plugins/project.lua @@ -1,6 +1,7 @@ return { "ahmedkhalf/project.nvim", cond = not vim.g.vscode, + enabled = false, name = "project_nvim", event = { "BufReadPre", "BufNewFile" }, config = true,