From 2c3db1e3e794d055fc48c747ed08e605b40583d6 Mon Sep 17 00:00:00 2001 From: z3rOR0ne Date: Sat, 29 Mar 2025 09:32:15 -0700 Subject: [PATCH] :wrench: Updated to lazyvim package manager --- .config/nvim/lazy-lock.json | 51 +++++++++++ .config/nvim/lua/neovim/init.lua | 143 ++++++++++++++++++++++++++++++ .config/nvim/lua/neovim/pacq.lua | 89 ------------------- .config/nvim/lua/neovim/remap.lua | 4 +- 4 files changed, 196 insertions(+), 91 deletions(-) create mode 100644 .config/nvim/lazy-lock.json delete mode 100644 .config/nvim/lua/neovim/pacq.lua diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json new file mode 100644 index 00000000..e9367c09 --- /dev/null +++ b/.config/nvim/lazy-lock.json @@ -0,0 +1,51 @@ +{ + "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, + "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, + "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" }, + "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, + "codeium.vim": { "branch": "main", "commit": "000de972de76f357c03da14f4f8dd9a969d4fe8c" }, + "conform.nvim": { "branch": "master", "commit": "f9ef25a7ef00267b7d13bfc00b0dea22d78702d5" }, + "crates.nvim": { "branch": "main", "commit": "fd2bbca7aa588f24ffc3517831934b4c4a9588e9" }, + "ctrlp.vim": { "branch": "master", "commit": "564176f01d7f3f7f8ab452ff4e1f5314de7b0981" }, + "fzf.vim": { "branch": "master", "commit": "1fff637559f29d5edbdb05e03327954a8cd9e406" }, + "git-blame.nvim": { "branch": "master", "commit": "b12da2156ec1c3f53f42c129201ff0bfed69c86e" }, + "go.nvim": { "branch": "master", "commit": "0d426e87227dd14584881ecc595c173121456111" }, + "guihua.lua": { "branch": "master", "commit": "d783191eaa75215beae0c80319fcce5e6b3beeda" }, + "gv.vim": { "branch": "master", "commit": "b6bb6664e2c95aa584059f195eb3a9f3cb133994" }, + "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, + "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "lsp-zero.nvim": { "branch": "v4.x", "commit": "df80878a8ac6f855a6290389340fd089870ea7a5" }, + "lualine.nvim": { "branch": "master", "commit": "1517caa8fff05e4b4999857319d3b0609a7f57fa" }, + "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, + "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, + "mintabline.vim": { "branch": "master", "commit": "05714e0ee67622630f57d6540566df3e2293938e" }, + "nerdcommenter": { "branch": "master", "commit": "66c07e4083ab02ed2540ac289cc602c70b858c13" }, + "nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" }, + "nvim-autopairs": { "branch": "master", "commit": "6522027785b305269fa17088395dfc0f456cedd2" }, + "nvim-cmp": { "branch": "main", "commit": "1e1900b0769324a9675ef85b38f99cca29e203b3" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, + "nvim-lspconfig": { "branch": "master", "commit": "d7c610491c4cbcd1dcd278eeecbab78814437bc4" }, + "nvim-ripgrep": { "branch": "main", "commit": "7a1b0a4da8858e3501b593c25d7ed66bc91a221d" }, + "nvim-silicon": { "branch": "main", "commit": "7f66bda8f60c97a5bf4b37e5b8acb0e829ae3c32" }, + "nvim-tree.lua": { "branch": "master", "commit": "44d9b58f11d5a426c297aafd0be1c9d45617a849" }, + "nvim-treesitter": { "branch": "master", "commit": "aece1062335a9e856636f5da12d8a06c7615ce8a" }, + "nvim-web-devicons": { "branch": "master", "commit": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c" }, + "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" }, + "suda.vim": { "branch": "master", "commit": "9adda7d195222d4e2854efb2a88005a120296c47" }, + "telescope.nvim": { "branch": "master", "commit": "b79cd6c88b3d96b0f49cb7d240807cd59b610cd8" }, + "undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" }, + "vim-clang-format": { "branch": "master", "commit": "6b791825ff478061ad1c57b21bb1ed5a5fd0eb29" }, + "vim-doge": { "branch": "master", "commit": "750d17dcd5a38a6afb51ddd07ee7d3e96bab7e9e" }, + "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" }, + "vim-gitgutter": { "branch": "main", "commit": "6620e5fbbe6a28de0bfed081f5bd2767023b7eea" }, + "vim-smoothie": { "branch": "master", "commit": "df1e324e9f3395c630c1c523d0555a01d2eb1b7e" }, + "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, + "vim-visual-multi": { "branch": "master", "commit": "a6975e7c1ee157615bbc80fc25e4392f71c344d4" }, + "winresizer": { "branch": "master", "commit": "9bd559a03ccec98a458e60c705547119eb5350f3" } +} diff --git a/.config/nvim/lua/neovim/init.lua b/.config/nvim/lua/neovim/init.lua index af867b76..d833bfbe 100644 --- a/.config/nvim/lua/neovim/init.lua +++ b/.config/nvim/lua/neovim/init.lua @@ -1,2 +1,145 @@ +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not (vim.uv or vim.loop).fs_stat(lazypath) then + local lazyrepo = "https://github.com/folke/lazy.nvim.git" + local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) + if vim.v.shell_error ~= 0 then + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) + end +end +vim.opt.rtp:prepend(lazypath) + require("neovim.remap") require("neovim.set") + +require("lazy").setup({ + spec = { + { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate", event = "BufReadPost" }, + { "nvim-treesitter/playground" }, + { + "shaunsingh/nord.nvim", + config = function() + vim.cmd("colorscheme nord") + end, + }, + { "preservim/nerdcommenter", event = "VeryLazy" }, + { "nvim-lualine/lualine.nvim", event = "VeryLazy" }, + { "kyazdani42/nvim-web-devicons", opt = true, event = "VeryLazy" }, + { "kyazdani42/nvim-tree.lua", cmd = { "NvimTreeToggle" } }, + { "psliwka/vim-smoothie", event = "VeryLazy" }, + { "mg979/vim-visual-multi", keys = { "", "" } }, + { "lukas-reineke/indent-blankline.nvim", event = "BufRead" }, + { "airblade/vim-gitgutter", event = "BufReadPre" }, + { "f-person/git-blame.nvim", cmd = { "GitBlameToggle" } }, + { "kkoomen/vim-doge", build = ":call doge#install()" }, + { "norcalli/nvim-colorizer.lua", cmd = { "ColorizerToggle" } }, + { "windwp/nvim-autopairs", event = "InsertEnter" }, + { "simeji/winresizer" }, + { "stevearc/conform.nvim" }, + { "rhysd/vim-clang-format" }, + { "sangdol/mintabline.vim" }, + { "nvim-lua/plenary.nvim" }, + { "ThePrimeagen/harpoon" }, + { + "nvim-telescope/telescope.nvim", + tag = "0.1.0", + }, + { "tpope/vim-fugitive" }, + { "tpope/vim-surround", keys = { "cs", "ds", "ys" } }, + { "lambdalisue/suda.vim" }, + { "iamcco/markdown-preview.nvim", build = ":call mkdp#util#install()" }, + { "junegunn/fzf.vim" }, + { "junegunn/gv.vim" }, + { "kien/ctrlp.vim" }, + { "rinx/nvim-ripgrep" }, + { "mbbill/undotree", cmd = { "UndotreeToggle" } }, + { "williamboman/mason.nvim", event = "VeryLazy" }, + { "williamboman/mason-lspconfig.nvim", event = "VeryLazy" }, + { "neovim/nvim-lspconfig", event = { "BufReadPre", "BufNewFile" } }, + + -- Autocompletion/Snippets + { "hrsh7th/nvim-cmp" }, + { "hrsh7th/cmp-buffer" }, + { "hrsh7th/cmp-path" }, + { "hrsh7th/cmp-nvim-lsp" }, + { "hrsh7th/cmp-nvim-lua" }, + { "saadparwaiz1/cmp_luasnip" }, + { "hrsh7th/cmp-vsnip" }, + + { "VonHeikemen/lsp-zero.nvim" }, + -- codeium AI + { "Exafunction/codeium.vim" }, + -- golang + { "ray-x/go.nvim" }, + { "ray-x/guihua.lua" }, + -- rustlang + { "rust-lang/rust.vim" }, + { "saecki/crates.nvim" }, + -- code snippet screenshots + -- capture code snippets using :Silicon, + -- in Visual mode highlight then enter command + { + "michaelrommel/nvim-silicon", + config = function() + require("silicon").setup({ + command = "silicon", + font = "mononoki NF=34", + theme = "Nord", + no_round_corner = true, + no_line_number = true, + no_window_controls = true, + background = "#20201e", + }) + end, + }, + defaults = { + lazy = false, + version = false, + }, + checker = { + enabled = true, + concurrency = 1, + frequency = 86400, + notify = false, + }, + performance = { + rtp = { + disabled_plugins = { + "gzip", + "tarPlugin", + "tohtml", + "tutor", + "zipPlugin", + "netrwPlugin", -- Only disable if not using netrw + }, + }, + }, + }, + defaults = { + lazy = false, + version = false, + }, + checker = { + enabled = true, + concurrency = 1, + frequency = 86400, + notify = false, + }, + performance = { + rtp = { + disabled_plugins = { + "gzip", + "tarPlugin", + "tohtml", + "tutor", + "zipPlugin", + "netrwPlugin", -- Only disable if not using netrw + }, + }, + }, +}) diff --git a/.config/nvim/lua/neovim/pacq.lua b/.config/nvim/lua/neovim/pacq.lua deleted file mode 100644 index 845123d1..00000000 --- a/.config/nvim/lua/neovim/pacq.lua +++ /dev/null @@ -1,89 +0,0 @@ --- https://github.com/savq/paq-nvim -require("paq")({ - { "savq/paq-nvim" }, -- Let Paq manage itself - - { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate", event = "BufRead" }, - { "nvim-treesitter/playground" }, - { - "shaunsingh/nord.nvim", - config = function() - vim.cmd("colorscheme nord") - end, - }, - { "preservim/nerdcommenter" }, - { "nvim-lualine/lualine.nvim" }, - { "kyazdani42/nvim-web-devicons", opt = true }, - { "kyazdani42/nvim-web-devicons" }, - { "kyazdani42/nvim-tree.lua" }, - { "psliwka/vim-smoothie" }, - { "mg979/vim-visual-multi" }, - { "lukas-reineke/indent-blankline.nvim" }, - { "airblade/vim-gitgutter" }, - { "f-person/git-blame.nvim" }, - { "kkoomen/vim-doge", build = ":call doge#install()" }, - { "norcalli/nvim-colorizer.lua" }, - { "windwp/nvim-autopairs" }, - { "simeji/winresizer" }, - { "stevearc/conform.nvim" }, - { "rhysd/vim-clang-format" }, - { "sangdol/mintabline.vim" }, - { "nvim-lua/plenary.nvim" }, - { "ThePrimeagen/harpoon" }, - { - "nvim-telescope/telescope.nvim", - tag = "0.1.0", - }, - { "tpope/vim-fugitive" }, - { "tpope/vim-surround" }, - { "lambdalisue/suda.vim" }, - { - "iamcco/markdown-preview.nvim", - build = function() - vim.fn["mkdp#util#install"]() - end, - }, - { "junegunn/fzf.vim" }, - { "junegunn/gv.vim" }, - { "kien/ctrlp.vim" }, - { "rinx/nvim-ripgrep" }, - { "mbbill/undotree" }, - { "williamboman/mason.nvim" }, - { "williamboman/mason-lspconfig.nvim" }, - { "neovim/nvim-lspconfig" }, - - -- Autocompletion/Snippets - { "hrsh7th/nvim-cmp" }, - { "hrsh7th/cmp-buffer" }, - { "hrsh7th/cmp-path" }, - { "hrsh7th/cmp-nvim-lsp" }, - { "hrsh7th/cmp-nvim-lua" }, - { "saadparwaiz1/cmp_luasnip" }, - { "hrsh7th/cmp-vsnip" }, - - { "VonHeikemen/lsp-zero.nvim" }, - -- codeium AI - { "Exafunction/codeium.vim" }, - -- golang - { "ray-x/go.nvim" }, - { "ray-x/guihua.lua" }, - -- rustlang - { "rust-lang/rust.vim" }, - { "saecki/crates.nvim" }, - -- code snippet screenshots - -- capture code snippets using :Silicon, - -- in Visual mode highlight then enter command - { - "michaelrommel/nvim-silicon", - config = function() - require("silicon").setup({ - command = "silicon", - font = "mononoki NF=34", - theme = "Nord", - no_round_corner = true, - no_line_number = true, - no_window_controls = true, - background = "#20201e", - }) - end, - }, -}) diff --git a/.config/nvim/lua/neovim/remap.lua b/.config/nvim/lua/neovim/remap.lua index 1962e40d..a342362d 100644 --- a/.config/nvim/lua/neovim/remap.lua +++ b/.config/nvim/lua/neovim/remap.lua @@ -50,8 +50,8 @@ vim.keymap.set("n", "", ":wincmd l", {}) -- nv creates new vertical split vim.keymap.set("n", "nv", ":vnew", { silent = true }) --- shift + p invokes PackerSync -vim.keymap.set("n", "", ":PaqSync", {}) +-- shift + p invokes Lazy sync +vim.keymap.set("n", "", ":Lazy sync", {}) -- control + t enable transparency vim.keymap.set("n", "t", ":lua ColorMyPencils()", {})