From d542d2fb44984a06cb03f958d5e4edc789322c98 Mon Sep 17 00:00:00 2001 From: Amaan Qureshi Date: Thu, 16 Mar 2023 03:54:38 -0400 Subject: [PATCH] chore: updates --- README.md | 2 +- lazy-lock.json | 148 +++++++++--------- lua/config/autocmds.lua | 8 +- lua/config/lazy.lua | 3 +- lua/plugins/colorscheme.lua | 28 ++-- .../extras/{lang => coding}/copilot.lua | 4 +- lua/plugins/ui.lua | 4 +- 7 files changed, 101 insertions(+), 96 deletions(-) rename lua/plugins/extras/{lang => coding}/copilot.lua (78%) diff --git a/README.md b/README.md index f618dd0..9ca1240 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ inspired by his. - [lualine.nvim](https://github.com/nvim-lualine/lualine.nvim) - [LuaSnip](https://github.com/L3MON4D3/LuaSnip) - [mason-lspconfig.nvim](https://github.com/williamboman/mason-lspconfig.nvim) -- [mason-null-ls.nvim](https://github.com/jayp0521/mason-null-ls.nvim) +- [mason-null-ls.nvim](https://github.com/jay-babu/mason-null-ls.nvim) - [mason.nvim](https://github.com/williamboman/mason.nvim) - [material.nvim](https://github.com/marko-cerovac/material.nvim) - [medical-spell-files](https://github.com/melvio/medical-spell-files) diff --git a/lazy-lock.json b/lazy-lock.json index d125c9d..112d72a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,13 +1,13 @@ { - "LazyVim": { "branch": "main", "commit": "befa6c67a4387b0db4f8421d463f5d03f91dc829" }, - "LuaSnip": { "branch": "master", "commit": "f7c845749aba6096f041a73a26ba64f3817bab99" }, + "LazyVim": { "branch": "main", "commit": "6b740fd300d7b6dccd1dd2c722ee6a4c7a5b718a" }, + "LuaSnip": { "branch": "master", "commit": "a835e3d680c5940b61780c6af07885db95382478" }, "Sakura.nvim": { "branch": "master", "commit": "0b56b51fa9fcab0423d2809775d91966837581e6" }, - "SchemaStore.nvim": { "branch": "main", "commit": "6f2ffb8420422db9a6c43dbce7227f0fdb9fcf75" }, - "alpha-nvim": { "branch": "main", "commit": "b6c7b5d9d6d2633722255abf2be3ecb8733e8d2d" }, - "barbecue.nvim": { "branch": "main", "commit": "23348f3979912fb36a1442fb0d07e8d2e739aea2" }, - "bufferline.nvim": { "branch": "main", "commit": "cbb798dd2db7841550cd2c6c6dde12dfda055928" }, - "catppuccin": { "branch": "main", "commit": "7c392fb5f27daa6addee050f7b7522718e8d9357" }, - "clangd_extensions.nvim": { "branch": "main", "commit": "722ee39d4c1b309bef4a6c2da1749c3e3358757f" }, + "SchemaStore.nvim": { "branch": "main", "commit": "5173267a218675f123be958e3d2eb770f8a425de" }, + "alpha-nvim": { "branch": "main", "commit": "3847d6baf74da61e57a13e071d8ca185f104dc96" }, + "barbecue.nvim": { "branch": "main", "commit": "d60fb8d8e240e5be04a20636f5b35b05a0d4712c" }, + "bufferline.nvim": { "branch": "main", "commit": "3677aceb9a72630b0613e56516c8f7151b86f95c" }, + "catppuccin": { "branch": "main", "commit": "128af65c3a23c94b324dc8d7f02a34feee8722d4" }, + "clangd_extensions.nvim": { "branch": "main", "commit": "798e377ec859087132b81d2f347b5080580bd6b1" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-calc": { "branch": "main", "commit": "50792f34a628ea6eb31d2c90e8df174671e4e7a0" }, "cmp-dap": { "branch": "master", "commit": "d16f14a210cd28988b97ca8339d504533b7e09a4" }, @@ -17,110 +17,112 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, - "comment-box.nvim": { "branch": "main", "commit": "8fb605162833dd39339b6c3bdfe9e7ad3486958e" }, + "comment-box.nvim": { "branch": "main", "commit": "6672213bd5d2625a666a297b66307967effa50bc" }, "committia.vim": { "branch": "master", "commit": "0b4df1a7f48ffbc23b009bd14d58ee1be541917c" }, "copilot-cmp": { "branch": "master", "commit": "92535dfd9c430b49ca7d9a7da336c5db65826b65" }, "copilot.lua": { "branch": "master", "commit": "b41d4c9c7d4f5e0272bcf94061b88e244904c56f" }, - "crates.nvim": { "branch": "main", "commit": "c33aae75745877ee1ef16f5781478f4f2f120623" }, + "crates.nvim": { "branch": "main", "commit": "aa94d3844d6a12b1a8bf73c8a242ff2f540fb749" }, "dap-buddy.nvim": { "branch": "main", "commit": "bbda2b062e5519cde4e10b6e4240d3dd1f867b20" }, "dial.nvim": { "branch": "master", "commit": "5020da900cc5dfd7067f181ee2ebd872ca7c84e8" }, - "diffview.nvim": { "branch": "main", "commit": "05abf42f997979cf1694318dd59b963659118f41" }, + "diffview.nvim": { "branch": "main", "commit": "ebcbe90401555272025006db00da0972f7e0db63" }, "dressing.nvim": { "branch": "master", "commit": "5f44f829481640be0f96759c965ae22a3bcaf7ce" }, - "drop.nvim": { "branch": "main", "commit": "e3150f5e25293830c5232c3af2ce396f7b7bf79d" }, - "flit.nvim": { "branch": "main", "commit": "980e80e8fe44caaeb9de501c8e97a559b17db2f4" }, - "friendly-snippets": { "branch": "main", "commit": "6fa50a94ba5378bb73013a6e163376d8e69bd8a5" }, + "drop.nvim": { "branch": "main", "commit": "7a27aadf9b7370755bf2b761bedeace8cfdab40e" }, + "flit.nvim": { "branch": "main", "commit": "4c1739137acd3e7f03e2065a7be8a4dc41c7e461" }, + "friendly-snippets": { "branch": "main", "commit": "2f5b8a41659a19bd602497a35da8d81f1e88f6d9" }, "git-blame.nvim": { "branch": "master", "commit": "1ad47c6454a5a53d3f4ffdd4022e84f4a6e376cb" }, "git-conflict.nvim": { "branch": "main", "commit": "2957f747e1a34f1854e4e0efbfbfa59a1db04af5" }, "git-messenger.vim": { "branch": "master", "commit": "8a61bdfa351d4df9a9118ee1d3f45edbed617072" }, "github-nvim-theme": { "branch": "main", "commit": "e21282d37eef01c8ebce0b42c76750bda4396163" }, "gitlinker.nvim": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" }, - "gitsigns.nvim": { "branch": "main", "commit": "f388995990aba04cfdc7c3ab870c33e280601109" }, + "gitsigns.nvim": { "branch": "main", "commit": "b1f9cf7c5c5639c006c937fc1819e09f358210fc" }, "glance.nvim": { "branch": "master", "commit": "bbded06ea23faad779297122e93b1c0dcdb2a770" }, - "go.nvim": { "branch": "master", "commit": "4d066613379d85094bb4ddd52e34e6d3f55fc24e" }, + "go.nvim": { "branch": "master", "commit": "fd88c61e5d47f6299db250a5aa1a7ed1049a4672" }, "gopher.nvim": { "branch": "main", "commit": "cc46546a93c7ccea39f1e008e6804b93559bec29" }, - "gruvbox.nvim": { "branch": "main", "commit": "3e31f9ab01fed42ebac75738c681daacb8c82bff" }, + "gruvbox.nvim": { "branch": "main", "commit": "c6ef9c5a3a2ece0f8635460291eb4a4c06ed3dcc" }, "guihua.lua": { "branch": "master", "commit": "a19ac4447021f21383fadd7a9e1fc150d0b67e1f" }, "headlines.nvim": { "branch": "master", "commit": "6496b6229ce708253a906daed07067c1d32a427b" }, "horizon.nvim": { "branch": "master", "commit": "f7c758f0ebd47a72dd2832a8744340e72dad62f8" }, "inc-rename.nvim": { "branch": "main", "commit": "21c23c379342a731a0c90f226601ec0434627b26" }, "incline.nvim": { "branch": "main", "commit": "71a03756a5f750c79a2889a80fcd8bbff7083690" }, "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, - "kanagawa.nvim": { "branch": "master", "commit": "4c8d48726621a7f3998c7ed35b2c2535abc22def" }, - "lazy.nvim": { "branch": "main", "commit": "8077428e63feb0f3bf795d53b23ba1695b28ab0e" }, - "leap.nvim": { "branch": "main", "commit": "9a69febb2e5a4f5f5a55dd2d7173098fde917bc5" }, + "kanagawa.nvim": { "branch": "master", "commit": "d8800c36a7f3bcec953288926b00381c028ed97f" }, + "lazy.nvim": { "branch": "main", "commit": "e27c9df5fe039e9d2833ef4fcf7305595d5ccda7" }, + "leap.nvim": { "branch": "main", "commit": "f74473d23ebf60957e0db3ff8172349a82e5a442" }, "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "3f9c0ea157e88b08e2d11ec65002eeb6e421f0da" }, - "mason-null-ls.nvim": { "branch": "main", "commit": "bee43f4911548445f85d2ce123c4422e98d1fb31" }, - "mason.nvim": { "branch": "main", "commit": "5f38eca64b7ed9f8a1f997ce67f2ccc80ab80c91" }, - "material.nvim": { "branch": "main", "commit": "c5f6a24d526a8ddcd651c5d1291de89a51f923fa" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "3924f2d264097b2caf13e713485dbc3e9d616574" }, + "mason-null-ls.nvim": { "branch": "main", "commit": "4070ec7c543b67df16143ee206e436d24bb9c01b" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "8c5d0212bb385ce363ac3a00aa2e16d88ac44ba7" }, + "mason.nvim": { "branch": "main", "commit": "87c9453cd91da3bba1076fa578a72439fbc4d311" }, + "material.nvim": { "branch": "main", "commit": "18d5e8af4c4bc77382bda5e5ae2830ab515cf5c6" }, "medical-spell-files": { "branch": "main", "commit": "f87a48acb6be7a517ce53dfd1e9e3cd779a5d19a" }, "middleclass": { "branch": "master", "commit": "9fab4d5bca67262614960960ca35c4740eb2be2c" }, - "mini.ai": { "branch": "main", "commit": "ce822c6e6fe3aaf7cb29874e669b2d96febc97e5" }, - "mini.animate": { "branch": "main", "commit": "68ed56e0a730f8c69d1382e9ca9db7433565f421" }, - "mini.bufremove": { "branch": "main", "commit": "8464390c932556dbb298ccf8a7587d6ef765e94f" }, - "mini.comment": { "branch": "main", "commit": "5e8c7f75c48d958ef84ed75772b0263284c8621d" }, - "mini.indentscope": { "branch": "main", "commit": "ff1e68b5c01426f9dfff3278dd1b10c9b5f000a1" }, - "mini.pairs": { "branch": "main", "commit": "61811b4f3e29dc4926f8418dd64aebe0013914c2" }, - "mini.surround": { "branch": "main", "commit": "21babf8f50afbb403ab1b9c2053806ccc28e40b6" }, - "neo-tree-diagnostics.nvim": { "branch": "main", "commit": "b1825e82bef78657ef364d2419926e414fd7eb20" }, - "neo-tree.nvim": { "branch": "v2.x", "commit": "74040b34278910d9b467fd914862e2a9a1ebacaa" }, - "neoconf.nvim": { "branch": "main", "commit": "54668cbc4c2f73151eadb361dd94b34ae61dde8e" }, - "neodev.nvim": { "branch": "main", "commit": "f081eb96d6a8dcc1835cdad1e5a46a254093cfc4" }, + "mini.ai": { "branch": "main", "commit": "d5a9f6b50fc6285fb876667e67394bbee2d5c70c" }, + "mini.animate": { "branch": "main", "commit": "3ef586e8c6a4034e3d7e803bf29e296025ecdd38" }, + "mini.bracketed": { "branch": "main", "commit": "94a8aa0c3a38d9187108c62a8f0ff1ed4d99ccc4" }, + "mini.bufremove": { "branch": "main", "commit": "68f9111aa81545022bb5afe7d576311a0fc29969" }, + "mini.comment": { "branch": "main", "commit": "f045998636c6fd746297220b8c692bf1e91568cb" }, + "mini.indentscope": { "branch": "main", "commit": "43f6761c9a3e397b7c12b3c72f678bcf61efcfcf" }, + "mini.pairs": { "branch": "main", "commit": "771c08bd313614c7e9a1904d277ac76eb226f674" }, + "mini.surround": { "branch": "main", "commit": "b450a3aff91b4108c0e9ba9e82633d65deb5802b" }, + "neo-tree-diagnostics.nvim": { "branch": "main", "commit": "03c99fd56b3177f75beac5308d4e134764eebd96" }, + "neo-tree.nvim": { "branch": "v2.x", "commit": "205184aa0e0f08e8a1249d9bb37b45bae85f01b9" }, + "neoconf.nvim": { "branch": "main", "commit": "98a6166b341249ce6b14e54f245d902cc066f3fc" }, + "neodev.nvim": { "branch": "main", "commit": "aa75cacd9a040f3660aa9a48344e65d22d914712" }, "neodim": { "branch": "master", "commit": "c346344ade2ce709e6bd282f10e43778672b861e" }, "neogen": { "branch": "main", "commit": "93d997dbddfe084e77ba4541c54a7b8bfd754fb1" }, - "neorg": { "branch": "main", "commit": "6c87e1d98a769b87d7ef4180eb9b00a45d272954" }, - "neotest": { "branch": "master", "commit": "b06b0ccbddc61acfe781689da969d2e0117b3dfe" }, + "neorg": { "branch": "main", "commit": "532548b9f444bd1ae6f2efd3edd842282cc79659" }, + "neotest": { "branch": "master", "commit": "bbbfa55d850f1aaa6707ea85fb5230ac866459c6" }, "neotest-go": { "branch": "main", "commit": "49151e258088bd94895e48c977f8c51e3b956178" }, - "neotest-haskell": { "branch": "master", "commit": "3413c309f40f12e7fad68d40d612ba9ce215a220" }, + "neotest-haskell": { "branch": "master", "commit": "929e42a25d02f16e8380ccfc6710a513bfb3209e" }, "neotest-jest": { "branch": "main", "commit": "821bb227e31259307db30c88671a1c3724f78637" }, "neotest-plenary": { "branch": "master", "commit": "d49bfd9470f791e7c29149e75d56b6f925bb391b" }, "neotest-python": { "branch": "master", "commit": "6c06041cfb45f45e276068020baa06c06fe20d5c" }, - "neotest-rust": { "branch": "main", "commit": "ceb091b6fe30c675564b81a166064fc283eab7ae" }, + "neotest-rust": { "branch": "main", "commit": "c8350069f18f1a82972791f20ce2fb99f69d41e9" }, "neovim-ayu": { "branch": "master", "commit": "0eb91afe11f1763a477655965684269a545012e1" }, - "noice.nvim": { "branch": "main", "commit": "d8a1f3056ad713b5d471048f8d029264828e22c0" }, - "nui.nvim": { "branch": "main", "commit": "d147222a1300901656f3ebd5b95f91732785a329" }, - "null-ls.nvim": { "branch": "main", "commit": "689cdd78f70af20a37b5309ebc287ac645ae4f76" }, - "numb.nvim": { "branch": "master", "commit": "d95b7ea62e320b02ca1aa9df3635471a88d6f3b1" }, - "nvim-cmp": { "branch": "main", "commit": "01f697a68905f9dcae70960a9eb013695a17f9a2" }, + "noice.nvim": { "branch": "main", "commit": "0c493e5d243c39adf3d6ce7683a16e610cc44e0a" }, + "nui.nvim": { "branch": "main", "commit": "0dc148c6ec06577fcf06cbab3b7dac96d48ba6be" }, + "null-ls.nvim": { "branch": "main", "commit": "2fcc10637b325e656d45a760901e1e05170e36c9" }, + "numb.nvim": { "branch": "master", "commit": "2c89245d1185e02fec1494c45bc765a38b6b40b3" }, + "nvim-cmp": { "branch": "main", "commit": "feed47fd1da7a1bad2c7dca456ea19c8a5a9823a" }, "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" }, - "nvim-dap": { "branch": "master", "commit": "5b986edc95cf7b37da1db91a5c149daa3ac008d2" }, + "nvim-dap": { "branch": "master", "commit": "5e1e259798d978aa92fbc467199fd5171fee4ce7" }, + "nvim-dap-go": { "branch": "main", "commit": "b4ded7de579b4e2a85c203388233b54bf1028816" }, "nvim-dap-python": { "branch": "master", "commit": "65ccab83fb3d0b29ead6c765c1c52a1ed49592e8" }, "nvim-dap-ui": { "branch": "master", "commit": "bdb94e3853d11b5ce98ec182e5a3719d5c0ef6fd" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "8db23ea51203b5f00ad107a0cef7e0b2d7a0476c" }, - "nvim-dap-vscode-js": { "branch": "main", "commit": "baff224af20c6632861a59aa742c9740c68030de" }, - "nvim-jdtls": { "branch": "master", "commit": "8fe3be1c08ab0bb55f2998fbc02f1a08f87a44bc" }, - "nvim-lspconfig": { "branch": "master", "commit": "62856b20751b748841b0f3ec5a10b1e2f6a6dbc9" }, + "nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" }, + "nvim-jdtls": { "branch": "master", "commit": "9fcc9495b5d03f8d50e4af936fd0f905f045a6c2" }, + "nvim-lspconfig": { "branch": "master", "commit": "63f4c0082f007d2356df4bc335f55e6d414da89c" }, "nvim-luapad": { "branch": "master", "commit": "a5b3d6aa1fe5fe75e6124927392a9d3a60a0ecce" }, - "nvim-navic": { "branch": "master", "commit": "7e9d2b2b601149fecdccd11b516acb721e571fe6" }, - "nvim-notify": { "branch": "master", "commit": "9c987081390753b625e2d94e749e80e9b4a3e082" }, - "nvim-regexplainer": { "branch": "main", "commit": "8af9a846644982ab1e11cc99b6e4831e12479207" }, + "nvim-navic": { "branch": "master", "commit": "cdd24539bcf114a499827e9b32869fe74836efe7" }, + "nvim-notify": { "branch": "master", "commit": "02047199e2752223c77c624160f720ca227944a9" }, + "nvim-regexplainer": { "branch": "main", "commit": "f7ceb71176a892e24349b6f9bc30b3088fde9ac6" }, "nvim-scrollbar": { "branch": "main", "commit": "75210c554e935740448cfb532d8a671ae544bb1b" }, - "nvim-spectre": { "branch": "master", "commit": "b71b64afe9fedbfdd25a8abec897ff4af3bd553a" }, + "nvim-spectre": { "branch": "master", "commit": "201ccd1f6ce98a4e509359c8994e111a52a02515" }, "nvim-terminal.lua": { "branch": "master", "commit": "095f98aaa7265628a72cd2706350c091544b5602" }, - "nvim-toggleterm.lua": { "branch": "main", "commit": "31d38d11390bcd35a568fcc65a79b7d6ec89de62" }, + "nvim-toggleterm.lua": { "branch": "main", "commit": "c8e982ad2739eeb0b13d0fecb14820c9bf5e3da0" }, "nvim-treehopper": { "branch": "master", "commit": "5a28bff46c05d28bdb4bcaef67e046eb915a9390" }, - "nvim-treesitter": { "branch": "master", "commit": "b9a7591b6c23c983256d034bedd5f509edc6351d" }, - "nvim-treesitter-context": { "branch": "master", "commit": "895ec44f5c89bc67ba5440aef3d1f2efa3d59a41" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "4b30081d2736e09f90c890a8a7adfe4df36f5b36" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "a0f89563ba36b3bacd62cf967b46beb4c2c29e52" }, - "nvim-ts-rainbow2": { "branch": "master", "commit": "c9e71254f8300cae2e5a9e4bd3533bd3e6f586b7" }, - "nvim-web-devicons": { "branch": "master", "commit": "0f23feca2bd08549b779c838b6b1308d1e76df03" }, + "nvim-treesitter": { "branch": "master", "commit": "e6f9a4b7c3b113a82b313d520ff32707cc5dddfa" }, + "nvim-treesitter-context": { "branch": "master", "commit": "cb6252b00d19c8b57e8e66de19a601df28455dd1" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "5b2bcb9ca8315879181f468b37a897100d631005" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "729d83ecb990dc2b30272833c213cc6d49ed5214" }, + "nvim-web-devicons": { "branch": "master", "commit": "f1b1cee3a561590a6c1637a9326c406f6e4af914" }, "nvim-window-picker": { "branch": "main", "commit": "5902827d0e338890a22849e2f18dc80d1cc1a8db" }, - "octo.nvim": { "branch": "master", "commit": "f336322f865cfa310ae15435c6bec337687b6b20" }, + "octo.nvim": { "branch": "master", "commit": "91a87271552828a499c2ddcc6a3e36f09f38c1d3" }, "one-small-step-for-vimkind": { "branch": "main", "commit": "aef1bdbb8347e6daaf33d5109002f3df243ebfe9" }, - "onedarkpro.nvim": { "branch": "main", "commit": "b8a172efe906ca3c9bc2c2fe6bc7983e2345eaf1" }, - "oxocarbon.nvim": { "branch": "main", "commit": "03c4a17f24fc09c1bf625c26d7077d4e53e25561" }, + "onedarkpro.nvim": { "branch": "main", "commit": "70e8289b73094f3c18c83a0ab924071836689f1b" }, + "oxocarbon.nvim": { "branch": "main", "commit": "dd29f538e6cfa0827896a4078db97119a8ca5c5e" }, "package-info.nvim": { "branch": "master", "commit": "54337910c67946ffb8a2845a4e547dba925e0f37" }, - "peek.nvim": { "branch": "master", "commit": "7fb50a540edf28a99e8f3871e093dff65d5e493d" }, - "persistence.nvim": { "branch": "main", "commit": "d8a3eda0e19b4d5f3180fc832c25baab1709f2a1" }, + "peek.nvim": { "branch": "master", "commit": "571f14c795e8edd5a21e435f42f37c9bec4a8e16" }, + "persistence.nvim": { "branch": "main", "commit": "adcf6913693a0434665d162ee45a186230496f8a" }, "playground": { "branch": "master", "commit": "4044b53c4d4fcd7a78eae20b8627f78ce7dc6f56" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, "project.nvim": { "branch": "main", "commit": "1c2e9c93c7c85126c2197f5e770054f53b1926fb" }, "refactoring.nvim": { "branch": "master", "commit": "57c32c6b7a211e5a3a5e4ddc4ad2033daff5cf9a" }, - "rose-pine": { "branch": "main", "commit": "4d6b2a2fe4a0fea30c7808559b06be46624bc587" }, + "rose-pine": { "branch": "main", "commit": "1883d8b417403f1d8c56d52d90445bbbe6be4b80" }, "rust-tools.nvim": { "branch": "master", "commit": "71d2cf67b5ed120a0e31b2c8adb210dd2834242f" }, - "sqlite.lua": { "branch": "master", "commit": "93ff5824682ecc874200e338fd8ca9ccd08508f8" }, + "sqlite.lua": { "branch": "master", "commit": "5162c8e2cc580f66ffe4bb4a7ae97a412596faba" }, "ssr.nvim": { "branch": "main", "commit": "97a9e1e319eec2d7e9731be4c6ac9638a1a2d79d" }, "styler.nvim": { "branch": "main", "commit": "17c202aaa938f9887fa71373f41f179f6dd94f37" }, "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" }, @@ -130,23 +132,23 @@ "telescope-project.nvim": { "branch": "master", "commit": "8e8ee37b7210761502cdf2c3a82b5ba8fb5b2972" }, "telescope-undo.nvim": { "branch": "main", "commit": "03ff45fab0c4adad4d252e25b5b194e22caf5b4f" }, "telescope.nvim": { "branch": "master", "commit": "a3f17d3baf70df58b9d3544ea30abe52a7a832c2" }, - "todo-comments.nvim": { "branch": "main", "commit": "74c7d28cb50b0713c881ef69bcb6cdd77d8907d1" }, - "tokyonight.nvim": { "branch": "main", "commit": "a0abe53df53616d13da327636cb0bcac3ea7f5af" }, - "treesj": { "branch": "main", "commit": "87e5fb6ab30de6f935bc586397ce0bcd548ace5a" }, - "trouble.nvim": { "branch": "main", "commit": "3b754285635a66a93aeb15fa71a23417d8997217" }, + "todo-comments.nvim": { "branch": "main", "commit": "6ccb0bebeb22dbe31940776a750db54b844ae653" }, + "tokyonight.nvim": { "branch": "main", "commit": "467d889ba82a74e26821c812aa8e70d7dff04c6c" }, + "treesj": { "branch": "main", "commit": "cb873d8aac3679f92ff20befc06e17ff275c3a6c" }, + "trouble.nvim": { "branch": "main", "commit": "67337644e38144b444d026b0df2dc5fa0038930f" }, "twilight.nvim": { "branch": "main", "commit": "9410252bed96887ca5a86bf16435a3a51a0e6ce5" }, "typescript.nvim": { "branch": "main", "commit": "f66d4472606cb24615dfb7dbc6557e779d177624" }, "undotree": { "branch": "master", "commit": "485f01efde4e22cb1ce547b9e8c9238f36566f21" }, "vim-dirtytalk": { "branch": "master", "commit": "4046f35cb9795e9edd109fea0159cbf027ad590c" }, "vim-highlighturl": { "branch": "master", "commit": "012fee983e03913db6ba6393307eac434999b896" }, "vim-illuminate": { "branch": "master", "commit": "49062ab1dd8fec91833a69f0a1344223dd59d643" }, - "vim-matchup": { "branch": "master", "commit": "3a48818a8113a502f245c29d894201421727577a" }, + "vim-matchup": { "branch": "master", "commit": "fef9f334e64f024ac49eda92ef6274e826fe2de9" }, "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" }, "vim-startuptime": { "branch": "master", "commit": "6580cf539c33a212f4f5542068a3b4dd2b3ad834" }, "vim-wakatime": { "branch": "master", "commit": "62113bb063aa1923146e59270d71563441ceabe5" }, "virt-column.nvim": { "branch": "master", "commit": "93b40ea038f676f5a72d7d1f2336fe7b051fc0ce" }, - "which-key.nvim": { "branch": "main", "commit": "5224c261825263f46f6771f1b644cae33cd06995" }, + "which-key.nvim": { "branch": "main", "commit": "fb027738340502b556c3f43051f113bcaa7e8e63" }, "windows.nvim": { "branch": "main", "commit": "c7492552b23d0ab30325e90b56066ec51242adc8" }, - "yanky.nvim": { "branch": "main", "commit": "c41e4c31990ae1f5f3517de8dc006e4da235a043" }, + "yanky.nvim": { "branch": "main", "commit": "c4c794afd762a00ca543972e5b9e34ce9aa14a87" }, "zen-mode.nvim": { "branch": "main", "commit": "4f2e70d75b7ece1c2a7c852664db492537078996" } } \ No newline at end of file diff --git a/lua/config/autocmds.lua b/lua/config/autocmds.lua index 072f584..b8d4dc0 100644 --- a/lua/config/autocmds.lua +++ b/lua/config/autocmds.lua @@ -47,8 +47,8 @@ vim.api.nvim_create_autocmd({ "FileType" }, { }) -- Set indent level for certain filetypes -vim.api.nvim_create_autocmd({ "FileType" }, { - pattern = { "lua", "query", "javascript", "typescript" }, +vim.api.nvim_create_autocmd({ "FileType", "BufRead" }, { + pattern = { "firrtl", "lua", "javascript", "typescript", "text", "query" }, callback = function() vim.bo.shiftwidth = 2 vim.bo.tabstop = 2 @@ -59,7 +59,9 @@ vim.api.nvim_create_autocmd({ "FileType" }, { -- Tree-Sitter highlighting for filetypes not autodetected vim.filetype.add({ - extension = {}, + extension = { + qmldir = "qmldir", + }, }) -- close dap-float with diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua index 3caf776..ca79e88 100644 --- a/lua/config/lazy.lua +++ b/lua/config/lazy.lua @@ -11,14 +11,15 @@ require("lazy").setup({ -- add LazyVim and import its plugins { "LazyVim/LazyVim", import = "lazyvim.plugins" }, -- import any extras modules here + -- { import = "lazyvim.plugins.extras.coding.copilot" }, { import = "lazyvim.plugins.extras.lang.typescript" }, { import = "lazyvim.plugins.extras.lang.json" }, { import = "lazyvim.plugins.extras.ui.mini-animate" }, -- import/override with your plugins { import = "plugins" }, + { import = "plugins.extras.coding.copilot" }, { import = "plugins.extras.dev.treesitter" }, { import = "plugins.extras.lang.clangd" }, - { import = "plugins.extras.lang.copilot" }, { import = "plugins.extras.lang.csharp" }, { import = "plugins.extras.lang.go" }, { import = "plugins.extras.lang.java" }, diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index d12be9a..2118522 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -87,14 +87,7 @@ return { end, }, { "projekt0n/github-nvim-theme", lazy = false }, - { - "rebelot/kanagawa.nvim", - lazy = false, - config = function() - local kanagawa = require("kanagawa") - kanagawa.setup() - end, - }, + { "rebelot/kanagawa.nvim", lazy = false, config = true }, { "Shatur/neovim-ayu", lazy = false }, { "shaunsingh/oxocarbon.nvim", lazy = false }, { "LunarVim/horizon.nvim", lazy = false }, @@ -103,14 +96,12 @@ return { "tokyonight.nvim", lazy = false, priority = 1000, - opts = function() + opts = function(_, opts) return { style = "moon", - -- transparent = true, - -- styles = { - -- sidebars = "transparent", - -- floats = "transparent", - -- }, + styles = { + keywords = { italic = false }, + }, sidebars = { "qf", "vista_kind", @@ -120,6 +111,8 @@ return { "startuptime", "Outline", }, + ---@param hl Highlights + ---@param c ColorScheme on_highlights = function(hl, c) hl.CursorLineNr = { fg = c.orange, bold = true } hl.LineNr = { fg = c.orange, bold = true } @@ -141,6 +134,13 @@ return { hl.TSRainbowGreen = { fg = c.green2 } hl.TSRainbowViolet = { fg = c.purple } hl.TSRainbowCyan = { fg = c.cyan } + + -- upcoming nvim-treesitter PR + hl["@string.documentation"] = { fg = c.yellow } + hl["@comment.documentation"] = { fg = "#636da6", italic = false, style = { italic = false } } + + -- Smali + hl["@parameter.builtin"] = { fg = "#efc890" } end, } end, diff --git a/lua/plugins/extras/lang/copilot.lua b/lua/plugins/extras/coding/copilot.lua similarity index 78% rename from lua/plugins/extras/lang/copilot.lua rename to lua/plugins/extras/coding/copilot.lua index 8cdfa1f..96ff544 100644 --- a/lua/plugins/extras/lang/copilot.lua +++ b/lua/plugins/extras/coding/copilot.lua @@ -4,11 +4,11 @@ return { { "zbirenbaum/copilot.lua", lazy = false, - config = true, + cmd = "Copilot", + build = ":Copilot auth", opts = { panel = { enabled = false }, suggestion = { auto_trigger = true }, - plugin_manager_path = vim.fn.stdpath("data") .. "/lazy", }, }, diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index ddabf3a..85be7af 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -56,7 +56,7 @@ return { dashboard.section.buttons.val = { dashboard.button("p", " " .. " Open project", "Telescope project display_type=full"), dashboard.button("e", " " .. " New file", "ene startinsert"), - dashboard.button("f", " " .. " Find file", "cd $HOME/Projects | Telescope find_files"), + dashboard.button("f", " " .. " Find file", "cd $HOME/projects | Telescope find_files"), dashboard.button("r", " " .. " Recent files", "Telescope oldfiles "), dashboard.button("s", "勒" .. " Restore Session", [[:lua require("persistence").load() ]]), dashboard.button("c", " " .. " Config", ":e $MYVIMRC | :cd %:p:h | Telescope file_browser"), @@ -147,7 +147,7 @@ return { event = "VeryLazy", opts = { themes = { - markdown = { colorscheme = "tokyonight-storm" }, + markdown = { colorscheme = "rose-pine" }, help = { colorscheme = "oxocarbon", background = "dark" }, }, },