From 1e10919b8b58b8f798eae453bd77bb4c25beb1c3 Mon Sep 17 00:00:00 2001 From: Peter Date: Sun, 24 Nov 2024 14:20:39 -0500 Subject: [PATCH] added neo-tree, removed lazygit --- lua/peteskiis/plugins/alpha.lua | 38 ++++++------ lua/peteskiis/plugins/lazygit.lua | 19 ------ lua/peteskiis/plugins/lsp/mason.lua | 62 +++++++++---------- .../plugins/neo-tree.lua | 0 lua/peteskiis/plugins/nvim-tree.lua | 26 ++++---- lua/peteskiis/plugins/telescope.lua | 54 ++++++++-------- 6 files changed, 90 insertions(+), 109 deletions(-) delete mode 100644 lua/peteskiis/plugins/lazygit.lua rename lua/{kickstart => peteskiis}/plugins/neo-tree.lua (100%) diff --git a/lua/peteskiis/plugins/alpha.lua b/lua/peteskiis/plugins/alpha.lua index 33ce78e5..25f0ba83 100644 --- a/lua/peteskiis/plugins/alpha.lua +++ b/lua/peteskiis/plugins/alpha.lua @@ -1,36 +1,36 @@ return { - "goolord/alpha-nvim", - event = "VimEnter", + 'goolord/alpha-nvim', + event = 'VimEnter', config = function() - local alpha = require("alpha") - local dashboard = require("alpha.themes.dashboard") + local alpha = require 'alpha' + local dashboard = require 'alpha.themes.dashboard' -- Set header dashboard.section.header.val = { - " ", - " ███╗ ██╗███████╗ ██████╗ ██╗ ██╗██╗███╗ ███╗ ", - " ████╗ ██║██╔════╝██╔═══██╗██║ ██║██║████╗ ████║ ", - " ██╔██╗ ██║█████╗ ██║ ██║██║ ██║██║██╔████╔██║ ", - " ██║╚██╗██║██╔══╝ ██║ ██║╚██╗ ██╔╝██║██║╚██╔╝██║ ", - " ██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║ ", - " ╚═╝ ╚═══╝╚══════╝ ╚═════╝ ╚═══╝ ╚═╝╚═╝ ╚═╝ ", - " ", + ' ', + ' ███╗ ██╗███████╗ ██████╗ ██╗ ██╗██╗███╗ ███╗ ', + ' ████╗ ██║██╔════╝██╔═══██╗██║ ██║██║████╗ ████║ ', + ' ██╔██╗ ██║█████╗ ██║ ██║██║ ██║██║██╔████╔██║ ', + ' ██║╚██╗██║██╔══╝ ██║ ██║╚██╗ ██╔╝██║██║╚██╔╝██║ ', + ' ██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║ ', + ' ╚═╝ ╚═══╝╚══════╝ ╚═════╝ ╚═══╝ ╚═╝╚═╝ ╚═╝ ', + ' ', } -- Set menu dashboard.section.buttons.val = { - dashboard.button("e", " > New File", "ene"), - dashboard.button("SPC ee", " > Toggle file explorer", "NvimTreeToggle"), - dashboard.button("SPC ff", "󰱼 > Find File", "Telescope find_files"), - dashboard.button("SPC fs", " > Find Word", "Telescope live_grep"), - dashboard.button("SPC wr", "󰁯 > Restore Session For Current Directory", "SessionRestore"), - dashboard.button("q", " > Quit NVIM", "qa"), + dashboard.button('e', ' > New File', 'ene'), + dashboard.button('SPC e', ' > Toggle file explorer', 'NvimTreeToggle'), + dashboard.button('SPC ff', '󰱼 > Find File', 'Telescope find_files'), + dashboard.button('SPC fs', ' > Find Word', 'Telescope live_grep'), + dashboard.button('SPC wr', '󰁯 > Restore Session For Current Directory', 'SessionRestore'), + dashboard.button('q', ' > Quit NVIM', 'qa'), } -- Send config to alpha alpha.setup(dashboard.opts) -- Disable folding on alpha buffer - vim.cmd([[autocmd FileType alpha setlocal nofoldenable]]) + vim.cmd [[autocmd FileType alpha setlocal nofoldenable]] end, } diff --git a/lua/peteskiis/plugins/lazygit.lua b/lua/peteskiis/plugins/lazygit.lua deleted file mode 100644 index 5d3f334c..00000000 --- a/lua/peteskiis/plugins/lazygit.lua +++ /dev/null @@ -1,19 +0,0 @@ -return { - "kdheepak/lazygit.nvim", - cmd = { - "LazyGit", - "LazyGitConfig", - "LazyGitCurrentFile", - "LazyGitFilter", - "LazyGitFilterCurrentFile", - }, - -- optional for floating window border decoration - dependencies = { - "nvim-lua/plenary.nvim", - }, - -- setting the keybinding for LazyGit with 'keys' is recommended in - -- order to load the plugin when the command is run for the first time - keys = { - { "lg", "LazyGit", desc = "Open lazy git" }, - }, -} diff --git a/lua/peteskiis/plugins/lsp/mason.lua b/lua/peteskiis/plugins/lsp/mason.lua index 748229c0..6bf64af4 100644 --- a/lua/peteskiis/plugins/lsp/mason.lua +++ b/lua/peteskiis/plugins/lsp/mason.lua @@ -1,54 +1,54 @@ return { - "williamboman/mason.nvim", + 'williamboman/mason.nvim', dependencies = { - "williamboman/mason-lspconfig.nvim", - "WhoIsSethDaniel/mason-tool-installer.nvim", + 'williamboman/mason-lspconfig.nvim', + 'WhoIsSethDaniel/mason-tool-installer.nvim', }, config = function() -- import mason - local mason = require("mason") + local mason = require 'mason' -- import mason-lspconfig - local mason_lspconfig = require("mason-lspconfig") + local mason_lspconfig = require 'mason-lspconfig' - local mason_tool_installer = require("mason-tool-installer") + local mason_tool_installer = require 'mason-tool-installer' -- enable mason and configure icons - mason.setup({ + mason.setup { ui = { icons = { - package_installed = "✓", - package_pending = "➜", - package_uninstalled = "✗", + package_installed = '✓', + package_pending = '➜', + package_uninstalled = '✗', }, }, - }) + } - mason_lspconfig.setup({ + mason_lspconfig.setup { -- list of servers for mason to install ensure_installed = { - "tsserver", - "html", - "cssls", - "tailwindcss", - "svelte", - "lua_ls", - "graphql", - "emmet_ls", - "prismals", - "pyright", + 'ts_ls', + 'html', + 'cssls', + 'tailwindcss', + 'svelte', + 'lua_ls', + 'graphql', + 'emmet_ls', + 'prismals', + 'pyright', }, - }) + } - mason_tool_installer.setup({ + mason_tool_installer.setup { ensure_installed = { - "prettier", -- prettier formatter - "stylua", -- lua formatter - "isort", -- python formatter - "black", -- python formatter - "pylint", - "eslint_d", + 'prettier', -- prettier formatter + 'stylua', -- lua formatter + 'isort', -- python formatter + 'black', -- python formatter + 'pylint', + 'eslint_d', }, - }) + } end, } diff --git a/lua/kickstart/plugins/neo-tree.lua b/lua/peteskiis/plugins/neo-tree.lua similarity index 100% rename from lua/kickstart/plugins/neo-tree.lua rename to lua/peteskiis/plugins/neo-tree.lua diff --git a/lua/peteskiis/plugins/nvim-tree.lua b/lua/peteskiis/plugins/nvim-tree.lua index 9bc78642..93a2e830 100644 --- a/lua/peteskiis/plugins/nvim-tree.lua +++ b/lua/peteskiis/plugins/nvim-tree.lua @@ -1,14 +1,14 @@ return { - "nvim-tree/nvim-tree.lua", - dependencies = "nvim-tree/nvim-web-devicons", + 'nvim-tree/nvim-tree.lua', + dependencies = 'nvim-tree/nvim-web-devicons', config = function() - local nvimtree = require("nvim-tree") + local nvimtree = require 'nvim-tree' -- recommended settings from nvim-tree documentation vim.g.loaded_netrw = 1 vim.g.loaded_netrwPlugin = 1 - nvimtree.setup({ + nvimtree.setup { view = { width = 35, relativenumber = true, @@ -21,8 +21,8 @@ return { icons = { glyphs = { folder = { - arrow_closed = "", -- arrow when folder is closed - arrow_open = "", -- arrow when folder is open + arrow_closed = '', -- arrow when folder is closed + arrow_open = '', -- arrow when folder is open }, }, }, @@ -38,19 +38,19 @@ return { }, }, filters = { - custom = { ".DS_Store" }, + custom = { '.DS_Store' }, }, git = { ignore = false, }, - }) + } -- set keymaps local keymap = vim.keymap -- for conciseness - keymap.set("n", "ee", "NvimTreeToggle", { desc = "Toggle file explorer" }) -- toggle file explorer - keymap.set("n", "ef", "NvimTreeFindFileToggle", { desc = "Toggle file explorer on current file" }) -- toggle file explorer on current file - keymap.set("n", "ec", "NvimTreeCollapse", { desc = "Collapse file explorer" }) -- collapse file explorer - keymap.set("n", "er", "NvimTreeRefresh", { desc = "Refresh file explorer" }) -- refresh file explorer - end + keymap.set('n', 'e', 'NvimTreeToggle', { desc = 'Toggle file explorer' }) -- toggle file explorer + keymap.set('n', 'ef', 'NvimTreeFindFileToggle', { desc = 'Toggle file explorer on current file' }) -- toggle file explorer on current file + keymap.set('n', 'ec', 'NvimTreeCollapse', { desc = 'Collapse file explorer' }) -- collapse file explorer + keymap.set('n', 'er', 'NvimTreeRefresh', { desc = 'Refresh file explorer' }) -- refresh file explorer + end, } diff --git a/lua/peteskiis/plugins/telescope.lua b/lua/peteskiis/plugins/telescope.lua index 59e80de9..56cbdeaa 100644 --- a/lua/peteskiis/plugins/telescope.lua +++ b/lua/peteskiis/plugins/telescope.lua @@ -1,50 +1,50 @@ return { - "nvim-telescope/telescope.nvim", - branch = "0.1.x", + 'nvim-telescope/telescope.nvim', + branch = '0.1.x', dependencies = { - "nvim-lua/plenary.nvim", - { "nvim-telescope/telescope-fzf-native.nvim", build = "make" }, - "nvim-tree/nvim-web-devicons", - "folke/todo-comments.nvim", + 'nvim-lua/plenary.nvim', + { 'nvim-telescope/telescope-fzf-native.nvim', build = 'make' }, + 'nvim-tree/nvim-web-devicons', + 'folke/todo-comments.nvim', }, config = function() - local telescope = require("telescope") - local actions = require("telescope.actions") - local transform_mod = require("telescope.actions.mt").transform_mod + local telescope = require 'telescope' + local actions = require 'telescope.actions' + local transform_mod = require('telescope.actions.mt').transform_mod - local trouble = require("trouble") - local trouble_telescope = require("trouble.sources.telescope") + local trouble = require 'trouble' + local trouble_telescope = require 'trouble.sources.telescope' -- or create your custom action - local custom_actions = transform_mod({ + local custom_actions = transform_mod { open_trouble_qflist = function(prompt_bufnr) - trouble.toggle("quickfix") + trouble.toggle 'quickfix' end, - }) + } - telescope.setup({ + telescope.setup { defaults = { - path_display = { "smart" }, + path_display = { 'smart' }, mappings = { i = { - [""] = actions.move_selection_previous, -- move to prev result - [""] = actions.move_selection_next, -- move to next result - [""] = actions.send_selected_to_qflist + custom_actions.open_trouble_qflist, - [""] = trouble_telescope.open, + [''] = actions.move_selection_previous, -- move to prev result + [''] = actions.move_selection_next, -- move to next result + [''] = actions.send_selected_to_qflist + custom_actions.open_trouble_qflist, + [''] = trouble_telescope.open, }, }, }, - }) + } - telescope.load_extension("fzf") + telescope.load_extension 'fzf' -- set keymaps local keymap = vim.keymap -- for conciseness - keymap.set("n", "ff", "Telescope find_files", { desc = "Fuzzy find files in cwd" }) - keymap.set("n", "fr", "Telescope oldfiles", { desc = "Fuzzy find recent files" }) - keymap.set("n", "fs", "Telescope live_grep", { desc = "Find string in cwd" }) - keymap.set("n", "fc", "Telescope grep_string", { desc = "Find string under cursor in cwd" }) - keymap.set("n", "ft", "TodoTelescope", { desc = "Find todos" }) + keymap.set('n', 'f', 'Telescope find_files', { desc = 'Fuzzy find files in cwd' }) + keymap.set('n', 'fr', 'Telescope oldfiles', { desc = 'Fuzzy find recent files' }) + keymap.set('n', 'g', 'Telescope live_grep', { desc = 'Find string in cwd' }) + keymap.set('n', 'fc', 'Telescope grep_string', { desc = 'Find string under cursor in cwd' }) + keymap.set('n', 'ft', 'TodoTelescope', { desc = 'Find todos' }) end, }