diff --git a/common/.config/nvim/lua/plugins.lua b/common/.config/nvim/lua/plugins.lua index 1c4ffc5..73023ba 100644 --- a/common/.config/nvim/lua/plugins.lua +++ b/common/.config/nvim/lua/plugins.lua @@ -23,7 +23,9 @@ local packer = require('packer').startup(function(use) use { 'lewis6991/gitsigns.nvim', requires = { 'nvim-lua/plenary.nvim' }, - config = require('plugin-config/gitsigns'), + config = function () + require('plugin-config/gitsigns') + end } use 'tpope/vim-fugitive' @@ -31,14 +33,18 @@ local packer = require('packer').startup(function(use) -- speedy searching use { 'ggandor/leap.nvim', - config = require('leap').add_default_mappings(), + config = function () + require('leap').add_default_mappings() + end } -- telescope - searching / navigation use { 'nvim-telescope/telescope.nvim', requires = { 'nvim-lua/plenary.nvim' }, - config = require('plugin-config/telescope'), + config = function () + require('plugin-config/telescope') + end } -- better hotfix window (for showing and searching through results in telescope's find usages) @@ -48,14 +54,18 @@ local packer = require('packer').startup(function(use) use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate', - config = require('plugin-config/nvim-treesitter'), + config = function () + require('plugin-config/nvim-treesitter') + end } use 'nvim-treesitter/nvim-treesitter-context' -- better split navigation use { 'mrjones2014/smart-splits.nvim', - config = require('plugin-config/smart-splits'), + config = function () + require('plugin-config/smart-splits') + end } -- gorbit's codewindow use { @@ -73,15 +83,19 @@ local packer = require('packer').startup(function(use) -- nice diagnostic pane on the bottom use { 'folke/trouble.nvim', - config = require('plugin-config/lsp-trouble'), + config = function () + require('plugin-config/lsp-trouble') + end } -- better LSP UI (for code actions, rename etc.) - use { - "glepnir/lspsaga.nvim", - branch = "main", - config = require('plugin-config/lspsaga'), - } + --use { + --"glepnir/lspsaga.nvim", + --branch = "main", + --config = function () + --require('plugin-config/lspsaga') + --end + --} -- better find and replace use 'windwp/nvim-spectre' @@ -92,30 +106,38 @@ local packer = require('packer').startup(function(use) -- start page use { 'echasnovski/mini.starter', - config = require('plugin-config/ministarter'), + config = function () + require('plugin-config/ministarter') + end } -- nicer looking tab display use { 'lukas-reineke/indent-blankline.nvim', - config = require("indent_blankline").setup { - char = "│", - filetype_exclude = { "help", "alpha", "dashboard", "neo-tree", "Trouble", "lazy" }, - }, + config = function () + require("indent_blankline").setup { + char = "│", + filetype_exclude = { "help", "alpha", "dashboard", "neo-tree", "Trouble", "lazy" }, + } + end } use { 'echasnovski/mini.indentscope', - require('mini.indentscope').setup { - symbol = "│", - options = { try_as_border = true }, - }, + config = function () + require('mini.indentscope').setup { + symbol = "│", + options = { try_as_border = true }, + } + end } -- statusline use { 'ojroques/nvim-hardline', - require('hardline').setup({}), + config = function () + require('hardline').setup({}) + end } -- UX improvements @@ -125,12 +147,16 @@ local packer = require('packer').startup(function(use) "MunifTanjim/nui.nvim", "rcarriga/nvim-notify", }, - config = require('plugin-config/noice') + config = function () + require('plugin-config/noice') + end } use { 'stevearc/dressing.nvim', - config = require('plugin-config/dressing'), + config = function () + require('plugin-config/dressing') + end } use 'rcarriga/nvim-notify' @@ -156,7 +182,9 @@ local packer = require('packer').startup(function(use) 'hrsh7th/cmp-path', 'hrsh7th/cmp-cmdline', }, - config = require('plugin-config/nvim-cmp'), + config = function () + require('plugin-config/nvim-cmp') + end } -- this will automatically install listed dependencies diff --git a/common/.config/nvim/plugin/packer_compiled.lua b/common/.config/nvim/plugin/packer_compiled.lua index 88e5536..9db454e 100644 --- a/common/.config/nvim/plugin/packer_compiled.lua +++ b/common/.config/nvim/plugin/packer_compiled.lua @@ -79,11 +79,142 @@ _G.packer_plugins = { path = "/home/benk/.local/share/nvim/site/pack/packer/start/catppuccin", url = "https://github.com/catppuccin/nvim" }, + ["cmp-buffer"] = { + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/cmp-buffer", + url = "https://github.com/hrsh7th/cmp-buffer" + }, + ["cmp-cmdline"] = { + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/cmp-cmdline", + url = "https://github.com/hrsh7th/cmp-cmdline" + }, + ["cmp-nvim-lsp"] = { + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", + url = "https://github.com/hrsh7th/cmp-nvim-lsp" + }, + ["cmp-path"] = { + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/cmp-path", + url = "https://github.com/hrsh7th/cmp-path" + }, + ["codewindow.nvim"] = { + config = { "\27LJ\2\nW\0\0\3\0\4\0\b6\0\0\0'\2\1\0B\0\2\0029\1\2\0B\1\1\0019\1\3\0B\1\1\1K\0\1\0\27apply_default_keybinds\nsetup\15codewindow\frequire\0" }, + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/codewindow.nvim", + url = "https://github.com/gorbit99/codewindow.nvim" + }, + ["dressing.nvim"] = { + config = { "\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27plugin-config/dressing\frequire\0" }, + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/dressing.nvim", + url = "https://github.com/stevearc/dressing.nvim" + }, + ["gitsigns.nvim"] = { + config = { "\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27plugin-config/gitsigns\frequire\0" }, + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/gitsigns.nvim", + url = "https://github.com/lewis6991/gitsigns.nvim" + }, + ["indent-blankline.nvim"] = { + config = { "\27LJ\2\n–\1\0\0\4\0\6\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0005\3\4\0=\3\5\2B\0\2\1K\0\1\0\21filetype_exclude\1\a\0\0\thelp\nalpha\14dashboard\rneo-tree\fTrouble\tlazy\1\0\1\tchar\b│\nsetup\21indent_blankline\frequire\0" }, + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/indent-blankline.nvim", + url = "https://github.com/lukas-reineke/indent-blankline.nvim" + }, ["kanagawa.nvim"] = { loaded = true, path = "/home/benk/.local/share/nvim/site/pack/packer/start/kanagawa.nvim", url = "https://github.com/rebelot/kanagawa.nvim" }, + ["leap.nvim"] = { + config = { "\27LJ\2\nA\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\25add_default_mappings\tleap\frequire\0" }, + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/leap.nvim", + url = "https://github.com/ggandor/leap.nvim" + }, + ["mason-lspconfig.nvim"] = { + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim", + url = "https://github.com/williamboman/mason-lspconfig.nvim" + }, + ["mason.nvim"] = { + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/mason.nvim", + url = "https://github.com/williamboman/mason.nvim" + }, + ["mini.indentscope"] = { + config = { "\27LJ\2\nr\0\0\4\0\6\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0005\3\4\0=\3\5\2B\0\2\1K\0\1\0\foptions\1\0\1\18try_as_border\2\1\0\1\vsymbol\b│\nsetup\21mini.indentscope\frequire\0" }, + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/mini.indentscope", + url = "https://github.com/echasnovski/mini.indentscope" + }, + ["mini.starter"] = { + config = { "\27LJ\2\n9\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\30plugin-config/ministarter\frequire\0" }, + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/mini.starter", + url = "https://github.com/echasnovski/mini.starter" + }, + nerdcommenter = { + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/nerdcommenter", + url = "https://github.com/scrooloose/nerdcommenter" + }, + ["noice.nvim"] = { + config = { "\27LJ\2\n3\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\24plugin-config/noice\frequire\0" }, + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/noice.nvim", + url = "https://github.com/folke/noice.nvim" + }, + ["nui.nvim"] = { + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/nui.nvim", + url = "https://github.com/MunifTanjim/nui.nvim" + }, + ["nvim-bqf"] = { + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-bqf", + url = "https://github.com/kevinhwang91/nvim-bqf" + }, + ["nvim-cmp"] = { + config = { "\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27plugin-config/nvim-cmp\frequire\0" }, + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-cmp", + url = "https://github.com/hrsh7th/nvim-cmp" + }, + ["nvim-hardline"] = { + config = { "\27LJ\2\n:\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\rhardline\frequire\0" }, + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-hardline", + url = "https://github.com/ojroques/nvim-hardline" + }, + ["nvim-lspconfig"] = { + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", + url = "https://github.com/neovim/nvim-lspconfig" + }, + ["nvim-notify"] = { + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-notify", + url = "https://github.com/rcarriga/nvim-notify" + }, + ["nvim-spectre"] = { + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-spectre", + url = "https://github.com/windwp/nvim-spectre" + }, + ["nvim-treesitter"] = { + config = { "\27LJ\2\n=\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\"plugin-config/nvim-treesitter\frequire\0" }, + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-treesitter", + url = "https://github.com/nvim-treesitter/nvim-treesitter" + }, + ["nvim-treesitter-context"] = { + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-treesitter-context", + url = "https://github.com/nvim-treesitter/nvim-treesitter-context" + }, ["nvim-web-devicons"] = { loaded = true, path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", @@ -93,10 +224,94 @@ _G.packer_plugins = { loaded = true, path = "/home/benk/.local/share/nvim/site/pack/packer/start/packer.nvim", url = "https://github.com/wbthomason/packer.nvim" + }, + ["plenary.nvim"] = { + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/plenary.nvim", + url = "https://github.com/nvim-lua/plenary.nvim" + }, + ["smart-splits.nvim"] = { + config = { "\27LJ\2\n:\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\31plugin-config/smart-splits\frequire\0" }, + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/smart-splits.nvim", + url = "https://github.com/mrjones2014/smart-splits.nvim" + }, + ["telescope.nvim"] = { + config = { "\27LJ\2\n7\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\28plugin-config/telescope\frequire\0" }, + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/telescope.nvim", + url = "https://github.com/nvim-telescope/telescope.nvim" + }, + ["trouble.nvim"] = { + config = { "\27LJ\2\n9\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\30plugin-config/lsp-trouble\frequire\0" }, + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/trouble.nvim", + url = "https://github.com/folke/trouble.nvim" + }, + ["vim-fugitive"] = { + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/vim-fugitive", + url = "https://github.com/tpope/vim-fugitive" } } time([[Defining packer_plugins]], false) +-- Config for: dressing.nvim +time([[Config for dressing.nvim]], true) +try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27plugin-config/dressing\frequire\0", "config", "dressing.nvim") +time([[Config for dressing.nvim]], false) +-- Config for: telescope.nvim +time([[Config for telescope.nvim]], true) +try_loadstring("\27LJ\2\n7\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\28plugin-config/telescope\frequire\0", "config", "telescope.nvim") +time([[Config for telescope.nvim]], false) +-- Config for: gitsigns.nvim +time([[Config for gitsigns.nvim]], true) +try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27plugin-config/gitsigns\frequire\0", "config", "gitsigns.nvim") +time([[Config for gitsigns.nvim]], false) +-- Config for: nvim-treesitter +time([[Config for nvim-treesitter]], true) +try_loadstring("\27LJ\2\n=\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\"plugin-config/nvim-treesitter\frequire\0", "config", "nvim-treesitter") +time([[Config for nvim-treesitter]], false) +-- Config for: smart-splits.nvim +time([[Config for smart-splits.nvim]], true) +try_loadstring("\27LJ\2\n:\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\31plugin-config/smart-splits\frequire\0", "config", "smart-splits.nvim") +time([[Config for smart-splits.nvim]], false) +-- Config for: nvim-cmp +time([[Config for nvim-cmp]], true) +try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27plugin-config/nvim-cmp\frequire\0", "config", "nvim-cmp") +time([[Config for nvim-cmp]], false) +-- Config for: nvim-hardline +time([[Config for nvim-hardline]], true) +try_loadstring("\27LJ\2\n:\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\rhardline\frequire\0", "config", "nvim-hardline") +time([[Config for nvim-hardline]], false) +-- Config for: indent-blankline.nvim +time([[Config for indent-blankline.nvim]], true) +try_loadstring("\27LJ\2\n–\1\0\0\4\0\6\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0005\3\4\0=\3\5\2B\0\2\1K\0\1\0\21filetype_exclude\1\a\0\0\thelp\nalpha\14dashboard\rneo-tree\fTrouble\tlazy\1\0\1\tchar\b│\nsetup\21indent_blankline\frequire\0", "config", "indent-blankline.nvim") +time([[Config for indent-blankline.nvim]], false) +-- Config for: noice.nvim +time([[Config for noice.nvim]], true) +try_loadstring("\27LJ\2\n3\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\24plugin-config/noice\frequire\0", "config", "noice.nvim") +time([[Config for noice.nvim]], false) +-- Config for: trouble.nvim +time([[Config for trouble.nvim]], true) +try_loadstring("\27LJ\2\n9\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\30plugin-config/lsp-trouble\frequire\0", "config", "trouble.nvim") +time([[Config for trouble.nvim]], false) +-- Config for: mini.indentscope +time([[Config for mini.indentscope]], true) +try_loadstring("\27LJ\2\nr\0\0\4\0\6\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0005\3\4\0=\3\5\2B\0\2\1K\0\1\0\foptions\1\0\1\18try_as_border\2\1\0\1\vsymbol\b│\nsetup\21mini.indentscope\frequire\0", "config", "mini.indentscope") +time([[Config for mini.indentscope]], false) +-- Config for: codewindow.nvim +time([[Config for codewindow.nvim]], true) +try_loadstring("\27LJ\2\nW\0\0\3\0\4\0\b6\0\0\0'\2\1\0B\0\2\0029\1\2\0B\1\1\0019\1\3\0B\1\1\1K\0\1\0\27apply_default_keybinds\nsetup\15codewindow\frequire\0", "config", "codewindow.nvim") +time([[Config for codewindow.nvim]], false) +-- Config for: leap.nvim +time([[Config for leap.nvim]], true) +try_loadstring("\27LJ\2\nA\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\25add_default_mappings\tleap\frequire\0", "config", "leap.nvim") +time([[Config for leap.nvim]], false) +-- Config for: mini.starter +time([[Config for mini.starter]], true) +try_loadstring("\27LJ\2\n9\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\30plugin-config/ministarter\frequire\0", "config", "mini.starter") +time([[Config for mini.starter]], false) _G._packer.inside_compile = false if _G._packer.needs_bufread == true then diff --git a/common/.config/nvim/plugin/packer_compiled.lua.old b/common/.config/nvim/plugin/packer_compiled.lua.old new file mode 100644 index 0000000..88e5536 --- /dev/null +++ b/common/.config/nvim/plugin/packer_compiled.lua.old @@ -0,0 +1,114 @@ +-- Automatically generated packer.nvim plugin loader code + +if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then + vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"') + return +end + +vim.api.nvim_command('packadd packer.nvim') + +local no_errors, error_msg = pcall(function() + +_G._packer = _G._packer or {} +_G._packer.inside_compile = true + +local time +local profile_info +local should_profile = false +if should_profile then + local hrtime = vim.loop.hrtime + profile_info = {} + time = function(chunk, start) + if start then + profile_info[chunk] = hrtime() + else + profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6 + end + end +else + time = function(chunk, start) end +end + +local function save_profiles(threshold) + local sorted_times = {} + for chunk_name, time_taken in pairs(profile_info) do + sorted_times[#sorted_times + 1] = {chunk_name, time_taken} + end + table.sort(sorted_times, function(a, b) return a[2] > b[2] end) + local results = {} + for i, elem in ipairs(sorted_times) do + if not threshold or threshold and elem[2] > threshold then + results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms' + end + end + if threshold then + table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)') + end + + _G._packer.profile_output = results +end + +time([[Luarocks path setup]], true) +local package_path_str = "/home/benk/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/benk/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/benk/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/benk/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/home/benk/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" +if not string.find(package.path, package_path_str, 1, true) then + package.path = package.path .. ';' .. package_path_str +end + +if not string.find(package.cpath, install_cpath_pattern, 1, true) then + package.cpath = package.cpath .. ';' .. install_cpath_pattern +end + +time([[Luarocks path setup]], false) +time([[try_loadstring definition]], true) +local function try_loadstring(s, component, name) + local success, result = pcall(loadstring(s), name, _G.packer_plugins[name]) + if not success then + vim.schedule(function() + vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {}) + end) + end + return result +end + +time([[try_loadstring definition]], false) +time([[Defining packer_plugins]], true) +_G.packer_plugins = { + catppuccin = { + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/catppuccin", + url = "https://github.com/catppuccin/nvim" + }, + ["kanagawa.nvim"] = { + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/kanagawa.nvim", + url = "https://github.com/rebelot/kanagawa.nvim" + }, + ["nvim-web-devicons"] = { + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", + url = "https://github.com/nvim-tree/nvim-web-devicons" + }, + ["packer.nvim"] = { + loaded = true, + path = "/home/benk/.local/share/nvim/site/pack/packer/start/packer.nvim", + url = "https://github.com/wbthomason/packer.nvim" + } +} + +time([[Defining packer_plugins]], false) + +_G._packer.inside_compile = false +if _G._packer.needs_bufread == true then + vim.cmd("doautocmd BufRead") +end +_G._packer.needs_bufread = false + +if should_profile then save_profiles() end + +end) + +if not no_errors then + error_msg = error_msg:gsub('"', '\\"') + vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None') +end