From 3f8663cd3c2ce9bf9a23877ca9d2e613e983e912 Mon Sep 17 00:00:00 2001 From: Ruslan Date: Sat, 1 Jun 2024 16:10:44 +0300 Subject: [PATCH] replace packer with lazy vim --- after/plugin/colorizer.lua | 2 - after/plugin/completion.lua | 36 ------ after/plugin/fugitive.lua | 1 - after/plugin/harpoon.lua | 10 -- after/plugin/lsp.lua | 21 ---- after/plugin/telescope.lua | 7 -- after/plugin/treesitter.lua | 24 ---- after/plugin/undootree.lua | 1 - init.lua | 1 - lazy-lock.json | 22 ++++ lua/crentist/init.lua | 23 ++++ lua/crentist/lazy/colors.lua | 8 ++ lua/crentist/lazy/fugitive.lua | 34 ++++++ lua/crentist/lazy/harpoon.lua | 18 +++ lua/crentist/lazy/init.lua | 6 + lua/crentist/lazy/lsp.lua | 56 +++++++++ lua/crentist/lazy/telescope.lua | 30 +++++ lua/crentist/lazy/treesitter.lua | 30 +++++ lua/crentist/lazy/undotree.lua | 8 ++ lua/crentist/lazy_init.lua | 19 ++++ lua/crentist/packer.lua | 44 ------- lua/crentist/remap.lua | 23 ++++ lua/crentist/set.lua | 32 ++++++ plugin/packer_compiled.lua | 189 ------------------------------- 24 files changed, 309 insertions(+), 336 deletions(-) delete mode 100644 after/plugin/colorizer.lua delete mode 100644 after/plugin/completion.lua delete mode 100644 after/plugin/fugitive.lua delete mode 100644 after/plugin/harpoon.lua delete mode 100644 after/plugin/lsp.lua delete mode 100644 after/plugin/telescope.lua delete mode 100644 after/plugin/treesitter.lua delete mode 100644 after/plugin/undootree.lua create mode 100644 lazy-lock.json create mode 100644 lua/crentist/lazy/colors.lua create mode 100644 lua/crentist/lazy/fugitive.lua create mode 100644 lua/crentist/lazy/harpoon.lua create mode 100644 lua/crentist/lazy/init.lua create mode 100644 lua/crentist/lazy/lsp.lua create mode 100644 lua/crentist/lazy/telescope.lua create mode 100644 lua/crentist/lazy/treesitter.lua create mode 100644 lua/crentist/lazy/undotree.lua create mode 100644 lua/crentist/lazy_init.lua delete mode 100644 lua/crentist/packer.lua create mode 100644 lua/crentist/set.lua delete mode 100644 plugin/packer_compiled.lua diff --git a/after/plugin/colorizer.lua b/after/plugin/colorizer.lua deleted file mode 100644 index 337a1ce..0000000 --- a/after/plugin/colorizer.lua +++ /dev/null @@ -1,2 +0,0 @@ -local color = require('colorizer') -color.setup() diff --git a/after/plugin/completion.lua b/after/plugin/completion.lua deleted file mode 100644 index d4e3cd5..0000000 --- a/after/plugin/completion.lua +++ /dev/null @@ -1,36 +0,0 @@ ---- --- Autocompletion config ---- -local lsp_zero = require('lsp-zero') -local cmp = require('cmp') -local cmp_action = lsp_zero.cmp_action() - -cmp.setup({ - sources = { - { name = 'path' }, - { name = 'nvim_lsp' }, - { name = 'luasnip', keyword_length = 2 }, - { name = 'buffer', keyword_length = 3 }, - }, - mapping = cmp.mapping.preset.insert({ - -- `Enter` key to confirm completion - [''] = cmp.mapping.confirm({ select = false }), - - -- Ctrl+Space to trigger completion menu - [''] = cmp.mapping.complete(), - - -- Navigate between snippet placeholder - [''] = cmp_action.luasnip_jump_forward(), - [''] = cmp_action.luasnip_jump_backward(), - - -- Scroll up and down in the completion documentation - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - }), - snippet = { - expand = function(args) - require('luasnip').lsp_expand(args.body) - end, - }, -}) - diff --git a/after/plugin/fugitive.lua b/after/plugin/fugitive.lua deleted file mode 100644 index 6e1b92d..0000000 --- a/after/plugin/fugitive.lua +++ /dev/null @@ -1 +0,0 @@ -vim.keymap.set('n', 'gs', vim.cmd.Git) diff --git a/after/plugin/harpoon.lua b/after/plugin/harpoon.lua deleted file mode 100644 index 3b74a82..0000000 --- a/after/plugin/harpoon.lua +++ /dev/null @@ -1,10 +0,0 @@ -local mark = require("harpoon.mark") -local ui = require("harpoon.ui") - -vim.keymap.set("n", "a", mark.add_file) -vim.keymap.set("n", "", ui.toggle_quick_menu) - -vim.keymap.set("n", "", function() ui.nav_file(1) end) -vim.keymap.set("n", "", function() ui.nav_file(2) end) -vim.keymap.set("n", "", function() ui.nav_file(3) end) -vim.keymap.set("n", "", function() ui.nav_file(4) end) diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua deleted file mode 100644 index 8fdc13d..0000000 --- a/after/plugin/lsp.lua +++ /dev/null @@ -1,21 +0,0 @@ -local lsp_zero = require('lsp-zero') - -lsp_zero.on_attach(function(client, bufnr) - lsp_zero.default_keymaps({ buffer = bufnr }) - vim.keymap.set('n', '', ':LspZeroFormat', { buffer = bufnr }) - -end) - -require('mason').setup({}) -require('mason-lspconfig').setup({ - -- Replace the language servers listed here - -- with the ones you want to install - ensure_installed = { 'tsserver', 'lua_ls', 'gopls', 'pylsp', 'gitlab_ci_ls', 'yamlls' }, - handlers = { - function(server_name) - require('lspconfig')[server_name].setup({}) - end, - } -}) - -lsp_zero.setup() diff --git a/after/plugin/telescope.lua b/after/plugin/telescope.lua deleted file mode 100644 index d73e8a3..0000000 --- a/after/plugin/telescope.lua +++ /dev/null @@ -1,7 +0,0 @@ -local builtin = require('telescope.builtin') -vim.keymap.set('n', 'pf', builtin.find_files, {}) -vim.keymap.set('n', 'ps', function() - builtin.grep_string({ search = vim.fn.input("Grep > ") }) -end) -vim.keymap.set('n', '', builtin.git_files, {}) - diff --git a/after/plugin/treesitter.lua b/after/plugin/treesitter.lua deleted file mode 100644 index 0de9136..0000000 --- a/after/plugin/treesitter.lua +++ /dev/null @@ -1,24 +0,0 @@ -require'nvim-treesitter.configs'.setup { - -- A list of parser names, or "all" (the five listed parsers should always be installed) - ensure_installed = {"bash", "javascript", "typescript", "python", "go", "terraform", "hcl", "helm", "jq", "yaml", "tmux", "lua", "vim", "vimdoc"}, - - -- Install parsers synchronously (only applied to `ensure_installed`) - sync_install = false, - - -- Automatically install missing parsers when entering buffer - -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally - auto_install = true, - - ---- If you need to change the installation directory of the parsers (see -> Advanced Setup) - -- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")! - - highlight = { - enable = true, - - -- Setting this to true will run `:h syntax` and tree-sitter at the same time. - -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). - -- Using this option may slow down your editor, and you may see some duplicate highlights. - -- Instead of true it can also be a list of languages - additional_vim_regex_highlighting = false, - }, -} diff --git a/after/plugin/undootree.lua b/after/plugin/undootree.lua deleted file mode 100644 index a346462..0000000 --- a/after/plugin/undootree.lua +++ /dev/null @@ -1 +0,0 @@ -vim.keymap.set('n', 'u', vim.cmd.UndotreeToggle) diff --git a/init.lua b/init.lua index 9fcf4ff..a612708 100644 --- a/init.lua +++ b/init.lua @@ -1,2 +1 @@ require("crentist") - diff --git a/lazy-lock.json b/lazy-lock.json new file mode 100644 index 0000000..615f502 --- /dev/null +++ b/lazy-lock.json @@ -0,0 +1,22 @@ +{ + "LuaSnip": { "branch": "master", "commit": "878ace11983444d865a72e1759dbcc331d1ace4c" }, + "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, + "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "fidget.nvim": { "branch": "main", "commit": "ef99df04a1c53a453602421bc0f756997edc8289" }, + "gruvbox.nvim": { "branch": "main", "commit": "f99a08abc5ab0b9b5b0e7a33211a439155c60a61" }, + "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" }, + "lazy.nvim": { "branch": "main", "commit": "eab487c2520f0fe9e54eb5e3ea0606e20512492e" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, + "mason.nvim": { "branch": "main", "commit": "0fb4e56837f13b81a972fcc0554be1327b39061e" }, + "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, + "nvim-lspconfig": { "branch": "master", "commit": "710a8fa7379db32199545f30ea01dd8446b9302f" }, + "nvim-treesitter": { "branch": "master", "commit": "979beffc1a86e7ba19bd6535c0370d8e1aaaad3c" }, + "plenary": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, + "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, + "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, + "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" }, + "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" } +} \ No newline at end of file diff --git a/lua/crentist/init.lua b/lua/crentist/init.lua index ba7a778..79cd1de 100644 --- a/lua/crentist/init.lua +++ b/lua/crentist/init.lua @@ -1,2 +1,25 @@ require("crentist.remap") +require("crentist.set") +require("crentist.lazy_init") +local augroup = vim.api.nvim_create_augroup +local CrentistGroup = augroup('Crentist', {}) +local autocmd = vim.api.nvim_create_autocmd + +autocmd('LspAttach', { + group = CrentistGroup, + callback = function(e) + local opts = { buffer = e.buf } + vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts) + vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts) + vim.keymap.set("n", "vws", function() vim.lsp.buf.workspace_symbol() end, opts) + vim.keymap.set("n", "vd", function() vim.diagnostic.open_float() end, opts) + vim.keymap.set("n", "vca", function() vim.lsp.buf.code_action() end, opts) + vim.keymap.set("n", "vrr", function() vim.lsp.buf.references() end, opts) + vim.keymap.set("n", "vrn", function() vim.lsp.buf.rename() end, opts) + vim.keymap.set("i", "", function() vim.lsp.buf.signature_help() end, opts) + vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts) + vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts) + vim.keymap.set("n", "", "lua vim.lsp.buf.format()") + end +}) diff --git a/lua/crentist/lazy/colors.lua b/lua/crentist/lazy/colors.lua new file mode 100644 index 0000000..1b70a9d --- /dev/null +++ b/lua/crentist/lazy/colors.lua @@ -0,0 +1,8 @@ +return { + "ellisonleao/gruvbox.nvim", + priority = 1000, + config = function() + require("gruvbox").setup({}) + vim.cmd("colorscheme gruvbox") + end +} diff --git a/lua/crentist/lazy/fugitive.lua b/lua/crentist/lazy/fugitive.lua new file mode 100644 index 0000000..7b7e754 --- /dev/null +++ b/lua/crentist/lazy/fugitive.lua @@ -0,0 +1,34 @@ +return { + "tpope/vim-fugitive", + config = function() + vim.keymap.set("n", "gs", vim.cmd.Git) + + local Crentist_Fugitive = vim.api.nvim_create_augroup("Crentist_Fugitive", {}) + + local autocmd = vim.api.nvim_create_autocmd + autocmd("BufWinEnter", { + group = Crentist_Fugitive, + pattern = "*", + callback = function() + if vim.bo.ft ~= "fugitive" then + return + end + + local bufnr = vim.api.nvim_get_current_buf() + local opts = {buffer = bufnr, remap = false} + vim.keymap.set("n", "p", function() + vim.cmd.Git('push') + end, opts) + + -- rebase always + vim.keymap.set("n", "P", function() + vim.cmd.Git({'pull', '--rebase'}) + end, opts) + + -- NOTE: It allows me to easily set the branch i am pushing and any tracking + -- needed if i did not set the branch up correctly + vim.keymap.set("n", "t", ":Git push -u origin ", opts); + end, + }) + end +} diff --git a/lua/crentist/lazy/harpoon.lua b/lua/crentist/lazy/harpoon.lua new file mode 100644 index 0000000..af10c51 --- /dev/null +++ b/lua/crentist/lazy/harpoon.lua @@ -0,0 +1,18 @@ +return { + "theprimeagen/harpoon", + branch = "harpoon2", + dependencies = { "nvim-lua/plenary.nvim" }, + config = function() + local harpoon = require("harpoon") + + harpoon:setup() + + vim.keymap.set("n", "a", function() harpoon:list():add() end) + vim.keymap.set("n", "", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end) + + vim.keymap.set("n", "", function() harpoon:list():select(1) end) + vim.keymap.set("n", "", function() harpoon:list():select(2) end) + vim.keymap.set("n", "", function() harpoon:list():select(3) end) + vim.keymap.set("n", "", function() harpoon:list():select(4) end) + end +} diff --git a/lua/crentist/lazy/init.lua b/lua/crentist/lazy/init.lua new file mode 100644 index 0000000..b3f695d --- /dev/null +++ b/lua/crentist/lazy/init.lua @@ -0,0 +1,6 @@ +return { + { + "nvim-lua/plenary.nvim", + name = "plenary" + }, +} diff --git a/lua/crentist/lazy/lsp.lua b/lua/crentist/lazy/lsp.lua new file mode 100644 index 0000000..6abb694 --- /dev/null +++ b/lua/crentist/lazy/lsp.lua @@ -0,0 +1,56 @@ +return { + "neovim/nvim-lspconfig", + dependencies = { + "williamboman/mason.nvim", + "williamboman/mason-lspconfig.nvim", + "hrsh7th/cmp-nvim-lsp", + "hrsh7th/cmp-buffer", + "hrsh7th/cmp-path", + "hrsh7th/cmp-cmdline", + "hrsh7th/nvim-cmp", + "L3MON4D3/LuaSnip", + "saadparwaiz1/cmp_luasnip", + "j-hui/fidget.nvim", + }, + + config = function() + local cmp = require('cmp') + + require("fidget").setup({}) + require('mason').setup({}) + require('mason-lspconfig').setup({ + -- Replace the language servers listed here + -- with the ones you want to install + ensure_installed = { 'tsserver', 'lua_ls', 'gopls', 'pylsp', 'gitlab_ci_ls', 'yamlls' }, + handlers = { + function(server_name) + require('lspconfig')[server_name].setup({}) + end, + } + }) + cmp.setup({ + sources = { + { name = 'path' }, + { name = 'nvim_lsp' }, + { name = 'luasnip', keyword_length = 2 }, + { name = 'buffer', keyword_length = 3 }, + }, + mapping = cmp.mapping.preset.insert({ + -- `Enter` key to confirm completion + [''] = cmp.mapping.confirm({ select = false }), + + -- Ctrl+Space to trigger completion menu + [''] = cmp.mapping.complete(), + + -- Scroll up and down in the completion documentation + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + }), + snippet = { + expand = function(args) + require('luasnip').lsp_expand(args.body) + end, + }, + }) + end +} diff --git a/lua/crentist/lazy/telescope.lua b/lua/crentist/lazy/telescope.lua new file mode 100644 index 0000000..eb1f76b --- /dev/null +++ b/lua/crentist/lazy/telescope.lua @@ -0,0 +1,30 @@ +return { + "nvim-telescope/telescope.nvim", + + version = "0.1.6", + + dependencies = { + "nvim-lua/plenary.nvim" + }, + + config = function() + require('telescope').setup({}) + + local builtin = require('telescope.builtin') + vim.keymap.set('n', 'pf', builtin.find_files, {}) + vim.keymap.set('n', '', builtin.git_files, {}) + vim.keymap.set('n', 'pws', function() + local word = vim.fn.expand("") + builtin.grep_string({ search = word }) + end) + vim.keymap.set('n', 'pWs', function() + local word = vim.fn.expand("") + builtin.grep_string({ search = word }) + end) + vim.keymap.set('n', 'ps', function() + builtin.grep_string({ search = vim.fn.input("Grep > ") }) + end) + vim.keymap.set('n', 'vh', builtin.help_tags, {}) + end +} + diff --git a/lua/crentist/lazy/treesitter.lua b/lua/crentist/lazy/treesitter.lua new file mode 100644 index 0000000..daa74c3 --- /dev/null +++ b/lua/crentist/lazy/treesitter.lua @@ -0,0 +1,30 @@ +return { + "nvim-treesitter/nvim-treesitter", + build = ":TSUpdate", + config = function() + require("nvim-treesitter.configs").setup({ + -- A list of parser names, or "all" (the five listed parsers should always be installed) + ensure_installed = { "bash", "javascript", "typescript", "python", "go", "terraform", "hcl", "helm", "jq", "yaml", "tmux", "lua", "vim", "vimdoc" }, + + -- Install parsers synchronously (only applied to `ensure_installed`) + sync_install = false, + + -- Automatically install missing parsers when entering buffer + -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally + auto_install = true, + + ---- If you need to change the installation directory of the parsers (see -> Advanced Setup) + -- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")! + + highlight = { + enable = true, + + -- Setting this to true will run `:h syntax` and tree-sitter at the same time. + -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). + -- Using this option may slow down your editor, and you may see some duplicate highlights. + -- Instead of true it can also be a list of languages + additional_vim_regex_highlighting = false, + }, + }) + end +} diff --git a/lua/crentist/lazy/undotree.lua b/lua/crentist/lazy/undotree.lua new file mode 100644 index 0000000..c3e720d --- /dev/null +++ b/lua/crentist/lazy/undotree.lua @@ -0,0 +1,8 @@ +return { + "mbbill/undotree", + + config = function() + vim.keymap.set("n", "u", vim.cmd.UndotreeToggle) + end +} + diff --git a/lua/crentist/lazy_init.lua b/lua/crentist/lazy_init.lua new file mode 100644 index 0000000..6b9bed2 --- /dev/null +++ b/lua/crentist/lazy_init.lua @@ -0,0 +1,19 @@ +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not (vim.uv or vim.loop).fs_stat(lazypath) then + 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) + +require("lazy").setup( + { + spec = "crentist.lazy", + change_detection = { notify = false } + } +) diff --git a/lua/crentist/packer.lua b/lua/crentist/packer.lua deleted file mode 100644 index 2483fd1..0000000 --- a/lua/crentist/packer.lua +++ /dev/null @@ -1,44 +0,0 @@ --- This file can be loaded by calling `lua require('plugins')` from your init.vim - --- Only required if you have packer configured as `opt` -vim.cmd [[packadd packer.nvim]] - -return require('packer').startup(function(use) - -- Packer can manage itself - use('wbthomason/packer.nvim') - - use { - 'nvim-telescope/telescope.nvim', tag = '0.1.6', - requires = { { 'nvim-lua/plenary.nvim' } } - } - - use { - 'ellisonleao/gruvbox.nvim', - config = function() - vim.cmd('colorscheme gruvbox') - end - } - - use('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' }) - use('ThePrimeagen/harpoon') - use('mbbill/undotree') - use('tpope/vim-fugitive') - - use { - 'VonHeikemen/lsp-zero.nvim', - branch = 'v3.x', - requires = { - --- Uncomment the two plugins below if you want to manage the language servers from neovim - { 'williamboman/mason.nvim' }, - { 'williamboman/mason-lspconfig.nvim' }, - - { 'neovim/nvim-lspconfig' }, - { 'hrsh7th/nvim-cmp' }, - { 'hrsh7th/cmp-buffer' }, - { 'hrsh7th/cmp-path' }, - { 'hrsh7th/cmp-nvim-lsp' }, - { 'L3MON4D3/LuaSnip' }, - } - } - use('norcalli/nvim-colorizer.lua') -end) diff --git a/lua/crentist/remap.lua b/lua/crentist/remap.lua index 420636b..f99b537 100644 --- a/lua/crentist/remap.lua +++ b/lua/crentist/remap.lua @@ -1,3 +1,26 @@ vim.g.mapleader = " " vim.keymap.set("n", "pv", vim.cmd.Ex) +-- move selected blocks +vim.keymap.set("v", "", ":m '>+1gv=gv") +vim.keymap.set("v", "", ":m '<-2gv=gv") + +-- keep cursor on J +vim.keymap.set("n", "J", "mzJ`z") +-- keep search in the middle +vim.keymap.set("n", "n", "nzzzv") +vim.keymap.set("n", "N", "Nzzzv") + +-- greatest remap ever +-- save register on pasting +vim.keymap.set("x", "p", [["_dP]]) + +-- next greatest remap ever : asbjornHaland +vim.keymap.set({"n", "v"}, "y", [["+y]]) +vim.keymap.set("n", "Y", [["+Y]]) + +vim.keymap.set({"n", "v"}, "d", [["_d]]) + +vim.keymap.set("n", "Q", "") + +vim.keymap.set("n", "s", [[:%s/\<\>//gI]]) diff --git a/lua/crentist/set.lua b/lua/crentist/set.lua new file mode 100644 index 0000000..18acbf1 --- /dev/null +++ b/lua/crentist/set.lua @@ -0,0 +1,32 @@ +vim.opt.guicursor = "" + +vim.opt.nu = true +vim.opt.relativenumber = true + +vim.opt.tabstop = 4 +vim.opt.softtabstop = 4 +vim.opt.shiftwidth = 4 +vim.opt.expandtab = true + +vim.opt.smartindent = true + +vim.opt.wrap = false + +vim.opt.swapfile = false +vim.opt.backup = false +vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir" +vim.opt.undofile = true + +vim.opt.hlsearch = false +vim.opt.incsearch = true + +vim.opt.termguicolors = true + +vim.opt.scrolloff = 8 +vim.opt.signcolumn = "yes" +vim.opt.isfname:append("@-@") + +vim.opt.updatetime = 50 + +vim.opt.colorcolumn = "80" + diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua deleted file mode 100644 index 6e88246..0000000 --- a/plugin/packer_compiled.lua +++ /dev/null @@ -1,189 +0,0 @@ --- 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 = "/Users/rtim/.cache/nvim/packer_hererocks/2.1.1713773202/share/lua/5.1/?.lua;/Users/rtim/.cache/nvim/packer_hererocks/2.1.1713773202/share/lua/5.1/?/init.lua;/Users/rtim/.cache/nvim/packer_hererocks/2.1.1713773202/lib/luarocks/rocks-5.1/?.lua;/Users/rtim/.cache/nvim/packer_hererocks/2.1.1713773202/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/Users/rtim/.cache/nvim/packer_hererocks/2.1.1713773202/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 = { - LuaSnip = { - loaded = true, - path = "/Users/rtim/.local/share/nvim/site/pack/packer/start/LuaSnip", - url = "https://github.com/L3MON4D3/LuaSnip" - }, - ["cmp-buffer"] = { - loaded = true, - path = "/Users/rtim/.local/share/nvim/site/pack/packer/start/cmp-buffer", - url = "https://github.com/hrsh7th/cmp-buffer" - }, - ["cmp-nvim-lsp"] = { - loaded = true, - path = "/Users/rtim/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", - url = "https://github.com/hrsh7th/cmp-nvim-lsp" - }, - ["cmp-path"] = { - loaded = true, - path = "/Users/rtim/.local/share/nvim/site/pack/packer/start/cmp-path", - url = "https://github.com/hrsh7th/cmp-path" - }, - ["gruvbox.nvim"] = { - config = { "\27LJ\2\n7\0\0\3\0\3\0\0056\0\0\0009\0\1\0'\2\2\0B\0\2\1K\0\1\0\24colorscheme gruvbox\bcmd\bvim\0" }, - loaded = true, - path = "/Users/rtim/.local/share/nvim/site/pack/packer/start/gruvbox.nvim", - url = "https://github.com/ellisonleao/gruvbox.nvim" - }, - harpoon = { - loaded = true, - path = "/Users/rtim/.local/share/nvim/site/pack/packer/start/harpoon", - url = "https://github.com/ThePrimeagen/harpoon" - }, - ["lsp-zero.nvim"] = { - loaded = true, - path = "/Users/rtim/.local/share/nvim/site/pack/packer/start/lsp-zero.nvim", - url = "https://github.com/VonHeikemen/lsp-zero.nvim" - }, - ["mason-lspconfig.nvim"] = { - loaded = true, - path = "/Users/rtim/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim", - url = "https://github.com/williamboman/mason-lspconfig.nvim" - }, - ["mason.nvim"] = { - loaded = true, - path = "/Users/rtim/.local/share/nvim/site/pack/packer/start/mason.nvim", - url = "https://github.com/williamboman/mason.nvim" - }, - ["nvim-cmp"] = { - loaded = true, - path = "/Users/rtim/.local/share/nvim/site/pack/packer/start/nvim-cmp", - url = "https://github.com/hrsh7th/nvim-cmp" - }, - ["nvim-colorizer.lua"] = { - loaded = true, - path = "/Users/rtim/.local/share/nvim/site/pack/packer/start/nvim-colorizer.lua", - url = "https://github.com/norcalli/nvim-colorizer.lua" - }, - ["nvim-lspconfig"] = { - loaded = true, - path = "/Users/rtim/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", - url = "https://github.com/neovim/nvim-lspconfig" - }, - ["nvim-treesitter"] = { - loaded = true, - path = "/Users/rtim/.local/share/nvim/site/pack/packer/start/nvim-treesitter", - url = "https://github.com/nvim-treesitter/nvim-treesitter" - }, - ["packer.nvim"] = { - loaded = true, - path = "/Users/rtim/.local/share/nvim/site/pack/packer/start/packer.nvim", - url = "https://github.com/wbthomason/packer.nvim" - }, - ["plenary.nvim"] = { - loaded = true, - path = "/Users/rtim/.local/share/nvim/site/pack/packer/start/plenary.nvim", - url = "https://github.com/nvim-lua/plenary.nvim" - }, - ["telescope.nvim"] = { - loaded = true, - path = "/Users/rtim/.local/share/nvim/site/pack/packer/start/telescope.nvim", - url = "https://github.com/nvim-telescope/telescope.nvim" - }, - undotree = { - loaded = true, - path = "/Users/rtim/.local/share/nvim/site/pack/packer/start/undotree", - url = "https://github.com/mbbill/undotree" - }, - ["vim-fugitive"] = { - loaded = true, - path = "/Users/rtim/.local/share/nvim/site/pack/packer/start/vim-fugitive", - url = "https://github.com/tpope/vim-fugitive" - } -} - -time([[Defining packer_plugins]], false) --- Config for: gruvbox.nvim -time([[Config for gruvbox.nvim]], true) -try_loadstring("\27LJ\2\n7\0\0\3\0\3\0\0056\0\0\0009\0\1\0'\2\2\0B\0\2\1K\0\1\0\24colorscheme gruvbox\bcmd\bvim\0", "config", "gruvbox.nvim") -time([[Config for gruvbox.nvim]], 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