From b93df5490e3dd7c667196d1d44c50141ecb99608 Mon Sep 17 00:00:00 2001 From: John O'Keefe Date: Thu, 11 Apr 2024 12:06:58 -0400 Subject: [PATCH] updated to stable astrovim release with my plugins --- init.lua | 2 +- lazy-lock.json | 52 ++++++++++++-------------- lua/community.lua | 3 +- lua/lazy_setup.lua | 2 +- lua/plugins/astrocore.lua | 10 +---- lua/plugins/astroui.lua | 2 +- lua/plugins/neovide.lua | 1 + lua/plugins/surround.lua | 1 + lua/plugins/{vscode.lua => vsocde.lua} | 11 ++++-- 9 files changed, 40 insertions(+), 44 deletions(-) rename lua/plugins/{vscode.lua => vsocde.lua} (85%) diff --git a/init.lua b/init.lua index c6497f4..2ce1cdd 100644 --- a/init.lua +++ b/init.lua @@ -16,4 +16,4 @@ if not pcall(require, "lazy") then end require "lazy_setup" -require "polish" \ No newline at end of file +require "polish" diff --git a/lazy-lock.json b/lazy-lock.json index 52e3489..57a4718 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,44 +1,42 @@ { - "AstroNvim": { "branch": "v4", "commit": "fe9c17ba133751df7b87ee3d3390ff52994d0d46" }, + "AstroNvim": { "branch": "main", "commit": "e5700241d223666c0bfecef03c6736934f0c8226" }, "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, - "LuaSnip": { "branch": "master", "commit": "be7be2ca7f55bb881a7ffc16b2efa5af034ab06b" }, - "aerial.nvim": { "branch": "master", "commit": "24ebacab5821107c50f628e8e7774f105c08fe9b" }, + "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, + "aerial.nvim": { "branch": "master", "commit": "3748e87a316a68754341cdffcef44fee61dee51c" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, - "astrocommunity": { "branch": "v4", "commit": "c7933265dcbde8212567bb4fabfed3745b2f2d01" }, "astrocore": { "branch": "main", "commit": "6ad335ddb3dd4f1a99f23049dd201f3dd50beeb8" }, - "astrolsp": { "branch": "main", "commit": "2ac3632dabe1bafb6548af0e6b7d779a7fbb1327" }, + "astrolsp": { "branch": "main", "commit": "21629f447c574965399329a8dd925d9eeac82752" }, "astrotheme": { "branch": "main", "commit": "8b316aa3ecd8c4206430379c0b1da0b4e7969ab9" }, - "astroui": { "branch": "main", "commit": "c19a5a8724ca5388f3605d5012bb454ee113bff7" }, + "astroui": { "branch": "main", "commit": "76da7442ca15c144c0377828208bed4904450058" }, "better-escape.nvim": { "branch": "master", "commit": "7e86edafb8c7e73699e0320f225464a298b96d12" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-dap": { "branch": "master", "commit": "ea92773e84c0ad3288c3bc5e452ac91559669087" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "dressing.nvim": { "branch": "master", "commit": "18e5beb3845f085b6a33c24112b37988f3f93c06" }, + "dressing.nvim": { "branch": "master", "commit": "42d767b04c50a6966c9633e3968bc65c0c2f2bfc" }, "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" }, - "gitsigns.nvim": { "branch": "main", "commit": "c097cb255096f333e14d341082a84f572b394fa2" }, + "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, "guess-indent.nvim": { "branch": "main", "commit": "b8ae749fce17aa4c267eec80a6984130b94f80b2" }, "heirline.nvim": { "branch": "master", "commit": "03cff30d7e7d3ba6fdc00925f015822f79cef908" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, - "lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" }, + "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" }, "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "44509689b9bf3984d729cc264aacb31cb7f41668" }, - "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" }, - "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "2ba17cecfde8b8c7c7c287909a1e4de895223df6" }, + "mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "3614a39aae98ccd34124b072939d6283853b3dd2" }, + "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "mini.bufremove": { "branch": "main", "commit": "931a3bb514147d9e812767275c4beba6b779b1d3" }, - "neo-tree.nvim": { "branch": "main", "commit": "c61074acb19102dfc6f21738dcae4d9a494a8959" }, - "neoconf.nvim": { "branch": "main", "commit": "9d61ff423ae5f179ace1823300c4873f38a7c418" }, - "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, + "neo-tree.nvim": { "branch": "main", "commit": "16d1b194376bf1fc2acd89ccb3c29ba8315bfcea" }, + "neoconf.nvim": { "branch": "main", "commit": "f8947e998dac4213f6c7bb1c7b843cba64db22dd" }, + "neodev.nvim": { "branch": "main", "commit": "da1562e1e3df0e994ddc52cb4ba22376a5d7f2fc" }, "none-ls.nvim": { "branch": "main", "commit": "dca7ddec321a102ec9e792b1b29193702aff5fbb" }, - "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" }, + "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" }, "nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, - "nvim-dap": { "branch": "master", "commit": "405df1dcc2e395ab5173a9c3d00e03942c023074" }, - "nvim-dap-python": { "branch": "master", "commit": "3dffa58541d1f52c121fe58ced046268c838d802" }, - "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" }, + "nvim-dap": { "branch": "master", "commit": "9d81c11fd185a131f81841e64941859305f6c42d" }, + "nvim-dap-ui": { "branch": "master", "commit": "f7d75cca202b52a60c520ec7b1ec3414d6e77b0f" }, "nvim-lspconfig": { "branch": "master", "commit": "b3014f2209503944f2714cf27c95591433a0c7d8" }, "nvim-nio": { "branch": "master", "commit": "5800f585def265d52f1d8848133217c800bcb25d" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, @@ -50,16 +48,14 @@ "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, "nvim-web-devicons": { "branch": "master", "commit": "6e355632387a085f15a66ad68cf681c1d7374a04" }, "nvim-window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" }, - "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" }, - "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, - "resession.nvim": { "branch": "master", "commit": "742aba4998123fc11f490a3aeffe8f550b2cb789" }, - "smart-splits.nvim": { "branch": "master", "commit": "113d79d2fe3182e4dc9ac69047f185348c917f6b" }, + "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, + "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" }, + "resession.nvim": { "branch": "master", "commit": "dc8825439c619030925543a444c4186a2487c200" }, + "smart-splits.nvim": { "branch": "master", "commit": "f6fcb79527872e9330c554915af2ca511c388390" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, - "telescope.nvim": { "branch": "master", "commit": "5a701e99906961218b55d7ad6c2a998f066c6fe0" }, + "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" }, "toggleterm.nvim": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" }, - "tokyonight.nvim": { "branch": "main", "commit": "9bf9ec53d5e87b025e2404069b71e7ebdc3a13e5" }, - "venv-selector.nvim": { "branch": "main", "commit": "3c57922256e7e26205a25f5a42ecf7104d9f2c78" }, "vim-illuminate": { "branch": "master", "commit": "305bf07b919ac526deb5193280379e2f8b599926" }, - "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } + "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" } } \ No newline at end of file diff --git a/lua/community.lua b/lua/community.lua index 2d33fa6..ceb0c12 100644 --- a/lua/community.lua +++ b/lua/community.lua @@ -9,6 +9,7 @@ return { "AstroNvim/astrocommunity", { import = "astrocommunity.pack.lua" }, -- import/override with your plugins folder + { import = "astrocommunity.recipes.vscode" }, + { import = "astrocommunity.recipes.neovide" }, { import = "astrocommunity.colorscheme.tokyonight-nvim" }, - { import = "astrocommunity.pack.python" }, } diff --git a/lua/lazy_setup.lua b/lua/lazy_setup.lua index 3997162..cca2306 100644 --- a/lua/lazy_setup.lua +++ b/lua/lazy_setup.lua @@ -1,7 +1,7 @@ require("lazy").setup({ { "AstroNvim/AstroNvim", - branch = "^4", -- TODO: change `branch="v4"` to `version="^4"` on release + version = "^4", -- Remove version tracking to elect for nighly AstroNvim import = "astronvim.plugins", opts = { -- AstroNvim options must be set here with the `import` key mapleader = " ", -- This ensures the leader key must be configured before Lazy is set up diff --git a/lua/plugins/astrocore.lua b/lua/plugins/astrocore.lua index 7a8cca5..c99b395 100644 --- a/lua/plugins/astrocore.lua +++ b/lua/plugins/astrocore.lua @@ -47,14 +47,8 @@ return { -- second key is the lefthand side of the map -- navigate buffer tabs with `H` and `L` - L = { - function() require("astrocore.buffer").nav(vim.v.count > 0 and vim.v.count or 1) end, - desc = "Next buffer", - }, - H = { - function() require("astrocore.buffer").nav(-(vim.v.count > 0 and vim.v.count or 1)) end, - desc = "Previous buffer", - }, + L = { function() require("astrocore.buffer").nav(vim.v.count1) end, desc = "Next buffer" }, + H = { function() require("astrocore.buffer").nav(-vim.v.count1) end, desc = "Previous buffer" }, -- mappings seen under group name "Buffer" ["bD"] = { diff --git a/lua/plugins/astroui.lua b/lua/plugins/astroui.lua index 520a9b2..3c7fc11 100644 --- a/lua/plugins/astroui.lua +++ b/lua/plugins/astroui.lua @@ -11,7 +11,7 @@ return { ---@type AstroUIOpts opts = { -- change colorscheme - colorscheme = "tokyonight-nvim", + colorscheme = "tokyonight", -- AstroUI allows you to easily modify highlight groups easily for any and all colorschemes highlights = { init = { -- this table overrides highlights in all themes diff --git a/lua/plugins/neovide.lua b/lua/plugins/neovide.lua index 0ce39a9..60589c5 100644 --- a/lua/plugins/neovide.lua +++ b/lua/plugins/neovide.lua @@ -19,3 +19,4 @@ return { }, }, } + diff --git a/lua/plugins/surround.lua b/lua/plugins/surround.lua index 655d9f5..ea7887f 100644 --- a/lua/plugins/surround.lua +++ b/lua/plugins/surround.lua @@ -4,3 +4,4 @@ return { event = "VeryLazy", config = function() require("nvim-surround").setup {} end, } + diff --git a/lua/plugins/vscode.lua b/lua/plugins/vsocde.lua similarity index 85% rename from lua/plugins/vscode.lua rename to lua/plugins/vsocde.lua index 32f6e20..1ab3ab3 100644 --- a/lua/plugins/vscode.lua +++ b/lua/plugins/vsocde.lua @@ -1,5 +1,7 @@ -- don't do anything in non-vscode instances -if not vim.g.vscode then return {} end +if not vim.g.vscode then + return {} +end -- a list of known working plugins with vscode-neovim, update with your own plugins local plugins = { @@ -13,15 +15,16 @@ local plugins = { "nvim-ts-autotag", "nvim-treesitter-textobjects", "nvim-ts-context-commentstring", - "nvim-surround", } -local Config = require "lazy.core.config" +local Config = require("lazy.core.config") -- disable plugin update checking Config.options.checker.enabled = false Config.options.change_detection.enabled = false -- replace the default `cond` -Config.options.defaults.cond = function(plugin) return vim.tbl_contains(plugins, plugin.name) end +Config.options.defaults.cond = function(plugin) + return vim.tbl_contains(plugins, plugin.name) +end ---@type LazySpec return {