From 9b45062374b8bbaec2b950c78f1c4109ab8b9793 Mon Sep 17 00:00:00 2001 From: Stefan Imhoff Date: Thu, 22 Dec 2022 17:20:47 +0100 Subject: [PATCH] feat(nvim): migrate from Packer to Lazy --- nvim/after/plugin/alpha.lua | 2 +- nvim/lazy-lock.json | 135 +++++++++++++++ nvim/lua/kogakure/plugins.lua | 318 +++++++++++++++------------------- setup/vim.sh | 3 +- zshrc | 2 +- 5 files changed, 278 insertions(+), 182 deletions(-) create mode 100644 nvim/lazy-lock.json diff --git a/nvim/after/plugin/alpha.lua b/nvim/after/plugin/alpha.lua index 5679f8e..ca7e21e 100644 --- a/nvim/after/plugin/alpha.lua +++ b/nvim/after/plugin/alpha.lua @@ -19,7 +19,7 @@ dashboard.section.buttons.val = { dashboard.button("t", " Find Text", ":Telescope grep_string"), dashboard.button("b", " Browser Bookmarks", ":Telescope bookmarks"), dashboard.button("c", " Configuration", ":e ~/.config/nvim/init.lua"), - dashboard.button("u", " Update Plugins", ":PackerUpdate"), + dashboard.button("u", " Update Plugins", ":Lazy sync"), dashboard.button("m", " Mason (LSP, DAP, Linter, Formatter)", ":Mason"), dashboard.button("q", " Quit Neovim", ":qa"), } diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json new file mode 100644 index 0000000..9e3b099 --- /dev/null +++ b/nvim/lazy-lock.json @@ -0,0 +1,135 @@ +{ + "Comment.nvim": { "branch": "master", "commit": "5f01c1a89adafc52bf34e3bf690f80d9d726715d" }, + "FixCursorHold.nvim": { "branch": "master", "commit": "70a9516a64668cbfe59f31b66d0a21678c5e9b12" }, + "LuaSnip": { "branch": "master", "commit": "5570fd797eae0790affb54ea669a150cad76db5d" }, + "VisIncr": { "branch": "master", "commit": "13e8538cf332fd131ebb60422b4a01d69078794b" }, + "alpha-nvim": { "branch": "main", "commit": "21a0f2520ad3a7c32c0822f943368dc063a569fb" }, + "base16-vim": { "branch": "master", "commit": "3be3cd82cd31acfcab9a41bad853d9c68d30478d" }, + "blamer.nvim": { "branch": "master", "commit": "f4eb22a9013642c411725fdda945ae45f8d93181" }, + "bufferline.nvim": { "branch": "main", "commit": "4ecfa81e470a589e74adcde3d5bb1727dd407363" }, + "catppuccin": { "branch": "main", "commit": "55f43a952856bc0029e6cef066297c6cfab3451d" }, + "cheat.sh-vim": { "branch": "master", "commit": "e0fe468d872025477462ac5d96432f5c1aee3a0d" }, + "cheatsheet.nvim": { "branch": "master", "commit": "9716f9aaa94dd1fd6ce59b5aae0e5f25e2a463ef" }, + "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, + "cmp-cmdline": { "branch": "main", "commit": "23c51b2a3c00f6abc4e922dbd7c3b9aca6992063" }, + "cmp-copilot": { "branch": "main", "commit": "1f3f31c54bd71e41ed157430702bc2837ea582ab" }, + "cmp-dictionary": { "branch": "main", "commit": "b7c0629e10c8a3a10311aa4ad952d207509d5e67" }, + "cmp-npm": { "branch": "main", "commit": "4b6166c3feeaf8dae162e33ee319dc5880e44a29" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "59224771f91b86d1de12570b4070fe4ad7cd1eeb" }, + "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "d2768cb1b83de649d57d967085fe73c5e01f8fd7" }, + "cmp-nvim-lua": { "branch": "main", "commit": "d276254e7198ab7d00f117e88e223b4bd8c02d21" }, + "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "cmp-spell": { "branch": "master", "commit": "60584cb75e5e8bba5a0c9e4c3ab0791e0698bffa" }, + "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, + "codewindow.nvim": { "branch": "master", "commit": "987b394b3c987cb9dd6c07ea57de88a4ce64f7e1" }, + "copilot.vim": { "branch": "release", "commit": "324ec9eb69e20971b58340d0096c3caac7bc2089" }, + "diagnosticls-configs-nvim": { "branch": "main", "commit": "5ea9b15f1fb5fd1151be3a056ba819fb87541fb6" }, + "dial.nvim": { "branch": "master", "commit": "61afb28f61ba090a67a88186f7bc8a94212e509a" }, + "dir-telescope.nvim": { "branch": "main", "commit": "4189a781397a973496b14a9db26b80b7fd764cbc" }, + "dressing.nvim": { "branch": "master", "commit": "4436d6f41e2f6b8ada57588acd1a9f8b3d21453c" }, + "editorconfig-vim": { "branch": "master", "commit": "30ddc057f71287c3ac2beca876e7ae6d5abe26a0" }, + "emmet-vim": { "branch": "master", "commit": "def5d57a1ae5afb1b96ebe83c4652d1c03640f4d" }, + "export-to-vscode.nvim": { "branch": "main", "commit": "7746bb67d03f6a6891cdedc8c760c95a5714fe8c" }, + "file-line": { "branch": "main", "commit": "559088afaf10124ea663ee0f4f73b1de48fb1632" }, + "friendly-snippets": { "branch": "main", "commit": "1a6a02350568d6830bcfa167c72f9b6e75e454ae" }, + "fzf": { "branch": "master", "commit": "1a9761736ed2190aa7536d4b6754f617f46cfd9c" }, + "fzf-lua": { "branch": "main", "commit": "5abf66f63bf08121dd4e917488b59ccb693eee12" }, + "git-worktree.nvim": { "branch": "master", "commit": "d7f4e2584e81670154f07ca9fa5dd791d9c1b458" }, + "gitsigns.nvim": { "branch": "main", "commit": "2ab3bdf0a40bab53033048c6be75bda86316b55d" }, + "glance.nvim": { "branch": "master", "commit": "cc087d378c3458fd2fb5ddf627af5e8fa1b76458" }, + "guihua.lua": { "branch": "master", "commit": "a9fe85257a85b89be84b25da20c1faa4c895238b" }, + "harpoon": { "branch": "master", "commit": "21d0d1bfa3000e4384740bfaefa0ebc51c773786" }, + "impatient.nvim": { "branch": "main", "commit": "9f7eed8133d62457f7ad2ca250eb9b837a4adeb7" }, + "indent-blankline.nvim": { "branch": "master", "commit": "c4c203c3e8a595bc333abaf168fcb10c13ed5fb7" }, + "jupyter_ascending.vim": { "branch": "master", "commit": "69652a47765daf110ad16e04d57f04fac6ceef81" }, + "lazy.nvim": { "branch": "main", "commit": "eb01b6dc0b651a57c61b3219bcf985fb1b6a54b4" }, + "legendary.nvim": { "branch": "master", "commit": "00043cfdc71ed649798649a07e1f15e4cb4daf8b" }, + "lualine.nvim": { "branch": "master", "commit": "fffbcb829288c3ca366f17cdb8d46aefb5c1d6f3" }, + "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "5bea0e851b8f48479d2cb927cd26733b4058b2b3" }, + "mason-null-ls.nvim": { "branch": "main", "commit": "4480bc59b72866376fc2f83048a932fa598d89a8" }, + "mason.nvim": { "branch": "main", "commit": "e6f6f901959d39d112b096d26b909c65723981d3" }, + "mini.nvim": { "branch": "main", "commit": "093211078a5d0764c8beb489f9e09e4a4d962de9" }, + "nlsp-settings.nvim": { "branch": "main", "commit": "b4a756be3ec71de19e0406782bb5b6ff6fb29cea" }, + "null-ls.nvim": { "branch": "main", "commit": "ef9010b2ac11e2068a8e1d5a4eff576289a1f9a4" }, + "nvim-autopairs": { "branch": "master", "commit": "b5994e6547d64f781cfca853a1aa6174d238fe0e" }, + "nvim-bqf": { "branch": "main", "commit": "b418b0a241d36509196944a6f6bee886c775d54f" }, + "nvim-cmp": { "branch": "main", "commit": "8868cf9a09e5f3c2612a22ccb82dcc6d9f0d0d35" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, + "nvim-cursorline": { "branch": "main", "commit": "804f0023692653b2b2368462d67d2a87056947f9" }, + "nvim-dap": { "branch": "master", "commit": "6f2ea9e33b48a51849ec93c6c38148a5372018e4" }, + "nvim-lightbulb": { "branch": "master", "commit": "56b9ce31ec9d09d560fe8787c0920f76bc208297" }, + "nvim-lspconfig": { "branch": "master", "commit": "25f0c65bd8fddadbafd0048a68560bf160ceb98c" }, + "nvim-navic": { "branch": "master", "commit": "7a2b823152fe4de65ee7925b0e32d26ed73bc57c" }, + "nvim-spectre": { "branch": "master", "commit": "68ea562b485b6593e325e7916c3bd6e833d433e7" }, + "nvim-surround": { "branch": "main", "commit": "f0077c3726d243eeaabd2ec280216e8c3ca7da9f" }, + "nvim-tree.lua": { "branch": "master", "commit": "e14c2895b4f36a22001f7773244041c173dcf867" }, + "nvim-treesitter": { "branch": "master", "commit": "6f9e5cdba77ff735e8a4b8a9022b23292a41ba95" }, + "nvim-treesitter-context": { "branch": "master", "commit": "d28654b012d4c56beafec630ef7143275dff76f8" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "a2e436d88d1880da6678049316e4c45135901866" }, + "nvim-ts-autotag": { "branch": "main", "commit": "fdefe46c6807441460f11f11a167a2baf8e4534b" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "32d9627123321db65a4f158b72b757bcaef1a3f4" }, + "nvim-ts-rainbow": { "branch": "master", "commit": "064fd6c0a15fae7f876c2c6dd4524ca3fad96750" }, + "nvim-ufo": { "branch": "main", "commit": "de599450c6970828fd66ecd5f2a5cfc063d03968" }, + "nvim-web-devicons": { "branch": "master", "commit": "05e1072f63f6c194ac6e867b567e6b437d3d4622" }, + "octo.nvim": { "branch": "master", "commit": "cb9314d358dc9f1d50e553a3c8e237ce713cbc57" }, + "playground": { "branch": "master", "commit": "3421bbbfec25a7c54ee041ffb9cb226b69b2b995" }, + "plenary.nvim": { "branch": "master", "commit": "4b7e52044bbb84242158d977a50c4cbcd85070c7" }, + "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, + "pounce.nvim": { "branch": "master", "commit": "a573820b20882c70d241a1ac94aa27670442c027" }, + "prettier.nvim": { "branch": "main", "commit": "918b99f5ddd7a56395fd393767ab6a3c15a50789" }, + "project.nvim": { "branch": "main", "commit": "685bc8e3890d2feb07ccf919522c97f7d33b94e4" }, + "promise-async": { "branch": "main", "commit": "70b09063cdf029079b25c7925e4494e7416ee995" }, + "rainbow_csv": { "branch": "master", "commit": "7453a3f9679f0c753ec9d77f9ea8588778f35aeb" }, + "sad.nvim": { "branch": "master", "commit": "01b7d84f4f73c8963f5933f09e88c833757bc7d8" }, + "smart-splits.nvim": { "branch": "master", "commit": "fdd158ce7554dc830fb86e0fe952cd9476cdf726" }, + "sqlite.lua": { "branch": "master", "commit": "53cac3fdb5f5e4e63e243232b6eccf3c764ae18a" }, + "symbols-outline.nvim": { "branch": "master", "commit": "6a3ed24c5631da7a5d418bced57c16b32af7747c" }, + "telescope-bookmarks.nvim": { "branch": "main", "commit": "9627414b34519b94028d816ab16002bef3ca1eb0" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "cad567e11131a01f2934930c1efc8b1b09a0dc56" }, + "telescope-frecency.nvim": { "branch": "master", "commit": "10771fdb7b4c4b59f2b5c1e8757b0379e1314659" }, + "telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" }, + "telescope-github.nvim": { "branch": "master", "commit": "ee95c509901c3357679e9f2f9eaac3561c811736" }, + "telescope-heading.nvim": { "branch": "main", "commit": "b1969c1b1b3de52c45b4c440e0784c33b5814954" }, + "telescope-lsp-handlers.nvim": { "branch": "trunk", "commit": "d6d5983b0131ee2c386ca9e349f6621e12d971cb" }, + "telescope-node-modules.nvim": { "branch": "main", "commit": "b846d33ff5763176dc14fc74c30941a2067c82fd" }, + "telescope-symbols.nvim": { "branch": "master", "commit": "f7d7c84873c95c7bd5682783dd66f84170231704" }, + "telescope-undo.nvim": { "branch": "main", "commit": "3be830694f2d8c9705f6cf40a5ffee8a0c2aa6e5" }, + "telescope.nvim": { "branch": "master", "commit": "e960efa60e97df58e089b00270f09d60f27202c8" }, + "todo-comments.nvim": { "branch": "main", "commit": "c1760010f46992165995aaa52ca967f473a2e8e6" }, + "toggleterm.nvim": { "branch": "main", "commit": "b02a1674bd0010d7982b056fd3df4f717ff8a57a" }, + "tokyonight.nvim": { "branch": "main", "commit": "8b55a47165348dd1d811f9e1f867bb17bb35a360" }, + "trouble.nvim": { "branch": "main", "commit": "897542f90050c3230856bc6e45de58b94c700bbf" }, + "twilight.nvim": { "branch": "main", "commit": "1ffa6a4d89fb2fbb784c6674044bf54f1fca936f" }, + "vim-abolish": { "branch": "master", "commit": "3f0c8faadf0c5b68bcf40785c1c42e3731bfa522" }, + "vim-astro": { "branch": "main", "commit": "34732be5e9a5c28c2409f4490edf92d46d8b55a9" }, + "vim-bbye": { "branch": "master", "commit": "25ef93ac5a87526111f43e5110675032dbcacf56" }, + "vim-bookmarks": { "branch": "master", "commit": "9cc5fa7ecc23b052bd524d07c85356c64b92aeef" }, + "vim-easymotion": { "branch": "master", "commit": "b3cfab2a6302b3b39f53d9fd2cd997e1127d7878" }, + "vim-eunuch": { "branch": "master", "commit": "291ef1f8c8996ca7715df1032a35a27b12d7b5cf" }, + "vim-exchange": { "branch": "master", "commit": "784d63083ad7d613aa96f00021cd0dfb126a781a" }, + "vim-fugitive": { "branch": "master", "commit": "5b0b138483de17a8fd8dfcec0b491782c8fbf102" }, + "vim-gh-line": { "branch": "master", "commit": "fbf368bdfad7e5478009a6dc62559e6b2c72d603" }, + "vim-grammarous": { "branch": "master", "commit": "db46357465ce587d5325e816235b5e92415f8c05" }, + "vim-indent-object": { "branch": "master", "commit": "5c5b24c959478929b54a9e831a8e2e651a465965" }, + "vim-matchup": { "branch": "master", "commit": "db5120dd9887c988de7cd973ddb951e465d413e5" }, + "vim-polyglot": { "branch": "master", "commit": "bc8a81d3592dab86334f27d1d43c080ebf680d42" }, + "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" }, + "vim-sort-motion": { "branch": "master", "commit": "c8782be8f7da414c6442b3ba4b6abb0345d392d9" }, + "vim-table-mode": { "branch": "master", "commit": "9555a3e6e5bcf285ec181b7fc983eea90500feb4" }, + "vim-textobj-comment": { "branch": "master", "commit": "58ae4571b76a5bf74850698f23d235eef991dd4b" }, + "vim-textobj-datetime": { "branch": "master", "commit": "be2db6717e91bd14b99ab364ea09347903a6dce4" }, + "vim-textobj-uri": { "branch": "master", "commit": "867eaff298d020881766508948da4a19faca554d" }, + "vim-textobj-user": { "branch": "master", "commit": "41a675ddbeefd6a93664a4dc52f302fe3086a933" }, + "vim-textobj-xmlattr": { "branch": "master", "commit": "694a297f1d75fd527e87da9769f3c6519a87ebb1" }, + "vim-titlecase": { "branch": "master", "commit": "69a697c54a08ca5603cb757b4d4f78cd4b567549" }, + "vim-tmux-navigator": { "branch": "master", "commit": "41ea9d23b814014c8d8daf8b44fa0cd827a0e5f4" }, + "vim-visual-multi": { "branch": "master", "commit": "724bd53adfbaf32e129b001658b45d4c5c29ca1a" }, + "vim-wakatime": { "branch": "master", "commit": "8c7f33b43a56f89285de0da77ee6ec7e4af1f835" }, + "vim-xtract": { "branch": "master", "commit": "65e47be935080f112f219b5f0bc1bf411c783f27" }, + "vimux": { "branch": "master", "commit": "616fcb4799674a7a809b14ca2dc155bb6ba25788" }, + "vimux-cargo": { "branch": "main", "commit": "ca2d99573d367a59f77f4e6d0b45e7e94a461769" }, + "vimux-jest-test": { "branch": "master", "commit": "30fdc7935610adc000d9965d4031d73d11747256" }, + "which-key.nvim": { "branch": "main", "commit": "61553aeb3d5ca8c11eea8be6eadf478062982ac9" }, + "zen-mode.nvim": { "branch": "main", "commit": "6f5702db4fd4a4c9a212f8de3b7b982f3d93b03c" } +} \ No newline at end of file diff --git a/nvim/lua/kogakure/plugins.lua b/nvim/lua/kogakure/plugins.lua index 158447b..8e75c84 100644 --- a/nvim/lua/kogakure/plugins.lua +++ b/nvim/lua/kogakure/plugins.lua @@ -1,210 +1,172 @@ --- Packer.nvim – https://github.com/wbthomason/packer.nvim -local fn = vim.fn - --- Automatically install packer -local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim" -if fn.empty(fn.glob(install_path)) > 0 then - PACKER_BOOTSTRAP = fn.system({ +-- Lazy.nvim - https://github.com/folke/lazy.nvim +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not vim.loop.fs_stat(lazypath) then + vim.fn.system({ "git", "clone", - "--depth", - "1", - "https://github.com/wbthomason/packer.nvim", - install_path, + "--filter=blob:none", + "--single-branch", + "https://github.com/folke/lazy.nvim.git", + lazypath, }) - print("Installing packer close and reopen Neovim...") - vim.cmd([[packadd packer.nvim]]) end --- Autocommand that reloads neovim whenever you save the plugins.lua file -vim.cmd([[ -augroup packer_user_config -autocmd! -autocmd BufWritePost plugins.lua source | PackerSync -augroup end -]]) +vim.opt.runtimepath:prepend(lazypath) --- Use a protected call so we don’t error out on first use -local status_ok, packer = pcall(require, "packer") -if not status_ok then - return -end - --- Have packer use a popup window -packer.init({ - max_jobs = 8, - display = { - open_fn = function() - return require("packer.util").float({ - border = "rounded", - }) - end, - }, -}) - --- Plugins -return packer.startup(function(use) - use("wbthomason/packer.nvim") -- Have packer manage itself - use("nvim-lua/popup.nvim") -- An implementation of the Popup API from vim in Neovim - use("nvim-lua/plenary.nvim") -- Useful lua functions used ny lots of plugins +require("lazy").setup({ + "nvim-lua/popup.nvim", -- An implementation of the Popup API from vim in Neovim + "nvim-lua/plenary.nvim", -- Useful lua functions used ny lots of plugins -- Colorscheme - use("chriskempson/base16-vim") -- Base16 colorschemes - use("folke/tokyonight.nvim") -- Tokyo Night color scheme - use({ "catppuccin/nvim", as = "catppuccin" }) -- Catppuccin color scheme + "chriskempson/base16-vim", -- Base16 colorschemes + "folke/tokyonight.nvim", -- Tokyo Night color scheme + { "catppuccin/nvim", name = "catppuccin" }, -- Catppuccin color scheme -- CMP - use("hrsh7th/nvim-cmp") -- The completion plugin - use("hrsh7th/cmp-buffer") -- Buffer completions - use("hrsh7th/cmp-path") -- Path completions - use("hrsh7th/cmp-cmdline") -- Cmdline completions - use("hrsh7th/cmp-nvim-lua") -- Lua API completions - use("hrsh7th/cmp-copilot") -- GitHub Copilot completions - use("saadparwaiz1/cmp_luasnip") -- Snippet completions - use("uga-rosa/cmp-dictionary") -- Dictionary completions - use("f3fora/cmp-spell") -- Spell completions - use("David-Kunz/cmp-npm") -- NPM package completions - use("hrsh7th/cmp-nvim-lsp") -- LSP completions - use("hrsh7th/cmp-nvim-lsp-signature-help") -- LSP Signature Help + "hrsh7th/nvim-cmp", -- The completion plugin + "hrsh7th/cmp-buffer", -- Buffer completions + "hrsh7th/cmp-path", -- Path completions + "hrsh7th/cmp-cmdline", -- Cmdline completions + "hrsh7th/cmp-nvim-lua", -- Lua API completions + "hrsh7th/cmp-copilot", -- GitHub Copilot completions + "saadparwaiz1/cmp_luasnip", -- Snippet completions + "uga-rosa/cmp-dictionary", -- Dictionary completions + "f3fora/cmp-spell", -- Spell completions + "David-Kunz/cmp-npm", -- NPM package completions + "hrsh7th/cmp-nvim-lsp", -- LSP completions + "hrsh7th/cmp-nvim-lsp-signature-help", -- LSP Signature Help -- Snippets - use("L3MON4D3/LuaSnip") -- Snippet Engine - use("rafamadriz/friendly-snippets") -- A bunch of snippets + "L3MON4D3/LuaSnip", -- Snippet Engine + "rafamadriz/friendly-snippets", -- A bunch of snippets -- LSP - use("neovim/nvim-lspconfig") -- Enable LSP - use("williamboman/mason.nvim") -- Manage LSP servers, DAP servers, linters, and formatters - use("williamboman/mason-lspconfig.nvim") -- Bridge betwen Mason and lspconfig - use("jay-babu/mason-null-ls.nvim") -- Bridge between Mason and null-ls - use("jose-elias-alvarez/null-ls.nvim") -- Inject LSP diagnostics, code actions, and more - use("folke/trouble.nvim") -- Diagnostics - use("creativenull/diagnosticls-configs-nvim") -- Collection of linters and formatters - use("tamago324/nlsp-settings.nvim") -- LSP for json/yaml - use({ "kosayoda/nvim-lightbulb", requires = "antoinemadec/FixCursorHold.nvim" }) + "neovim/nvim-lspconfig", -- Enable LSP + "williamboman/mason.nvim", -- Manage LSP servers, DAP servers, linters, and formatters + "williamboman/mason-lspconfig.nvim", -- Bridge betwen Mason and lspconfig + "jay-babu/mason-null-ls.nvim", -- Bridge between Mason and null-ls + "jose-elias-alvarez/null-ls.nvim", -- Inject LSP diagnostics, code actions, and more + "folke/trouble.nvim", -- Diagnostics + "creativenull/diagnosticls-configs-nvim", -- Collection of linters and formatters + "tamago324/nlsp-settings.nvim", -- LSP for json/yaml + { "kosayoda/nvim-lightbulb", dependencies = "antoinemadec/FixCursorHold.nvim" }, -- FZF - use({ "junegunn/fzf", run = "./install --bin" }) - use("ibhagwan/fzf-lua") + { "junegunn/fzf", build = "./install --bin" }, + "ibhagwan/fzf-lua", -- Telescope - use("nvim-telescope/telescope.nvim") - use("dhruvmanila/telescope-bookmarks.nvim") -- Open browser bookmarks - use("nvim-telescope/telescope-file-browser.nvim") -- File and folder actions - use("sudormrfbin/cheatsheet.nvim") -- Searchable cheatsheet - use("nvim-telescope/telescope-node-modules.nvim") -- node_modules packages - use("gbrlsnchs/telescope-lsp-handlers.nvim") -- LSP handlers - use("crispgm/telescope-heading.nvim") -- Jump between headings - use("nvim-telescope/telescope-fzy-native.nvim") -- FZY style sorter that is compiled - use({ "nvim-telescope/telescope-frecency.nvim", requires = { "tami5/sqlite.lua" } }) -- Frequency and recency - use("nvim-telescope/telescope-github.nvim") -- GitHub CLI - use("nvim-telescope/telescope-symbols.nvim") -- Symbols - use("princejoogie/dir-telescope.nvim") -- Perform functions in selected directory + "nvim-telescope/telescope.nvim", + "dhruvmanila/telescope-bookmarks.nvim", -- Open browser bookmarks + "nvim-telescope/telescope-file-browser.nvim", -- File and folder actions + "sudormrfbin/cheatsheet.nvim", -- Searchable cheatsheet + "nvim-telescope/telescope-node-modules.nvim", -- node_modules packages + "gbrlsnchs/telescope-lsp-handlers.nvim", -- LSP handlers + "crispgm/telescope-heading.nvim", -- Jump between headings + "nvim-telescope/telescope-fzy-native.nvim", -- FZY style sorter that is compiled + { "nvim-telescope/telescope-frecency.nvim", dependencies = { "tami5/sqlite.lua" } }, -- Frequency and recency + "nvim-telescope/telescope-github.nvim", -- GitHub CLI + "nvim-telescope/telescope-symbols.nvim", -- Symbols + "princejoogie/dir-telescope.nvim", -- Perform functions in selected directory -- Treesitter - use({ "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" }) - use("p00f/nvim-ts-rainbow") -- Rainbox parentheses - use("nvim-treesitter/playground") -- Treesitter information in Neovim - use("nvim-treesitter/nvim-treesitter-context") -- Show context + { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" }, + "p00f/nvim-ts-rainbow", -- Rainbox parentheses + "nvim-treesitter/playground", -- Treesitter information in Neovim + "nvim-treesitter/nvim-treesitter-context", -- Show context -- DAP - use("mfussenegger/nvim-dap") -- Debug Adapter Protocol + "mfussenegger/nvim-dap", -- Debug Adapter Protocol -- File/Window Management - use("ThePrimeagen/harpoon") -- Getting you where you want - use("ThePrimeagen/git-worktree.nvim") -- Git Worktree - use("lewis6991/gitsigns.nvim") -- Git decorations - use("kyazdani42/nvim-web-devicons") -- Icons and colors for file types - use("kyazdani42/nvim-tree.lua") -- A File Explorer - use("akinsho/bufferline.nvim") -- Emulate tabs for buffers - use("moll/vim-bbye") -- Delete buffers without closing the window - use("akinsho/toggleterm.nvim") -- Terminal in Neovim - use("nvim-lualine/lualine.nvim") -- Statusline - use("norcalli/nvim-colorizer.lua") -- Highlight colors - use("ahmedkhalf/project.nvim") -- Project Management - use("lewis6991/impatient.nvim") -- Speed Up Startup - use("lukas-reineke/indent-blankline.nvim") -- Indentation guides - use("goolord/alpha-nvim") -- Customizable Greeter - use("antoinemadec/FixCursorHold.nvim") -- This is needed to fix lsp doc highlight - use("MattesGroeger/vim-bookmarks") -- Bookmarks - use("folke/which-key.nvim") -- Display possible keybindings - use("mrjones2014/legendary.nvim") -- Legend for keymaps, commands, and autocommands - use("APZelos/blamer.nvim") -- Git Blame - use("tpope/vim-fugitive") -- Git plugin - use("elijahmanor/export-to-vscode.nvim") -- Export active Buffers to Visual Studio Code - use("bogado/file-line") -- Jump directly to line in file with 'nvim index.html:20' - use("ruanyl/vim-gh-line") -- Open current line in GitHub - use("pwntester/octo.nvim") -- GitHub in Neovim - use("nvim-pack/nvim-spectre") -- Search and replace - use("stevearc/dressing.nvim") -- Improve the default vim.ui interfaces - use("folke/zen-mode.nvim") -- Zen Mode - use("tpope/vim-eunuch") -- UNIX Shell commands - use("folke/twilight.nvim") -- Dim inactive code - use("ray-x/guihua.lua") -- Lua GUI lib - use("ray-x/sad.nvim") -- Find & Replace - use("gorbit99/codewindow.nvim") -- Minimap - use("simrat39/symbols-outline.nvim") -- Symbols Outline - use("SmiteshP/nvim-navic") -- Statusline current context - use("kevinhwang91/nvim-bqf") -- Better Quickfix - use({ "kevinhwang91/nvim-ufo", requires = "kevinhwang91/promise-async" }) -- Better folds - use("debugloop/telescope-undo.nvim") -- Undo history - use("mrjones2014/smart-splits.nvim") -- Smart splits + "ThePrimeagen/harpoon", -- Getting you where you want + "ThePrimeagen/git-worktree.nvim", -- Git Worktree + "lewis6991/gitsigns.nvim", -- Git decorations + "kyazdani42/nvim-web-devicons", -- Icons and colors for file types + "kyazdani42/nvim-tree.lua", -- A File Explorer + "akinsho/bufferline.nvim", -- Emulate tabs for buffers + "moll/vim-bbye", -- Delete buffers without closing the window + "akinsho/toggleterm.nvim", -- Terminal in Neovim + "nvim-lualine/lualine.nvim", -- Statusline + "norcalli/nvim-colorizer.lua", -- Highlight colors + "ahmedkhalf/project.nvim", -- Project Management + "lewis6991/impatient.nvim", -- Speed Up Startup + "lukas-reineke/indent-blankline.nvim", -- Indentation guides + "goolord/alpha-nvim", -- Customizable Greeter + "antoinemadec/FixCursorHold.nvim", -- This is needed to fix lsp doc highlight + "MattesGroeger/vim-bookmarks", -- Bookmarks + "folke/which-key.nvim", -- Display possible keybindings + "mrjones2014/legendary.nvim", -- Legend for keymaps, commands, and autocommands + "APZelos/blamer.nvim", -- Git Blame + "tpope/vim-fugitive", -- Git plugin + "elijahmanor/export-to-vscode.nvim", -- Export active Buffers to Visual Studio Code + "bogado/file-line", -- Jump directly to line in file with 'nvim index.html:20' + "ruanyl/vim-gh-line", -- Open current line in GitHub + "pwntester/octo.nvim", -- GitHub in Neovim + "nvim-pack/nvim-spectre", -- Search and replace + "stevearc/dressing.nvim", -- Improve the default vim.ui interfaces + "folke/zen-mode.nvim", -- Zen Mode + "tpope/vim-eunuch", -- UNIX Shell commands + "folke/twilight.nvim", -- Dim inactive code + "ray-x/guihua.lua", -- Lua GUI lib + "ray-x/sad.nvim", -- Find & Replace + "gorbit99/codewindow.nvim", -- Minimap + "simrat39/symbols-outline.nvim", -- Symbols Outline + "SmiteshP/nvim-navic", -- Statusline current context + "kevinhwang91/nvim-bqf", -- Better Quickfix + { "kevinhwang91/nvim-ufo", dependencies = "kevinhwang91/promise-async" }, -- Better folds + "debugloop/telescope-undo.nvim", -- Undo history + "mrjones2014/smart-splits.nvim", -- Smart splits -- Editing Files - use("windwp/nvim-autopairs") -- Autopairs, integrates with both cmp and treesitter - use("windwp/nvim-ts-autotag") -- Autoclose and autorename html tags - use("numToStr/Comment.nvim") -- Easily comment stuff - use("JoosepAlviste/nvim-ts-context-commentstring") -- Comment based on cursor location of file - use({ "iamcco/markdown-preview.nvim", run = "cd app && yarn install", cmd = "MarkdownPreview" }) - use("yamatsum/nvim-cursorline") -- Highlight words and lines on the cursor - use("mattn/emmet-vim") -- Emmet - use("editorconfig/editorconfig-vim") -- Editorconfig - use("sheerun/vim-polyglot") -- A collection of language packs (?) - use("tpope/vim-abolish") -- Autofix spelling mistakes - use("mg979/vim-visual-multi") -- Multi cursor mode - use("vim-scripts/VisIncr") -- Increase and decreasing numbers, dates, daynames etc. - use("monaqa/dial.nvim") -- Increase and decrease numbers, dates, times, etc - use("rstacruz/vim-xtract") -- Extract code into new file - use("tpope/vim-repeat") -- Repeat plugins - use("kylechui/nvim-surround") -- Surround selections, stylishly - use("wuelnerdotexe/vim-astro") -- Astro support - use("MunifTanjim/prettier.nvim") -- Prettier - use("untitled-ai/jupyter_ascending.vim") -- Interact with jupyter_ascending - use("rhysd/vim-grammarous") -- A powerful grammar checker for Vim using LanguageTool - use("mechatroner/rainbow_csv") -- Rainbow CSV - use("dbeniamine/cheat.sh-vim") -- Cheat.sh - use("wakatime/vim-wakatime") -- Wakatime - use("github/copilot.vim") -- GitHub Copilot - use("folke/todo-comments.nvim") -- Highlight TODO - use("DNLHC/glance.nvim") -- Pretty preview of LSP locations - use("rlane/pounce.nvim") -- Incremental fuzzy search motion - use("echasnovski/mini.nvim") -- Library with 20+ plugins - use("dhruvasagar/vim-table-mode") -- Markdown table mode + "windwp/nvim-autopairs", -- Autopairs, integrates with both cmp and treesitter + "windwp/nvim-ts-autotag", -- Autoclose and autorename html tags + "numToStr/Comment.nvim", -- Easily comment stuff + "JoosepAlviste/nvim-ts-context-commentstring", -- Comment based on cursor location of file + { "iamcco/markdown-preview.nvim", build = "cd app && yarn install", cmd = "MarkdownPreview" }, + "yamatsum/nvim-cursorline", -- Highlight words and lines on the cursor + "mattn/emmet-vim", -- Emmet + "editorconfig/editorconfig-vim", -- Editorconfig + "sheerun/vim-polyglot", -- A collection of language packs (?, + "tpope/vim-abolish", -- Autofix spelling mistakes + "mg979/vim-visual-multi", -- Multi cursor mode + "vim-scripts/VisIncr", -- Increase and decreasing numbers, dates, daynames etc. + "monaqa/dial.nvim", -- Increase and decrease numbers, dates, times, etc + "rstacruz/vim-xtract", -- Extract code into new file + "tpope/vim-repeat", -- Repeat plugins + "kylechui/nvim-surround", -- Surround selections, stylishly + "wuelnerdotexe/vim-astro", -- Astro support + "MunifTanjim/prettier.nvim", -- Prettier + "untitled-ai/jupyter_ascending.vim", -- Interact with jupyter_ascending + "rhysd/vim-grammarous", -- A powerful grammar checker for Vim using LanguageTool + "mechatroner/rainbow_csv", -- Rainbow CSV + "dbeniamine/cheat.sh-vim", -- Cheat.sh + "wakatime/vim-wakatime", -- Wakatime + "github/copilot.vim", -- GitHub Copilot + "folke/todo-comments.nvim", -- Highlight TODO + "DNLHC/glance.nvim", -- Pretty preview of LSP locations + "rlane/pounce.nvim", -- Incremental fuzzy search motion + "echasnovski/mini.nvim", -- Library with 20+ plugins + "dhruvasagar/vim-table-mode", -- Markdown table mode -- Custom Text Objects - use("christoomey/vim-titlecase") - use("glts/vim-textobj-comment") -- ac, ic, aC - use("jceb/vim-textobj-uri") -- au, iu, go - use("kana/vim-textobj-datetime") -- ada, add, adf, adt, adz, ida, … - use("kana/vim-textobj-user") - use("michaeljsmith/vim-indent-object") -- ai, ii, aI, iI - use("whatyouhide/vim-textobj-xmlattr") -- ax, ix - use("nvim-treesitter/nvim-treesitter-textobjects") -- Syntax aware text-objects + "christoomey/vim-titlecase", + "michaeljsmith/vim-indent-object", -- ai, ii, aI, iI + "nvim-treesitter/nvim-treesitter-textobjects", -- Syntax aware text-objects + { "glts/vim-textobj-comment", dependencies = { "kana/vim-textobj-user" } }, -- ac, ic, aC + { "jceb/vim-textobj-uri", dependencies = { "kana/vim-textobj-user" } }, -- au, iu, go + { "kana/vim-textobj-datetime", dependencies = { "kana/vim-textobj-user" } }, -- ada, add, adf, adt, adz, ida, … + { "whatyouhide/vim-textobj-xmlattr", dependencies = { "kana/vim-textobj-user" } }, -- ax, ix -- Custom Motions - use("christoomey/vim-sort-motion") -- gs - use("tommcdo/vim-exchange") -- cx, cxx, X, cxc - use("easymotion/vim-easymotion") -- f/L - use("andymass/vim-matchup") -- Better % matching + "christoomey/vim-sort-motion", -- gs + "tommcdo/vim-exchange", -- cx, cxx, X, cxc + "easymotion/vim-easymotion", -- f/L + "andymass/vim-matchup", -- Better % matching -- TMUX - use("christoomey/vim-tmux-navigator") - use("preservim/vimux") - use("tyewang/vimux-jest-test") -- JavaScript tests - use("jtdowney/vimux-cargo") -- Rust tests - - -- Automatically set up your configuration after cloning packer.nvim - -- Put this at the end after all plugins - if PACKER_BOOTSTRAP then - require("packer").sync() - end -end) + "christoomey/vim-tmux-navigator", + "preservim/vimux", + "tyewang/vimux-jest-test", -- JavaScript tests + "jtdowney/vimux-cargo", -- Rust tests +}) diff --git a/setup/vim.sh b/setup/vim.sh index b6fb39a..1f1b2ea 100755 --- a/setup/vim.sh +++ b/setup/vim.sh @@ -1,4 +1,3 @@ #!/bin/sh -nvim -c 'autocmd User PackerComplete quitall' -c 'PackerSync' -nvim +Mason +15sleep +qall +nvim --headless "+Lazy! sync" +qa diff --git a/zshrc b/zshrc index d21e626..86833d2 100644 --- a/zshrc +++ b/zshrc @@ -94,7 +94,7 @@ function update () { pip list -o --format columns| cut -d' ' -f1|xargs -n1 pip install -U npm update npm -g npm update -g - nvim -c 'autocmd User PackerComplete quitall' -c 'PackerSync' + nvim --headless "+Lazy! sync" +qa sudo softwareupdate -i -a }