From 975e8e81c31e7c687aeb1991f220ed70d81244f3 Mon Sep 17 00:00:00 2001 From: Tovi Jaeschke-Rogers Date: Tue, 25 Jul 2023 19:55:46 +0930 Subject: [PATCH] Update neovim configs --- .config/nvim/lua/config/barbar.lua | 7 - .config/nvim/lua/config/cmp.lua | 118 ----------- .config/nvim/lua/config/dashboard.lua | 27 +++ .config/nvim/lua/config/lsp.lua | 11 + .config/nvim/lua/config/lsp/init.lua | 75 ------- .config/nvim/lua/config/lsp/installer.lua | 26 --- .config/nvim/lua/config/lsp/keymaps.lua | 36 ---- .config/nvim/lua/config/neoclip.lua | 60 ++++++ .config/nvim/lua/config/neotest.lua | 11 + .config/nvim/lua/config/null-ls.lua | 32 +++ .config/nvim/lua/config/prettier.lua | 19 ++ .config/nvim/lua/config/telescope.lua | 27 +-- .config/nvim/lua/helper/toggle-tab-width.lua | 2 +- .config/nvim/lua/packer-plugins.lua | 70 ++++++- .config/nvim/plugin/packer_compiled.lua | 200 ++++++++++++++----- 15 files changed, 380 insertions(+), 341 deletions(-) delete mode 100644 .config/nvim/lua/config/barbar.lua delete mode 100644 .config/nvim/lua/config/cmp.lua create mode 100644 .config/nvim/lua/config/dashboard.lua delete mode 100644 .config/nvim/lua/config/lsp/init.lua delete mode 100644 .config/nvim/lua/config/lsp/installer.lua delete mode 100644 .config/nvim/lua/config/lsp/keymaps.lua create mode 100644 .config/nvim/lua/config/neoclip.lua create mode 100644 .config/nvim/lua/config/neotest.lua create mode 100644 .config/nvim/lua/config/null-ls.lua create mode 100644 .config/nvim/lua/config/prettier.lua diff --git a/.config/nvim/lua/config/barbar.lua b/.config/nvim/lua/config/barbar.lua deleted file mode 100644 index 1098683..0000000 --- a/.config/nvim/lua/config/barbar.lua +++ /dev/null @@ -1,7 +0,0 @@ --- Set barbar's options -require'bufferline'.setup { - -- Enable/disable auto-hiding the tab bar when there is a single buffer - auto_hide = true, - - insert_at_start = true, -} diff --git a/.config/nvim/lua/config/cmp.lua b/.config/nvim/lua/config/cmp.lua deleted file mode 100644 index 7a3d4a1..0000000 --- a/.config/nvim/lua/config/cmp.lua +++ /dev/null @@ -1,118 +0,0 @@ -local M = {} - -function M.setup() - local has_words_before = function() - local line, col = unpack(vim.api.nvim_win_get_cursor(0)) - return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match "%s" == nil - end - - local luasnip = require("luasnip") - local cmp = require("cmp") - - cmp.setup { - completion = { completeopt = "menu,menuone,noinsert", keyword_length = 1 }, - experimental = { native_menu = false, ghost_text = false }, - snippet = { - expand = function(args) - require("luasnip").lsp_expand(args.body) - end, - }, - formatting = { - format = function(entry, vim_item) - vim_item.menu = ({ - nvim_lsp = "[LSP]", - buffer = "[Buffer]", - luasnip = "[Snip]", - nvim_lua = "[Lua]", - treesitter = "[Treesitter]", - path = "[Path]", - })[entry.source.name] - return vim_item - end, - }, - mapping = { - [""] = cmp.mapping(cmp.mapping.select_prev_item(), { "i", "c" }), - [""] = cmp.mapping(cmp.mapping.select_next_item(), { "i", "c" }), - [""] = cmp.mapping(cmp.mapping.scroll_docs(-4), { "i", "c" }), - [""] = cmp.mapping(cmp.mapping.scroll_docs(4), { "i", "c" }), - [""] = cmp.mapping(cmp.mapping.complete(), { "i", "c" }), - [""] = cmp.mapping { i = cmp.mapping.close(), c = cmp.mapping.close() }, - [""] = cmp.mapping { - i = cmp.mapping.confirm { behavior = cmp.ConfirmBehavior.Replace, select = false }, - c = function(fallback) - if cmp.visible() then - cmp.confirm { behavior = cmp.ConfirmBehavior.Replace, select = false } - else - fallback() - end - end, - }, - [""] = cmp.mapping( - function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - elseif has_words_before() then - cmp.complete() - else - fallback() - end - end, { - "i", - "s", - }), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { - "i", - "s", - }), - - }, - sources = { - { name = "nvim_lsp" }, - { name = "treesitter" }, - { name = "buffer" }, - { name = "luasnip" }, - { name = "nvim_lua" }, - { name = "path" }, - -- { name = "spell" }, - -- { name = "emoji" }, - -- { name = "calc" }, - }, - window = { - documentation = { - border = { "╭", "─", "╮", "│", "╯", "─", "╰", "│" }, - winhighlight = "NormalFloat:NormalFloat,FloatBorder:TelescopeBorder", - }, - }, - } - - -- Use buffer source for `/` - cmp.setup.cmdline("/", { - enabled = false - -- mapping = cmp.mapping.preset.cmdline(), - -- sources = { - -- { name = "buffer" }, - -- }, - }) - - -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore). - cmp.setup.cmdline(':', { - sources = cmp.config.sources({ - { name = 'path' } - }, { - { name = 'cmdline' } - }) - }) - -end - -return M diff --git a/.config/nvim/lua/config/dashboard.lua b/.config/nvim/lua/config/dashboard.lua new file mode 100644 index 0000000..bb93b5c --- /dev/null +++ b/.config/nvim/lua/config/dashboard.lua @@ -0,0 +1,27 @@ +require('dashboard').setup({ + theme = 'hyper', + config = { + week_header = { + enable = true, + }, + shortcut = { + { + icon = '⟳ ', + desc = 'Update', + group = '@property', + action = 'PackerSync', + key = 'u', + }, + { + icon = ' ', + icon_hl = '@variable', + desc = 'Files', + group = 'Label', + action = function () + require('config.telescope').files() + end, + key = 'f', + }, + }, + }, +}) diff --git a/.config/nvim/lua/config/lsp.lua b/.config/nvim/lua/config/lsp.lua index be6c8c2..0a732a6 100644 --- a/.config/nvim/lua/config/lsp.lua +++ b/.config/nvim/lua/config/lsp.lua @@ -14,6 +14,17 @@ local has_words_before = function() end local cmp = require('cmp') + +-- Use buffer source for `/` +cmp.setup.cmdline("/", { + enabled = false +}) + +-- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore). +cmp.setup.cmdline(':', { + enabled = false, +}) + -- local cmp_select = {behavior = cmp.SelectBehavior.Select} local cmp_mappings = lsp.defaults.cmp_mappings({ [""] = cmp.mapping(cmp.mapping.select_prev_item(), { "i", "c" }), diff --git a/.config/nvim/lua/config/lsp/init.lua b/.config/nvim/lua/config/lsp/init.lua deleted file mode 100644 index 8c2ca6a..0000000 --- a/.config/nvim/lua/config/lsp/init.lua +++ /dev/null @@ -1,75 +0,0 @@ -local M = {} - -local function on_attach(client, bufnr) - -- Enable completion triggered by - -- See `:help omnifunc` and `:help ins-completion` for more information. - vim.api.nvim_buf_set_option(bufnr, "omnifunc", "v:lua.vim.lsp.omnifunc") - - -- Use LSP as the handler for formatexpr. - -- See `:help formatexpr` for more information. - vim.api.nvim_buf_set_option(0, "formatexpr", "v:lua.vim.lsp.formatexpr()") - - -- Configure key mappings - require("config.lsp.keymaps").setup(client, bufnr) -end - -local lsp_signature = require "lsp_signature" -lsp_signature.setup { - bind = true, - handler_opts = { - border = "rounded", - }, -} - -local capabilities = require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities()) - -local opts = { - on_attach = on_attach, - capabilities = capabilities, - flags = { - debounce_text_changes = 150, - }, -}; - -local servers = { - gopls = opts, - html = opts, - jsonls = opts, - pyright = opts, - tsserver = opts, - vimls = opts, - dartls = opts, - dockerls = opts, - intelephense = opts, - sqlls = opts, - vuels = { - on_attach = on_attach, - capabilities = capabilities, - flags = { - debounce_text_changes = 150, - }, - init_options = { - config = { - vetur = { - ignoreProjectWarning = true, - } - } - }, - }, - volar = { - filetypes = {'typescript', 'javascript', 'vue', 'json'}, - init_options = { - typescript = { - tsdk = '/usr/lib/node_modules/typescript/lib' - } - } - } -} - -function M.setup() - for server_name, o in pairs(servers) do - require('lspconfig')[server_name].setup(o) - end -end - -return M diff --git a/.config/nvim/lua/config/lsp/installer.lua b/.config/nvim/lua/config/lsp/installer.lua deleted file mode 100644 index 012eb69..0000000 --- a/.config/nvim/lua/config/lsp/installer.lua +++ /dev/null @@ -1,26 +0,0 @@ -local lsp_installer_servers = require "nvim-lsp-installer.servers" -local utils = require "utils" - -local M = {} - -function M.setup(servers, options) - for server_name, _ in pairs(servers) do - local server_available, server = lsp_installer_servers.get_server(server_name) - - if server_available then - server:on_ready(function() - local opts = vim.tbl_deep_extend("force", options, servers[server.name] or {}) - server:setup(opts) - end) - - if not server:is_installed() then - utils.info("Installing " .. server.name) - server:install() - end - else - utils.error(server) - end - end -end - -return M diff --git a/.config/nvim/lua/config/lsp/keymaps.lua b/.config/nvim/lua/config/lsp/keymaps.lua deleted file mode 100644 index 28fd7b1..0000000 --- a/.config/nvim/lua/config/lsp/keymaps.lua +++ /dev/null @@ -1,36 +0,0 @@ -local M = {} - -local keymap = vim.api.nvim_set_keymap -local buf_keymap = vim.api.nvim_buf_set_keymap - -local function keymappings(client, bufnr) - local opts = { noremap = true, silent = true } - - -- Key mappings - vim.keymap.set("n", "K", vim.lsp.buf.hover, opts) - vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, opts) - vim.keymap.set("n", "]d", vim.diagnostic.goto_next, opts) - vim.keymap.set("n", "[e", function () vim.diagnostic.goto_prev({severity = vim.diagnostic.severity.ERROR}) end, opts) - vim.keymap.set("n", "]e", function () vim.diagnostic.goto_next({severity = vim.diagnostic.severity.ERROR}) end, opts) - - vim.keymap.set("n", "rn", vim.lsp.buf.rename, opts) - vim.keymap.set("n", "K", vim.lsp.buf.code_action, opts) - vim.keymap.set("n", "of", vim.diagnostic.open_float, opts) - - -- if client.resolved_capabilities.document_formatting then - -- vim.keymap.set("n", "ff", vim.lsp.buf.formatting, opts) - -- end - - vim.keymap.set("n", "gd", vim.lsp.buf.definition, opts) - vim.keymap.set("n", "gD", vim.lsp.buf.declaration, opts) - -- vim.keymap.set("n", "gr", function() vim.lsp.buf.references({ includeDeclaration = false }) end, opts) - vim.keymap.set("n", "gh", vim.lsp.buf.signature_help, opts) - vim.keymap.set("n", "gi", vim.lsp.buf.implementation, opts) - vim.keymap.set("n", "gT", vim.lsp.buf.type_definition, opts) -end - -function M.setup(client, bufnr) - keymappings(client, bufnr) -end - -return M diff --git a/.config/nvim/lua/config/neoclip.lua b/.config/nvim/lua/config/neoclip.lua new file mode 100644 index 0000000..175275b --- /dev/null +++ b/.config/nvim/lua/config/neoclip.lua @@ -0,0 +1,60 @@ +require('neoclip').setup({ + history = 1000, + enable_persistent_history = true, + length_limit = 1048576, + continuous_sync = true, + db_path = vim.fn.stdpath("data") .. "/databases/neoclip.sqlite3", + filter = nil, + preview = true, + prompt = nil, + default_register = '"', + default_register_macros = 'q', + enable_macro_history = true, + content_spec_column = false, + disable_keycodes_parsing = false, + on_select = { + move_to_front = false, + close_telescope = true, + }, + on_paste = { + set_reg = false, + move_to_front = false, + close_telescope = true, + }, + on_replay = { + set_reg = false, + move_to_front = false, + close_telescope = true, + }, + on_custom_action = { + close_telescope = true, + }, + keys = { + telescope = { + i = { + select = '', + paste = '', + paste_behind = '', + replay = '', -- replay a macro + delete = '', -- delete an entry + edit = '', -- edit an entry + custom = {}, + }, + n = { + select = '', + paste = 'p', + --- It is possible to map to more than one key. + -- paste = { 'p', '' }, + paste_behind = 'P', + replay = 'q', + delete = 'd', + edit = 'e', + custom = {}, + }, + }, + }, +}) + +vim.keymap.set('n', 'cp', function() + require('telescope').extensions.neoclip.default() +end) diff --git a/.config/nvim/lua/config/neotest.lua b/.config/nvim/lua/config/neotest.lua new file mode 100644 index 0000000..b4de069 --- /dev/null +++ b/.config/nvim/lua/config/neotest.lua @@ -0,0 +1,11 @@ +require("neotest").setup({ + adapters = { + require("neotest-phpunit"), + }, +}) + +require("neotest-phpunit")({ + root_files = { "phpunit.xml" }, + phpunit_cmd = { "phpunit" }, + filter_dirs = { "vendor" } +}) diff --git a/.config/nvim/lua/config/null-ls.lua b/.config/nvim/lua/config/null-ls.lua new file mode 100644 index 0000000..218d276 --- /dev/null +++ b/.config/nvim/lua/config/null-ls.lua @@ -0,0 +1,32 @@ +local null_ls = require("null-ls") + +local group = vim.api.nvim_create_augroup("lsp_format_on_save", { clear = false }) +local event = "BufWritePre" -- or "BufWritePost" +local async = event == "BufWritePost" + +null_ls.setup({ + on_attach = function(client, bufnr) + if client.supports_method("textDocument/formatting") then + vim.keymap.set("n", "ff", function() + vim.lsp.buf.format({ bufnr = vim.api.nvim_get_current_buf() }) + end, { buffer = bufnr, desc = "[lsp] format" }) + + -- format on save + vim.api.nvim_clear_autocmds({ buffer = bufnr, group = group }) + vim.api.nvim_create_autocmd(event, { + buffer = bufnr, + group = group, + callback = function() + vim.lsp.buf.format({ bufnr = bufnr, async = async }) + end, + desc = "[lsp] format on save", + }) + end + + if client.supports_method("textDocument/rangeFormatting") then + vim.keymap.set("x", "f", function() + vim.lsp.buf.format({ bufnr = vim.api.nvim_get_current_buf() }) + end, { buffer = bufnr, desc = "[lsp] format" }) + end + end, +}) diff --git a/.config/nvim/lua/config/prettier.lua b/.config/nvim/lua/config/prettier.lua new file mode 100644 index 0000000..abfcd15 --- /dev/null +++ b/.config/nvim/lua/config/prettier.lua @@ -0,0 +1,19 @@ +local prettier = require("prettier") + +prettier.setup({ + bin = 'prettier', + filetypes = { + "css", + "graphql", + "html", + "javascript", + "javascriptreact", + "json", + "less", + "markdown", + "scss", + "typescript", + "typescriptreact", + "yaml", + }, +}) diff --git a/.config/nvim/lua/config/telescope.lua b/.config/nvim/lua/config/telescope.lua index e625a40..cb7655f 100644 --- a/.config/nvim/lua/config/telescope.lua +++ b/.config/nvim/lua/config/telescope.lua @@ -36,26 +36,20 @@ function git_branches () }) end -local options = { noremap = true } - --- vim.keymap.set('n', '', function() --- local term = vim.fn.input("Grep For > ") --- if term == '' then --- return --- end --- require('telescope.builtin').grep_string({ search = term }) --- end, options) - -vim.keymap.set('n', '', require('telescope.builtin').live_grep, options) - -vim.keymap.set('n', '', function() +function files () local ran, errorMessage = pcall(function() require('telescope.builtin').git_files({ show_untracked = true }) end) if not ran then require('telescope.builtin').find_files() end -end, options) +end + +local options = { noremap = true } + +vim.keymap.set('n', '', require('telescope.builtin').live_grep, options) + +vim.keymap.set('n', '', files, options) vim.keymap.set('n', '', function() require('telescope.builtin').find_files() @@ -69,12 +63,9 @@ vim.keymap.set('n', 'df', function() }) end, options) --- vim.keymap.set('n', '', function() --- end, options) - vim.keymap.set('n', 'fb', require('telescope.builtin').buffers, options) vim.keymap.set('n', 'fo', require('telescope.builtin').oldfiles, options) -vim.keymap.set('n', 'gr', require('telescope.builtin').lsp_references, options) +vim.keymap.set('n', 'gr', require('telescope.builtin').lsp_references, options) vim.keymap.set('n', 'm', require('telescope.builtin').marks, options) vim.keymap.set('n', 'ch', require('telescope.builtin').command_history, options) diff --git a/.config/nvim/lua/helper/toggle-tab-width.lua b/.config/nvim/lua/helper/toggle-tab-width.lua index ff702a9..5bf91c0 100644 --- a/.config/nvim/lua/helper/toggle-tab-width.lua +++ b/.config/nvim/lua/helper/toggle-tab-width.lua @@ -16,4 +16,4 @@ function ToggleTabWidth() print('Set tab width to 2') end -vim.keymap.set('n', 't', ToggleTabWidth, { noremap = true}) +vim.keymap.set('n', 'tt', ToggleTabWidth, { noremap = true }) diff --git a/.config/nvim/lua/packer-plugins.lua b/.config/nvim/lua/packer-plugins.lua index 8162e3b..a3f2236 100644 --- a/.config/nvim/lua/packer-plugins.lua +++ b/.config/nvim/lua/packer-plugins.lua @@ -1,12 +1,12 @@ return require('packer').startup(function() -- Packer can manage itself - use 'wbthomason/packer.nvim' + use { 'wbthomason/packer.nvim' } -- colorschemes - use 'gruvbox-community/gruvbox' - use 'bluz71/vim-moonfly-colors' + use { 'gruvbox-community/gruvbox' } + use { 'bluz71/vim-moonfly-colors' } - use 'github/copilot.vim' + use { 'github/copilot.vim' } use {'ojroques/nvim-osc52'} @@ -47,15 +47,28 @@ return require('packer').startup(function() use { 'shumphrey/fugitive-gitlab.vim' } - use 'nvim-lua/popup.nvim' - use 'nvim-lua/plenary.nvim' + use { + "AckslD/nvim-neoclip.lua", + requires = { + {'kkharji/sqlite.lua', module = 'sqlite'}, + {'nvim-telescope/telescope.nvim'}, + }, + config = function() + require('config.neoclip') + end, + } + + use { 'nvim-lua/popup.nvim' } + use { 'nvim-lua/plenary.nvim' } + use { 'nvim-telescope/telescope.nvim', config = function() require('config.telescope') end } - use 'nvim-telescope/telescope-fzy-native.nvim' + + use { 'nvim-telescope/telescope-fzy-native.nvim'} use { 'Rican7/php-doc-modded', @@ -64,7 +77,7 @@ return require('packer').startup(function() end } - use 'dart-lang/dart-vim-plugin' + use { 'dart-lang/dart-vim-plugin' } use { 'nvim-treesitter/nvim-treesitter' } @@ -87,7 +100,7 @@ return require('packer').startup(function() end } - use 'ray-x/guihua.lua' + use { 'ray-x/guihua.lua' } use { 'ray-x/go.nvim', config = function() @@ -107,11 +120,48 @@ return require('packer').startup(function() branch = "v2.x", requires = { "nvim-lua/plenary.nvim", - "kyazdani42/nvim-web-devicons", -- not strictly required, but recommended + "kyazdani42/nvim-web-devicons", "MunifTanjim/nui.nvim", }, config = function () require('config.nvim-neo-tree') end } + + use { + 'glepnir/dashboard-nvim', + event = 'VimEnter', + config = function() + require('config.dashboard') + end, + requires = {'nvim-tree/nvim-web-devicons'} + } + + use { + "nvim-neotest/neotest", + requires = { + "nvim-lua/plenary.nvim", + "nvim-treesitter/nvim-treesitter", + "antoinemadec/FixCursorHold.nvim", + -- Adapters + "olimorris/neotest-phpunit", + "nvim-neotest/neotest-go", + }, + config = function() + require('config.neotest') + end, + } + + use { + 'MunifTanjim/prettier.nvim', + requires = { + 'jose-elias-alvarez/null-ls.nvim', + 'neovim/nvim-lspconfig', + }, + + config = function() + require('config.null-ls') + require('config.prettier') + end + } end) diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua index cdaa766..726b13c 100644 --- a/.config/nvim/plugin/packer_compiled.lua +++ b/.config/nvim/plugin/packer_compiled.lua @@ -49,8 +49,8 @@ local function save_profiles(threshold) end time([[Luarocks path setup]], true) -local package_path_str = "/home/tovij/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/tovij/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/tovij/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/tovij/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/home/tovij/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" +local package_path_str = "/home/tovi/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/tovi/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/tovi/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/tovi/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/home/tovi/.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 @@ -74,222 +74,319 @@ end time([[try_loadstring definition]], false) time([[Defining packer_plugins]], true) _G.packer_plugins = { + ["FixCursorHold.nvim"] = { + loaded = true, + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/FixCursorHold.nvim", + url = "https://github.com/antoinemadec/FixCursorHold.nvim" + }, LuaSnip = { loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/LuaSnip", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/LuaSnip", url = "https://github.com/L3MON4D3/LuaSnip" }, ["cmp-buffer"] = { loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/cmp-buffer", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/cmp-buffer", url = "https://github.com/hrsh7th/cmp-buffer" }, ["cmp-nvim-lsp"] = { loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", url = "https://github.com/hrsh7th/cmp-nvim-lsp" }, ["cmp-nvim-lua"] = { loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/cmp-nvim-lua", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/cmp-nvim-lua", url = "https://github.com/hrsh7th/cmp-nvim-lua" }, ["cmp-path"] = { loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/cmp-path", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/cmp-path", url = "https://github.com/hrsh7th/cmp-path" }, cmp_luasnip = { loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/cmp_luasnip", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/cmp_luasnip", url = "https://github.com/saadparwaiz1/cmp_luasnip" }, ["copilot.vim"] = { loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/copilot.vim", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/copilot.vim", url = "https://github.com/github/copilot.vim" }, ["dart-vim-plugin"] = { loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/dart-vim-plugin", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/dart-vim-plugin", url = "https://github.com/dart-lang/dart-vim-plugin" }, + ["dashboard-nvim"] = { + config = { "\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21config.dashboard\frequire\0" }, + loaded = false, + needs_bufread = false, + only_cond = false, + path = "/home/tovi/.local/share/nvim/site/pack/packer/opt/dashboard-nvim", + url = "https://github.com/glepnir/dashboard-nvim" + }, ["friendly-snippets"] = { loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/friendly-snippets", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/friendly-snippets", url = "https://github.com/rafamadriz/friendly-snippets" }, ["fugitive-gitlab.vim"] = { loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/fugitive-gitlab.vim", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/fugitive-gitlab.vim", url = "https://github.com/shumphrey/fugitive-gitlab.vim" }, ["gitsigns.nvim"] = { config = { "\27LJ\2\n/\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\20config.gitsigns\frequire\0" }, loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/gitsigns.nvim", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/gitsigns.nvim", url = "https://github.com/lewis6991/gitsigns.nvim" }, ["go.nvim"] = { config = { "\27LJ\2\n)\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\14config.go\frequire\0" }, loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/go.nvim", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/go.nvim", url = "https://github.com/ray-x/go.nvim" }, gruvbox = { loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/gruvbox", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/gruvbox", url = "https://github.com/gruvbox-community/gruvbox" }, ["guihua.lua"] = { loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/guihua.lua", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/guihua.lua", url = "https://github.com/ray-x/guihua.lua" }, ["lsp-status.nvim"] = { loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/lsp-status.nvim", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/lsp-status.nvim", url = "https://github.com/nvim-lua/lsp-status.nvim" }, ["lsp-zero.nvim"] = { config = { "\27LJ\2\n*\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\15config.lsp\frequire\0" }, loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/lsp-zero.nvim", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/lsp-zero.nvim", url = "https://github.com/VonHeikemen/lsp-zero.nvim" }, ["lualine.nvim"] = { config = { "\27LJ\2\n.\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\19config.lualine\frequire\0" }, loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/lualine.nvim", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/lualine.nvim", url = "https://github.com/nvim-lualine/lualine.nvim" }, ["mason-lspconfig.nvim"] = { loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim", url = "https://github.com/williamboman/mason-lspconfig.nvim" }, ["mason.nvim"] = { loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/mason.nvim", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/mason.nvim", url = "https://github.com/williamboman/mason.nvim" }, ["neo-tree.nvim"] = { config = { "\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25config.nvim-neo-tree\frequire\0" }, loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/neo-tree.nvim", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/neo-tree.nvim", url = "https://github.com/nvim-neo-tree/neo-tree.nvim" }, + neotest = { + config = { "\27LJ\2\n.\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\19config.neotest\frequire\0" }, + loaded = true, + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/neotest", + url = "https://github.com/nvim-neotest/neotest" + }, + ["neotest-go"] = { + loaded = true, + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/neotest-go", + url = "https://github.com/nvim-neotest/neotest-go" + }, + ["neotest-phpunit"] = { + loaded = true, + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/neotest-phpunit", + url = "https://github.com/olimorris/neotest-phpunit" + }, ["nui.nvim"] = { loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/nui.nvim", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/nui.nvim", url = "https://github.com/MunifTanjim/nui.nvim" }, + ["null-ls.nvim"] = { + loaded = true, + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/null-ls.nvim", + url = "https://github.com/jose-elias-alvarez/null-ls.nvim" + }, ["nvim-cmp"] = { loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/nvim-cmp", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/nvim-cmp", url = "https://github.com/hrsh7th/nvim-cmp" }, ["nvim-lspconfig"] = { loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", url = "https://github.com/neovim/nvim-lspconfig" }, + ["nvim-neoclip.lua"] = { + config = { "\27LJ\2\n.\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\19config.neoclip\frequire\0" }, + loaded = true, + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/nvim-neoclip.lua", + url = "https://github.com/AckslD/nvim-neoclip.lua" + }, ["nvim-osc52"] = { loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/nvim-osc52", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/nvim-osc52", url = "https://github.com/ojroques/nvim-osc52" }, ["nvim-treesitter"] = { loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/nvim-treesitter", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/nvim-treesitter", url = "https://github.com/nvim-treesitter/nvim-treesitter" }, ["nvim-web-devicons"] = { loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", url = "https://github.com/kyazdani42/nvim-web-devicons" }, ["packer.nvim"] = { loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/packer.nvim", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/packer.nvim", url = "https://github.com/wbthomason/packer.nvim" }, ["php-doc-modded"] = { config = { "\27LJ\2\n.\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\19config.php-doc\frequire\0" }, loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/php-doc-modded", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/php-doc-modded", url = "https://github.com/Rican7/php-doc-modded" }, ["plenary.nvim"] = { loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/plenary.nvim", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/plenary.nvim", url = "https://github.com/nvim-lua/plenary.nvim" }, ["popup.nvim"] = { loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/popup.nvim", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/popup.nvim", url = "https://github.com/nvim-lua/popup.nvim" }, + ["prettier.nvim"] = { + config = { "\27LJ\2\nJ\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0016\0\0\0'\2\2\0B\0\2\1K\0\1\0\20config.prettier\19config.null-ls\frequire\0" }, + loaded = true, + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/prettier.nvim", + url = "https://github.com/MunifTanjim/prettier.nvim" + }, + ["sqlite.lua"] = { + loaded = false, + needs_bufread = false, + only_cond = false, + path = "/home/tovi/.local/share/nvim/site/pack/packer/opt/sqlite.lua", + url = "https://github.com/kkharji/sqlite.lua" + }, ["telescope-fzy-native.nvim"] = { loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/telescope-fzy-native.nvim", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/telescope-fzy-native.nvim", url = "https://github.com/nvim-telescope/telescope-fzy-native.nvim" }, ["telescope.nvim"] = { config = { "\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21config.telescope\frequire\0" }, loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/telescope.nvim", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/telescope.nvim", url = "https://github.com/nvim-telescope/telescope.nvim" }, ["tmux.nvim"] = { config = { "\27LJ\2\n+\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\16config.tmux\frequire\0" }, loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/tmux.nvim", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/tmux.nvim", url = "https://github.com/aserowy/tmux.nvim" }, ultisnips = { loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/ultisnips", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/ultisnips", url = "https://github.com/SirVer/ultisnips" }, ["vim-fugitive"] = { config = { "\27LJ\2\n/\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\20config.fugitive\frequire\0" }, loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/vim-fugitive", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/vim-fugitive", url = "https://github.com/tpope/vim-fugitive" }, ["vim-moonfly-colors"] = { loaded = true, - path = "/home/tovij/.local/share/nvim/site/pack/packer/start/vim-moonfly-colors", + path = "/home/tovi/.local/share/nvim/site/pack/packer/start/vim-moonfly-colors", url = "https://github.com/bluz71/vim-moonfly-colors" } } time([[Defining packer_plugins]], false) --- Config for: neo-tree.nvim -time([[Config for neo-tree.nvim]], true) -try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25config.nvim-neo-tree\frequire\0", "config", "neo-tree.nvim") -time([[Config for neo-tree.nvim]], false) +local module_lazy_loads = { + ["^sqlite"] = "sqlite.lua" +} +local lazy_load_called = {['packer.load'] = true} +local function lazy_load_module(module_name) + local to_load = {} + if lazy_load_called[module_name] then return nil end + lazy_load_called[module_name] = true + for module_pat, plugin_name in pairs(module_lazy_loads) do + if not _G.packer_plugins[plugin_name].loaded and string.match(module_name, module_pat) then + to_load[#to_load + 1] = plugin_name + end + end + + if #to_load > 0 then + require('packer.load')(to_load, {module = module_name}, _G.packer_plugins) + local loaded_mod = package.loaded[module_name] + if loaded_mod then + return function(modname) return loaded_mod end + end + end +end + +if not vim.g.packer_custom_loader_enabled then + table.insert(package.loaders, 1, lazy_load_module) + vim.g.packer_custom_loader_enabled = true +end + +-- Config for: nvim-neoclip.lua +time([[Config for nvim-neoclip.lua]], 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\19config.neoclip\frequire\0", "config", "nvim-neoclip.lua") +time([[Config for nvim-neoclip.lua]], false) +-- Config for: telescope.nvim +time([[Config for telescope.nvim]], true) +try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21config.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\n/\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\20config.gitsigns\frequire\0", "config", "gitsigns.nvim") time([[Config for gitsigns.nvim]], false) +-- Config for: tmux.nvim +time([[Config for tmux.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\16config.tmux\frequire\0", "config", "tmux.nvim") +time([[Config for tmux.nvim]], false) -- Config for: lsp-zero.nvim time([[Config for lsp-zero.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\15config.lsp\frequire\0", "config", "lsp-zero.nvim") time([[Config for lsp-zero.nvim]], false) --- Config for: telescope.nvim -time([[Config for telescope.nvim]], true) -try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21config.telescope\frequire\0", "config", "telescope.nvim") -time([[Config for telescope.nvim]], false) +-- Config for: prettier.nvim +time([[Config for prettier.nvim]], true) +try_loadstring("\27LJ\2\nJ\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0016\0\0\0'\2\2\0B\0\2\1K\0\1\0\20config.prettier\19config.null-ls\frequire\0", "config", "prettier.nvim") +time([[Config for prettier.nvim]], false) -- Config for: go.nvim time([[Config for go.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\14config.go\frequire\0", "config", "go.nvim") time([[Config for go.nvim]], false) +-- Config for: neo-tree.nvim +time([[Config for neo-tree.nvim]], true) +try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25config.nvim-neo-tree\frequire\0", "config", "neo-tree.nvim") +time([[Config for neo-tree.nvim]], false) -- Config for: lualine.nvim time([[Config for lualine.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\19config.lualine\frequire\0", "config", "lualine.nvim") time([[Config for lualine.nvim]], false) +-- Config for: neotest +time([[Config for neotest]], 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\19config.neotest\frequire\0", "config", "neotest") +time([[Config for neotest]], false) -- Config for: vim-fugitive time([[Config for vim-fugitive]], 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\20config.fugitive\frequire\0", "config", "vim-fugitive") @@ -298,10 +395,13 @@ time([[Config for vim-fugitive]], false) time([[Config for php-doc-modded]], 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\19config.php-doc\frequire\0", "config", "php-doc-modded") time([[Config for php-doc-modded]], false) --- Config for: tmux.nvim -time([[Config for tmux.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\16config.tmux\frequire\0", "config", "tmux.nvim") -time([[Config for tmux.nvim]], false) +vim.cmd [[augroup packer_load_aucmds]] +vim.cmd [[au!]] + -- Event lazy-loads +time([[Defining lazy-load event autocommands]], true) +vim.cmd [[au VimEnter * ++once lua require("packer.load")({'dashboard-nvim'}, { event = "VimEnter *" }, _G.packer_plugins)]] +time([[Defining lazy-load event autocommands]], false) +vim.cmd("augroup END") _G._packer.inside_compile = false if _G._packer.needs_bufread == true then