feat: switched to lazy.nvim, cleaned up plugins

init.lua

@@ -126,12 +126,21 @@ KEYBINDS:set_navigation_keys({})
 
 
 --|| PLUGINS
-local install_path = VIMDIR..'/pack/packer/start/packer.nvim'
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if vim.fn.empty(vim.fn.glob(install_path)) > 0 then
+if not vim.loop.fs_stat(lazypath) then
-	local packer_bootstrap = vim.fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path})
+	vim.fn.system({
+		"git",
+		"clone",
+		"--filter=blob:none",
+		"https://github.com/folke/lazy.nvim.git",
+		"--branch=stable", -- latest stable release
+		lazypath,
+	})
 end
+vim.opt.rtp:prepend(lazypath)
 
 PLUGINS = require('plugins')
+require('lazy').setup(PLUGINS)
 
 
 --|| THEME

lua/plugins.lua

@@ -8,47 +8,189 @@
               GG                                       &GGGGGGGGGGGGGB#&        ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝     ╚═╝╚═╝    
              #P#                                        &&#BGGGGGGGGGGG#                     nvim plugins                 
              BP&                                           &GGGGGGGGGB#                                                   
-         &#BGPP&                                         &#BGGGGGGGB#              * tldr: managed with packer.nvim       
+         &#BGPP&                                         &#BGGGGGGGB#              * tldr: managed with lazy.nvim         
      &#BGGGGGPP&                                     &&#BGGGGGGB##&                  - lsp: integrated + nvim-lspconfig   
   &#GPPPGGGGGBPB                                &&##BGGGGGBB#&&                      - completion: nvim-cmp + LuaSnip     
  #PPPPPPPGGPG BP&                        &&##BBGGGGGGBB#&&                           - syntax: nvim-treesitter            
  PPPPPPPPPPPPGBPG&&&       &&&&&&###BBBGGGGGGGBB##&&                                 - pickers: telescope.nvim            
- &BGPPPPPPPPPPPPPPGGGGGGGGGGGGGGGGGGGBBB##&&&                                        - files: nvim-tree.lua               
+ &BGPPPPPPPPPPPPPPGGGGGGGGGGGGGGGGGGGBBB##&&&                                        - files: neo-tree.nvim               
     &&##BBBBGGGGGGGPGBBBBBB####&&&&                                                  - git: vim-fugitive + gitsigns.nvim  
                   &#B#&                                                              - extra: hexmode, vim-combo,         
-               &&    ###&                                                                     rust-tools, nvim-colorizer  
+               &&    ###&                                                                     rust-tools, nvim-colorizer, 
-              &G#      &&#&&&                                                                                             
+              &G#      &&#&&&                                                                 nvim-jdtls, vim-surround,   
-                             &&&                                                                                          
+                             &&&                                                              undotree,                   
 ]]--
 
-local init_fn = function(use)
+local function set_lsp_binds(_, bufnr)
-	use 'wbthomason/packer.nvim'        -- packer can manage itself
+	require('keybinds'):set_lsp_keys({buffer=bufnr})
+end
 
-	use 'alemidev/peak.nvim'            -- color scheme
+return {
+	'alemidev/peak.nvim',            -- color scheme
 
-	-- trying this thing out
+	'rickhowe/diffchar.vim',         -- word-level diffs
-	use 'lervag/wiki.vim'               -- utilities for managing my wiki
+	'fidian/hexmode',                -- convert buffers into hex view with xxd
-	use 'lervag/wiki-ft.vim'            -- wiki format syntax
+	'alemidev/vim-combo',            -- track code combos
-	-- really idk about it, need to use it for a while
 
-	use 'fidian/hexmode'                -- convert buffers into hex view with xxd
+	'tpope/vim-fugitive',            -- better git commands
-	use 'alemidev/vim-combo'            -- track code combos
+	'tpope/vim-surround',            -- text object motions for surrounding
-	use 'editorconfig/editorconfig-vim' -- respect editorconfig
 
-	use "ellisonleao/glow.nvim"         -- markdown previewer with glow
+	'mbbill/undotree',               -- tree undo history visualizer
 
-	use 'tpope/vim-fugitive'            -- better git commands
+	"stevearc/dressing.nvim",        -- better vim.fn.input() and vim.fn.select()
-	use 'tpope/vim-surround'            -- text object motions for surrounding
 
-	use 'neovim/nvim-lspconfig'         -- import LSP configurations
+	{
-	use 'simrat39/rust-tools.nvim'      -- extra LSP defaults for rust
+		'norcalli/nvim-colorizer.lua',    -- show hex color codes
-	use 'mfussenegger/nvim-jdtls'       -- extra LSP stuff for java
+		config = function () require('colorizer').setup() end
+	},
 
-	use 'L3MON4D3/LuaSnip'              -- snippet engine
+	{
+		"ellisonleao/glow.nvim",          -- markdown previewer with glow
+		config = function() require("glow").setup() end
+	},
 
-	use {
+	{
+		'lewis6991/gitsigns.nvim',        -- show diff signs in gutter
+		config = function()
+			require('gitsigns').setup {   -- configure symbols and colors
+				signs = {
+					add          = {hl = 'GitSignsChange', text = '╎'},
+					change       = {hl = 'GitSignsChange', text = '│'},
+					delete       = {hl = 'GitSignsDelete', text = '_'},
+					topdelete    = {hl = 'GitSignsDelete', text = '‾'},
+					changedelete = {hl = 'GitSignsDelete', text = '~'},
+					untracked    = {hl = 'GitSignsUntracked', text = '╎'},
+				},
+			}
+		end
+	},
+
+	{
+		'nvim-treesitter/nvim-treesitter',
+		build = ':TSUpdate', -- if parsers break upon install, check under scoop/apps/neovim/{version}/lib/nvim/parser
+		config = function()
+			require('nvim-treesitter.configs').setup({
+				highlight = { enable = true },
+				incremental_selection = { enable = true },
+				textobjects = { enable = true }
+			})
+			vim.opt.foldmethod = "expr"
+			vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
+		end
+	},
+
+	{
+		"nvim-neo-tree/neo-tree.nvim",
+		branch = "v2.x",
+		dependencies = {
+			"nvim-lua/plenary.nvim",
+			"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
+			"MunifTanjim/nui.nvim",
+			"alemidev/neo-tree-symbolmap.git",
+			"mrbjarksen/neo-tree-diagnostics.nvim",
+		},
+		config = function ()
+			vim.g.neo_tree_remove_legacy_commands = 1
+			require('neo-tree').setup({
+				sources = {
+					"filesystem",
+					"buffers",
+					"git_status",
+					"symbolmap",
+					"diagnostics",
+				},
+			})
+		end
+	},
+
+	{
+		'nvim-telescope/telescope.nvim',  -- fuzzy finder, GUI component
+		dependencies = {
+			{'nvim-lua/plenary.nvim'},    -- some utilities made for telescope
+			{'nvim-telescope/telescope-fzf-native.nvim', build = 'make' }, -- fzf algorithm implemented in C for faster searches
+		},
+		config = function()
+			local telescope = require('telescope')
+			telescope.load_extension('fzf')
+			telescope.setup({
+				defaults = {
+					path_display = { "truncate" },
+					layout_config = {
+						horizontal = {
+							preview_width = 0.65,
+							results_width = 0.35,
+						},
+						vertical = {
+							mirror = false,
+						},
+						cursor = {
+							preview_width = 0.6,
+							results_width = 0.4,
+						}
+					},
+				}
+			})
+			require('keybinds'):set_telescope_keys({})
+			-- for some reason, telescope breaks folds!
+			-- this should fix (took it off an issue on github)
+			vim.api.nvim_create_autocmd('BufRead', {
+				callback = function()
+					vim.api.nvim_create_autocmd('BufWinEnter', {
+						once = true,
+						command = 'normal! zx'
+					})
+				end
+			})
+		end
+	},
+
+	'mfussenegger/nvim-jdtls',       -- extra LSP stuff for java
+
+	{
+		'simrat39/rust-tools.nvim',      -- extra LSP defaults for rust
+		dependencies = {
+			'hrsh7th/nvim-cmp',          -- referenced here to guarantee load order
+		},
+		config = function ()
+			local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
+			local rust_tools = require("rust-tools")
+			rust_tools.setup({
+				tools = {
+					inlay_hints = { auto = true, highlight = "InlayHint" },
+					hover_actions = { border = "none" },
+				},
+				server = {
+					capabilities = capabilities,
+					on_attach = set_lsp_binds,
+				},
+				dap = { adapter = require('dap').adapters.lldb },
+			})
+			rust_tools.inlay_hints.enable()
+
+		end
+	},
+
+	{
+		'neovim/nvim-lspconfig',       -- import LSP configurations
+		dependencies = {
+			'hrsh7th/nvim-cmp',        -- referenced here to guarantee load order
+			'folke/neodev.nvim',       -- configure lua lsp with neovim runtime
+		},
+		config = function ()
+			local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
+			local lspconfig = require("lspconfig")
+			lspconfig.bashls.setup({capabilities=capabilities, on_attach=set_lsp_binds})
+			lspconfig.pylsp.setup({capabilites = capabilities, on_attach = set_lsp_binds, settings = { pylsp = { plugins = { pycodestyle = { enabled = false } } } } })
+			lspconfig.clangd.setup({capabilities=capabilities, on_attach=set_lsp_binds})
+			lspconfig.ltex.setup({capabilities=capabilities, on_attach=set_lsp_binds})
+			-- lspconfig.kotlin_language_server.setup({capabilities=capabilities, on_attach=set_lsp_binds})
+			lspconfig.lua_ls.setup({capabilites=capabilities, on_attach=set_lsp_binds, settings = { Lua = { telemetry = { enable = false }}}}) -- default-on telemetry is never ok ...
+		end
+	},
+
+	{
 		'mfussenegger/nvim-dap',        -- debugger adapter protocol
-		requires = {
+		dependencies = {
 			'rcarriga/nvim-dap-ui',     --batteries-included debugger ui
 		},
 		config = function()
@@ -109,11 +251,11 @@ local init_fn = function(use)
 			require('keybinds'):set_dap_keys({})
 			require('dapui').setup()
 		end,
-	}
+	},
 
-	use {
+	{
 		'hrsh7th/nvim-cmp',             -- completion engine core
-		requires = {
+		dependencies = {
 			'hrsh7th/cmp-nvim-lsp',                 -- complete with LSP
 			'hrsh7th/cmp-nvim-lsp-signature-help',  -- complete function signatures
 			'hrsh7th/cmp-nvim-lsp-document-symbol', -- complete document symbols
@@ -122,114 +264,9 @@ local init_fn = function(use)
 			'rcarriga/cmp-dap',                     -- complete in debugger
 			'saadparwaiz1/cmp_luasnip',             -- complete with snippets
 			'onsails/lspkind.nvim',                 -- fancy icons and formatting
+			'L3MON4D3/LuaSnip',                     -- snippet engine
 		},
-	}
+		config = function ()
-
-	use {
-		'norcalli/nvim-colorizer.lua',
-		config = function () require('colorizer').setup() end
-	}
-
-	use "stevearc/dressing.nvim"          -- better vim.fn.input() and vim.fn.select()
-
-	use {
-		'nvim-telescope/telescope.nvim',  -- fuzzy finder, GUI component
-		requires = {
-			{'nvim-lua/plenary.nvim'},    -- some utilities made for telescope
-			{'nvim-telescope/telescope-fzf-native.nvim', run = 'make' }, -- fzf algorithm implemented in C for faster searches
-		},
-		config = function()
-			local telescope = require('telescope')
-			telescope.load_extension('fzf')
-			telescope.setup({
-				defaults = {
-					path_display = { "truncate" },
-					layout_config = {
-						horizontal = {
-							preview_width = 0.65,
-							results_width = 0.35,
-						},
-						vertical = {
-							mirror = false,
-						},
-						cursor = {
-							preview_width = 0.6,
-							results_width = 0.4,
-						}
-					},
-				}
-			})
-			require('keybinds'):set_telescope_keys({})
-			-- for some reason, telescope breaks folds!
-			-- this should fix (took it off an issue on github)
-			vim.api.nvim_create_autocmd('BufRead', {
-				callback = function()
-					vim.api.nvim_create_autocmd('BufWinEnter', {
-						once = true,
-						command = 'normal! zx'
-					})
-				end
-			})
-		end
-	}
-
-	use {
-		'lewis6991/gitsigns.nvim',        -- show diff signs in gutter
-		config = function()
-			require('gitsigns').setup {   -- configure symbols and colors
-				signs = {
-					add          = {hl = 'GitSignsChange', text = '╎'},
-					change       = {hl = 'GitSignsChange', text = '│'},
-					delete       = {hl = 'GitSignsDelete', text = '_'},
-					topdelete    = {hl = 'GitSignsDelete', text = '‾'},
-					changedelete = {hl = 'GitSignsDelete', text = '~'},
-					untracked    = {hl = 'GitSignsUntracked', text = '╎'},
-				},
-			}
-		end
-	}
-
-	use {
-		'nvim-treesitter/nvim-treesitter',
-		run = ':TSUpdate', -- if parsers break upon install, check under scoop/apps/neovim/{version}/lib/nvim/parser
-		config = function()
-			require('nvim-treesitter.configs').setup({
-				highlight = { enable = true },
-				incremental_selection = { enable = true },
-				textobjects = { enable = true }
-			})
-			vim.opt.foldmethod = "expr"
-			vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
-		end
-	}
-
-	use 'nvim-treesitter/playground'
-
-	use {
-		'kyazdani42/nvim-tree.lua',     -- tree file explorer, alternative to nerdtree in lua
-		requires = { 'kyazdani42/nvim-web-devicons' }, -- optional, for file icons
-		config = function()
-			require('nvim-tree').setup({
-				view={
-					adaptive_size = false,
-					mappings={
-						list={
-							{ key = "<C-t>", action = "close" },
-							{ key = "t", action = "tabnew" },
-							{ key = "s", action = "split" },
-							{ key = "<C-s>", action = "vsplit" },
-						}
-					}
-				}
-			})
-		end
-	}
-
-	-- TODO this part is messy, can I make it cleaner?
-	-- TODO can I put these setup steps inside their respective config callback?
-	-- TODO can I make them also load their highlight groups?
-	-- TODO can I make nvim-cmp configuration smaller?
-
 			local cmp = require('cmp')
 			cmp.setup({
 				formatting = {
@@ -242,12 +279,15 @@ local init_fn = function(use)
 				snippet = {
 					expand = function(args) require('luasnip').lsp_expand(args.body) end,
 				},
-		mapping = cmp.mapping.preset.insert({ ['<Tab>'] = cmp.mapping.confirm({ select = true }) }),
+				mapping = cmp.mapping.preset.insert({
+					['<Tab>'] = cmp.mapping.confirm({ select = true }),
+					['<C-Space>'] = cmp.mapping.complete(),
+				}),
 				sources = cmp.config.sources({
 					{ name = 'nvim_lsp_signature_help', max_item_count = 1 },
-			{ name = 'luasnip' },
 					{ name = 'nvim_lsp' },
 					{ name = 'path', max_item_count = 3 },
+					{ name = 'luasnip' },
 					{ name = 'buffer', keyword_length = 3, max_item_count = 3 },
 				}),
 			})
@@ -278,48 +318,6 @@ local init_fn = function(use)
 			-- 		{ name = 'buffer', keyword_length = 3 },
 			-- 	})
 			-- })
-
-	-- Setup lspconfig.
-	capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
-	-- Replace <YOUR_LSP_SERVER> with each lsp server you've enabled.
-	local lspconfig = require("lspconfig")
-
-	local function set_lsp_binds(_, bufnr)
-		require('keybinds'):set_lsp_keys({buffer=bufnr})
 		end
-
-	local rust_tools = require("rust-tools")
-	rust_tools.setup({
-		tools = {
-			inlay_hints = { auto = true, highlight = "InlayHint" },
-			hover_actions = { border = "none" },
 	},
-		server = {
+}
-			capabilities = capabilities,
-			on_attach = set_lsp_binds,
-		},
-		dap = { adapter = require('dap').adapters.lldb },
-	})
-	rust_tools.inlay_hints.enable()
-
-	lspconfig.bashls.setup({capabilities=capabilities, on_attach=set_lsp_binds})
-	lspconfig.pylsp.setup({capabilites = capabilities, on_attach = set_lsp_binds, settings = { pylsp = { plugins = { pycodestyle = { enabled = false } } } } })
-	lspconfig.clangd.setup({capabilities=capabilities, on_attach=set_lsp_binds})
-	lspconfig.ltex.setup({capabilities=capabilities, on_attach=set_lsp_binds})
-	lspconfig.kotlin_language_server.setup({capabilities=capabilities, on_attach=set_lsp_binds})
-	lspconfig.lua_ls.setup({
-		capabilites=capabilities,
-		on_attach=set_lsp_binds,
-		settings = {
-			Lua = {
-				runtime = { version = 'LuaJIT' },
-				diagnostics = { globals = {'vim'} },
-				workspace = { library = vim.api.nvim_get_runtime_file("", true) },
-				telemetry = { enable = false },
-			}
-		}
-	})
-end
-
-return require('packer').startup(init_fn)
-

lua/statusline.lua

@@ -88,11 +88,8 @@ function BARCYCLE:combo()
 end
 
 function BARCYCLE:git()
-	if vim.fn['fugitive#Head']() ~= nil then
+	local success, head = pcall(vim.fn['fugitive#Head'])
-		return vim.fn['fugitive#Head']()
+	if success then return head else return '' end
-	else
-		return ""
-	end
 end
 
 function BARCYCLE:lsp()