Compare commits
No commits in common. "main" and "main_v4" have entirely different histories.
|
|
@ -1,3 +0,0 @@
|
||||||
{
|
|
||||||
"format.enable": false
|
|
||||||
}
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# AstroNvim Template
|
# AstroNvim Template
|
||||||
|
|
||||||
**NOTE:** This is for AstroNvim v5+
|
**NOTE:** This is for AstroNvim v4+
|
||||||
|
|
||||||
A template for getting started with [AstroNvim](https://github.com/AstroNvim/AstroNvim)
|
A template for getting started with [AstroNvim](https://github.com/AstroNvim/AstroNvim)
|
||||||
|
|
||||||
|
|
|
||||||
16
init.lua
16
init.lua
|
|
@ -1,18 +1,10 @@
|
||||||
-- This file simply bootstraps the installation of Lazy.nvim and then calls other files for execution
|
-- This file simply bootstraps the installation of Lazy.nvim and then calls other files for execution
|
||||||
-- This file doesn't necessarily need to be touched, BE CAUTIOUS editing this file and proceed at your own risk.
|
-- This file doesn't necessarily need to be touched, BE CAUTIOUS editing this file and proceed at your own risk.
|
||||||
local lazypath = vim.env.LAZY or vim.fn.stdpath "data" .. "/lazy/lazy.nvim"
|
local lazypath = vim.env.LAZY or vim.fn.stdpath "data" .. "/lazy/lazy.nvim"
|
||||||
|
|
||||||
if not (vim.env.LAZY or (vim.uv or vim.loop).fs_stat(lazypath)) then
|
if not (vim.env.LAZY or (vim.uv or vim.loop).fs_stat(lazypath)) then
|
||||||
-- stylua: ignore
|
-- stylua: ignore
|
||||||
local result = vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath })
|
vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath })
|
||||||
if vim.v.shell_error ~= 0 then
|
|
||||||
-- stylua: ignore
|
|
||||||
vim.api.nvim_echo({ { ("Error cloning lazy.nvim:\n%s\n"):format(result), "ErrorMsg" }, { "Press any key to exit...", "MoreMsg" } }, true, {})
|
|
||||||
vim.fn.getchar()
|
|
||||||
vim.cmd.quit()
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
vim.opt.rtp:prepend(lazypath)
|
vim.opt.rtp:prepend(lazypath)
|
||||||
|
|
||||||
-- validate that lazy is available
|
-- validate that lazy is available
|
||||||
|
|
@ -26,3 +18,9 @@ end
|
||||||
require "lazy_setup"
|
require "lazy_setup"
|
||||||
require "polish"
|
require "polish"
|
||||||
require "mappings"
|
require "mappings"
|
||||||
|
|
||||||
|
--vim.keymap.set('n', 'G', '<C-w>k')
|
||||||
|
--vim.keymap.set('n', 'R', '<C-w>j')
|
||||||
|
--vim.keymap.set('n', 'N', '<C-w>h')
|
||||||
|
--vim.keymap.set('n', 'T', '<C-w>l')
|
||||||
|
--vim.keymap.set('n', '<S-g>', function() print('test') end)
|
||||||
|
|
|
||||||
145
lazy-lock.json
145
lazy-lock.json
|
|
@ -1,78 +1,75 @@
|
||||||
{
|
{
|
||||||
"AstroNvim": { "branch": "main", "commit": "c399f7f46daa010db1b70f6f7062a6a85216e1de" },
|
"AstroNvim": { "branch": "main", "commit": "ed4a539a657b9fcdebf16b46fa1a7c949e9a1ee0" },
|
||||||
"LuaSnip": { "branch": "master", "commit": "642b0c595e11608b4c18219e93b88d7637af27bc" },
|
"Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
|
||||||
"actions-preview.nvim": { "branch": "master", "commit": "2b604b2e8e662c03b716436f6ffebcb19663e66a" },
|
"LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
|
||||||
"aerial.nvim": { "branch": "master", "commit": "645d108a5242ec7b378cbe643eb6d04d4223f034" },
|
"SchemaStore.nvim": { "branch": "main", "commit": "3c32d6a7bc56d56d4e3cc16fb21b59465a527aeb" },
|
||||||
"animation.nvim": { "branch": "main", "commit": "fb77091ab72ec9971aee0562e7081182527aaa6a" },
|
"aerial.nvim": { "branch": "master", "commit": "399e276328be8242ccde01d90f6f6c619f7bb24f" },
|
||||||
"astrocommunity": { "branch": "main", "commit": "39edda038177a8b8d4838536160cfbd006b540dc" },
|
"alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" },
|
||||||
"astrocore": { "branch": "main", "commit": "b061e0c185cd5fecbac7489151a98117ce799a47" },
|
"astrocommunity": { "branch": "main", "commit": "c547c9ea8fa19ab2f1792febb3d20e6ff6851a02" },
|
||||||
"astrolsp": { "branch": "main", "commit": "ebc1676127b3bfbd46e3e26589b104853cac3730" },
|
"astrocore": { "branch": "main", "commit": "409ae29758ae0226b60e486ac80faa703f0b7955" },
|
||||||
"astrotheme": { "branch": "main", "commit": "cf0e65a7b3ce2f830b052f4da937729eee1e7a7d" },
|
"astrolsp": { "branch": "main", "commit": "9e4eeb51ff04d9985f195b28553dbd47807e4c49" },
|
||||||
"astroui": { "branch": "main", "commit": "920dd5df6629a9076a11ea10f0d21f4225203585" },
|
"astrotheme": { "branch": "main", "commit": "7e47b7900229365bc0dca2a2eee2acc62dfc9dc3" },
|
||||||
"better-escape.nvim": { "branch": "master", "commit": "199dcc2643dec5d8dbdab4ec672cf405224dcb3b" },
|
"astroui": { "branch": "main", "commit": "9be4e9c7006bde2c1efd4cfcc7b57ca3ae3ea708" },
|
||||||
"blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" },
|
"better-escape.nvim": { "branch": "master", "commit": "7e86edafb8c7e73699e0320f225464a298b96d12" },
|
||||||
"blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" },
|
"catppuccin": { "branch": "main", "commit": "d97387aea8264f484bb5d5e74f2182a06c83e0d8" },
|
||||||
"catppuccin": { "branch": "main", "commit": "426dbebe06b5c69fd846ceb17b42e12f890aedf1" },
|
"clangd_extensions.nvim": { "branch": "main", "commit": "430a8f56605cb1d0ed9876301d6e9bf675195e16" },
|
||||||
"clangd_extensions.nvim": { "branch": "main", "commit": "872893cb061044a4cc7ced59c0f2fe2d70db4382" },
|
"cmake-tools.nvim": { "branch": "master", "commit": "b221c5973ca520b0f079e16cd9919a8d944f7890" },
|
||||||
"cmake-tools.nvim": { "branch": "master", "commit": "bac6ba2354a52c61f731c751cdb0f4e24669bf0d" },
|
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
||||||
"cmp-dap": { "branch": "master", "commit": "ea92773e84c0ad3288c3bc5e452ac91559669087" },
|
"cmp-dap": { "branch": "master", "commit": "ea92773e84c0ad3288c3bc5e452ac91559669087" },
|
||||||
"codecompanion.nvim": { "branch": "main", "commit": "fe792b30974893d8809b06c5e31c5c876c14bbc7" },
|
"cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
|
||||||
"crates.nvim": { "branch": "main", "commit": "0f536967abd097d9a4275087483f15d012418740" },
|
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
||||||
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
|
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
|
||||||
"friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
|
"copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" },
|
||||||
"garbage-day.nvim": { "branch": "main", "commit": "2fcc56556281de8ee871a5f3beb9db7ab747ef32" },
|
"crates.nvim": { "branch": "main", "commit": "d556c00d60c9421c913ee54ff690df2a34f6264e" },
|
||||||
"gitsigns.nvim": { "branch": "main", "commit": "a462f416e2ce4744531c6256252dee99a7d34a83" },
|
"deno-nvim": { "branch": "master", "commit": "4bc9b5db13e8152b01aed51ce0451cdd38ca6743" },
|
||||||
"guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" },
|
"dressing.nvim": { "branch": "master", "commit": "42d767b04c50a6966c9633e3968bc65c0c2f2bfc" },
|
||||||
"heirline.nvim": { "branch": "master", "commit": "fae936abb5e0345b85c3a03ecf38525b0828b992" },
|
"friendly-snippets": { "branch": "main", "commit": "3e9a3f5a0cfcef1741e352c37bda4e82e5eb846a" },
|
||||||
"homeassistant-nvim": { "branch": "main", "commit": "1484ec0ad211eaeefa977444e3c6d0987b20a349" },
|
"gitsigns.nvim": { "branch": "main", "commit": "76927d14d3fbd4ba06ccb5246e79d93b5442c188" },
|
||||||
"hover.nvim": { "branch": "main", "commit": "e73c00da3a9c87a21d2a8ddf7ab4a39824bd5d56" },
|
"guess-indent.nvim": { "branch": "main", "commit": "b8ae749fce17aa4c267eec80a6984130b94f80b2" },
|
||||||
"image.nvim": { "branch": "master", "commit": "da2be65c153ba15a14a342b05591652a6df70d58" },
|
"heirline.nvim": { "branch": "master", "commit": "03cff30d7e7d3ba6fdc00925f015822f79cef908" },
|
||||||
"lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
|
"indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
|
||||||
"lazydev.nvim": { "branch": "main", "commit": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d" },
|
"lazy.nvim": { "branch": "main", "commit": "758bb5de98b805acc5eeed8cdc8ac7f0bc4b0b86" },
|
||||||
"lsp-lens.nvim": { "branch": "main", "commit": "48bb1a7e271424c15f3d588d54adc9b7c319d977" },
|
"lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
|
||||||
"lsp_signature.nvim": { "branch": "master", "commit": "a65b38f260cc3470a05b4afb84c8d868617d476d" },
|
"mason-lspconfig.nvim": { "branch": "main", "commit": "9ae570e206360e47d30b4c35a4550c165f4ea7b7" },
|
||||||
"lualine.nvim": { "branch": "master", "commit": "f5d2a8570f8b736ddb9bb4be504355bcd6e15ec8" },
|
|
||||||
"magick": { "branch": "master", "commit": "6971fa700c4d392130492a3925344b51c7cc54aa" },
|
|
||||||
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
|
|
||||||
"markview.nvim": { "branch": "main", "commit": "1861f959599ae03cfd59f56222a542035b0cd947" },
|
|
||||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "25f609e7fca78af7cede4f9fa3af8a94b1c4950b" },
|
|
||||||
"mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" },
|
"mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" },
|
||||||
"mason-nvim-dap.nvim": { "branch": "main", "commit": "e51f9b259f066c4347f9a79ffde54c29a0619384" },
|
"mason-nvim-dap.nvim": { "branch": "main", "commit": "3614a39aae98ccd34124b072939d6283853b3dd2" },
|
||||||
"mason-tool-installer.nvim": { "branch": "main", "commit": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc" },
|
"mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
|
||||||
"mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
|
"mini.bufremove": { "branch": "main", "commit": "931a3bb514147d9e812767275c4beba6b779b1d3" },
|
||||||
"middleclass": { "branch": "master", "commit": "9fab4d5bca67262614960960ca35c4740eb2be2c" },
|
"neo-tree.nvim": { "branch": "main", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" },
|
||||||
"mini.icons": { "branch": "main", "commit": "ff2e4f1d29f659cc2bad0f9256f2f6195c6b2428" },
|
"neoconf.nvim": { "branch": "main", "commit": "f8947e998dac4213f6c7bb1c7b843cba64db22dd" },
|
||||||
"mini.indentscope": { "branch": "main", "commit": "e0601f75aa5137a5a13bb92a988c9a300f5bd3de" },
|
"neodev.nvim": { "branch": "main", "commit": "da1562e1e3df0e994ddc52cb4ba22376a5d7f2fc" },
|
||||||
"neo-tree.nvim": { "branch": "main", "commit": "84c75e7a7e443586f60508d12fc50f90d9aee14e" },
|
"none-ls.nvim": { "branch": "main", "commit": "f5632db2491fbe02b54f1a321a98548a8ba2bd15" },
|
||||||
"none-ls.nvim": { "branch": "main", "commit": "7f9301e416533b5d74e2fb3b1ce5059eeaed748b" },
|
"nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" },
|
||||||
"nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" },
|
"nvim-autopairs": { "branch": "master", "commit": "14e97371b2aab6ee70054c1070a123dfaa3e217e" },
|
||||||
"nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
|
"nvim-cmp": { "branch": "main", "commit": "24122371810089d390847d8ba66325c1f1aa64c0" },
|
||||||
"nvim-dap": { "branch": "master", "commit": "45a69eba683a2c448dd9ecfc4de89511f0646b5f" },
|
"nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" },
|
||||||
"nvim-dap-python": { "branch": "master", "commit": "1808458eba2b18f178f990e01376941a42c7f93b" },
|
"nvim-dap": { "branch": "master", "commit": "9d81c11fd185a131f81841e64941859305f6c42d" },
|
||||||
"nvim-dap-ui": { "branch": "master", "commit": "1a66cabaa4a4da0be107d5eda6d57242f0fe7e49" },
|
"nvim-dap-python": { "branch": "master", "commit": "3dffa58541d1f52c121fe58ced046268c838d802" },
|
||||||
"nvim-highlight-colors": { "branch": "main", "commit": "e2cb22089cc2358b2b995c09578224f142de6039" },
|
"nvim-dap-ui": { "branch": "master", "commit": "5934302d63d1ede12c0b22b6f23518bb183fc972" },
|
||||||
"nvim-lsp-file-operations": { "branch": "master", "commit": "b9c795d3973e8eec22706af14959bc60c579e771" },
|
"nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" },
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "0203a9608d63eda57679b01e69f33a7b4c34b0d1" },
|
"nvim-lspconfig": { "branch": "master", "commit": "94513a5b246cf32a8f87ca714af50911df63351c" },
|
||||||
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
|
"nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" },
|
||||||
"nvim-treesitter": { "branch": "main", "commit": "90cd6580e720caedacb91fdd587b747a6e77d61f" },
|
"nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
|
||||||
"nvim-treesitter-textobjects": { "branch": "main", "commit": "851e865342e5a4cb1ae23d31caf6e991e1c99f1e" },
|
"nvim-treesitter": { "branch": "master", "commit": "d5a1c2b0c8ec5bb377a41c1c414b315d6b3e9432" },
|
||||||
"nvim-ts-autotag": { "branch": "main", "commit": "8e1c0a389f20bf7f5b0dd0e00306c1247bda2595" },
|
"nvim-treesitter-textobjects": { "branch": "master", "commit": "dfa4178c0cadb44f687603d72ad0908474c28dd9" },
|
||||||
"nvim-vtsls": { "branch": "main", "commit": "0b5f73c9e50ce95842ea07bb3f05c7d66d87d14a" },
|
"nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
|
||||||
"nvim-window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" },
|
"nvim-ts-context-commentstring": { "branch": "main", "commit": "0bdccb9c67a42a5e2d99384dc9bfa29b1451528f" },
|
||||||
"package-info.nvim": { "branch": "master", "commit": "52e407af634cd5d3add0dc916c517865850113a4" },
|
"nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" },
|
||||||
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
|
"nvim-web-devicons": { "branch": "master", "commit": "e37bb1feee9e7320c76050a55443fa843b4b6f83" },
|
||||||
"remote-sshfs.nvim": { "branch": "main", "commit": "7a12a1677bbe96ca98f0c713448ac1f518ba09b7" },
|
"nvim-window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" },
|
||||||
"resession.nvim": { "branch": "master", "commit": "cc819b0489938d03e4f3532a583354f0287c015b" },
|
"package-info.nvim": { "branch": "master", "commit": "45acce5b12ce824332d8000cc2c91805b6710446" },
|
||||||
"rustaceanvim": { "branch": "main", "commit": "7b8dd7abb9a7f442b356aa03714aefce09610339" },
|
"plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
|
||||||
"rustowl": { "branch": "main", "commit": "aaf7d15cc55ff6f48c577cdd6352d51fbc031aea" },
|
"promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" },
|
||||||
"smart-splits.nvim": { "branch": "master", "commit": "0bd02161ee5c5378bf4133fcedf53d1fc4179e1d" },
|
"resession.nvim": { "branch": "master", "commit": "dc8825439c619030925543a444c4186a2487c200" },
|
||||||
"snacks.nvim": { "branch": "main", "commit": "e6fd58c82f2f3fcddd3fe81703d47d6d48fc7b9f" },
|
"rustaceanvim": { "branch": "master", "commit": "1c3d3a75bebcb16df2a093b147ba498185e4ab17" },
|
||||||
"telescope.nvim": { "branch": "master", "commit": "48d2656e54d3e3953ae647153ccdaffa50d4d76b" },
|
"smart-splits.nvim": { "branch": "master", "commit": "2179ec0d26aacd4f40c766c79f6ebc83b7001e48" },
|
||||||
"todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
|
"telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
|
||||||
"toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
|
"telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" },
|
||||||
"ts-comments.nvim": { "branch": "main", "commit": "123a9fb12e7229342f807ec9e6de478b1102b041" },
|
"todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" },
|
||||||
"tsc.nvim": { "branch": "main", "commit": "e083bcf1e54bc3af7df92b33235efb334e8c782c" },
|
"toggleterm.nvim": { "branch": "main", "commit": "066cccf48a43553a80a210eb3be89a15d789d6e6" },
|
||||||
"which-key.nvim": { "branch": "main", "commit": "fcbf4eea17cb299c02557d576f0d568878e354a4" },
|
"tsc.nvim": { "branch": "main", "commit": "06734767eee606ebaa0a4645e0fd801c64e6aa7a" },
|
||||||
"windows.nvim": { "branch": "main", "commit": "c7492552b23d0ab30325e90b56066ec51242adc8" },
|
"typescript-tools.nvim": { "branch": "master", "commit": "c43d9580c3ff5999a1eabca849f807ab33787ea7" },
|
||||||
"yazi.nvim": { "branch": "main", "commit": "172bd64a4c2d3adbe2e0ef56289f47ffe139ca55" }
|
"venv-selector.nvim": { "branch": "main", "commit": "6a1b15eb35bbb827b6db428055087e2dbf32838f" },
|
||||||
|
"vim-illuminate": { "branch": "master", "commit": "e522e0dd742a83506db0a72e1ced68c9c130f185" },
|
||||||
|
"which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" }
|
||||||
}
|
}
|
||||||
|
|
@ -7,70 +7,17 @@
|
||||||
---@type LazySpec
|
---@type LazySpec
|
||||||
return {
|
return {
|
||||||
"AstroNvim/astrocommunity",
|
"AstroNvim/astrocommunity",
|
||||||
version = "^20",
|
|
||||||
{ import = "astrocommunity.pack.lua" },
|
{ import = "astrocommunity.pack.lua" },
|
||||||
{ import = "astrocommunity.pack.rust" },
|
{ import = "astrocommunity.pack.rust" },
|
||||||
{ import = "astrocommunity.pack.python" },
|
{ import = "astrocommunity.pack.python" },
|
||||||
{ import = "astrocommunity.pack.vue" },
|
{ import = "astrocommunity.pack.vue" },
|
||||||
-- { import = "astrocommunity.pack.typescript-all-in-one" },
|
{ import = "astrocommunity.pack.typescript-all-in-one" },
|
||||||
{ import = "astrocommunity.pack.typescript" },
|
|
||||||
{ import = "astrocommunity.pack.cpp" },
|
{ import = "astrocommunity.pack.cpp" },
|
||||||
-- import/override with your plugins folder
|
-- import/override with your plugins folder
|
||||||
{
|
{
|
||||||
import = "astrocommunity.colorscheme.catppuccin",
|
import = "astrocommunity.colorscheme.catppuccin",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
import = "astrocommunity.markdown-and-latex.markdown-preview-nvim",
|
import = "astrocommunity.completion.copilot-lua",
|
||||||
},
|
|
||||||
-- {
|
|
||||||
-- import = "astrocommunity.completion.copilot-lua",
|
|
||||||
-- },
|
|
||||||
{
|
|
||||||
import = "astrocommunity.ai.codecompanion-nvim",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
import = "astrocommunity.file-explorer.yazi-nvim",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
import = "astrocommunity.bars-and-lines.lualine-nvim",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
import = "astrocommunity.utility.hover-nvim",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
import = "astrocommunity.split-and-window.windows-nvim",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
import = "astrocommunity.lsp.lsp-lens-nvim",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
import = "astrocommunity.lsp.lsp-signature-nvim",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
import = "astrocommunity.lsp.actions-preview-nvim",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
import = "astrocommunity.lsp.garbage-day-nvim",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
import = "astrocommunity.indent.mini-indentscope",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
import = "astrocommunity.indent.snacks-indent-hlchunk",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
import = "astrocommunity.markdown-and-latex.markview-nvim",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
import = "astrocommunity.media.image-nvim",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
import = "astrocommunity.editing-support.rustowl",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
import = "astrocommunity.git.diffview-nvim",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
import = "astrocommunity.comment.ts-comments-nvim",
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,22 +1,20 @@
|
||||||
require("lazy").setup({
|
require("lazy").setup({
|
||||||
{
|
{
|
||||||
"AstroNvim/AstroNvim",
|
"AstroNvim/AstroNvim",
|
||||||
version = "^6", -- Remove version tracking to elect for nightly AstroNvim
|
version = "^4", -- Remove version tracking to elect for nighly AstroNvim
|
||||||
import = "astronvim.plugins",
|
import = "astronvim.plugins",
|
||||||
opts = { -- AstroNvim options must be set here with the `import` key
|
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
|
mapleader = " ", -- This ensures the leader key must be configured before Lazy is set up
|
||||||
maplocalleader = ",", -- This ensures the localleader key must be configured before Lazy is set up
|
maplocalleader = ",", -- This ensures the localleader key must be configured before Lazy is set up
|
||||||
icons_enabled = true, -- Set to false to disable icons (if no Nerd Font is available)
|
icons_enabled = true, -- Set to false to disable icons (if no Nerd Font is available)
|
||||||
pin_plugins = nil, -- Default will pin plugins when tracking `version` of AstroNvim, set to true/false to override
|
pin_plugins = nil, -- Default will pin plugins when tracking `version` of AstroNvim, set to true/false to override
|
||||||
update_notifications = true, -- Enable/disable notification about running `:Lazy update` twice to update pinned plugins
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{ import = "community" },
|
{ import = "community" },
|
||||||
{ import = "plugins" },
|
{ import = "plugins" },
|
||||||
} --[[@as LazySpec]], {
|
} --[[@as LazySpec]], {
|
||||||
-- Configure any other `lazy.nvim` configuration options here
|
-- Configure any other `lazy.nvim` configuration options here
|
||||||
-- install = { colorscheme = { "astrotheme", "habamax" } },
|
install = { colorscheme = { "astrodark", "habamax" } },
|
||||||
-- install = { colorscheme = { "catppuccin", "latte" } },
|
|
||||||
ui = { backdrop = 100 },
|
ui = { backdrop = 100 },
|
||||||
performance = {
|
performance = {
|
||||||
rtp = {
|
rtp = {
|
||||||
|
|
@ -31,3 +29,9 @@ require("lazy").setup({
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
} --[[@as LazyConfig]])
|
} --[[@as LazyConfig]])
|
||||||
|
|
||||||
|
--vim.keymap.set('n', 'G', '<C-w>k')
|
||||||
|
--vim.keymap.set('n', 'R', '<C-w>j')
|
||||||
|
--vim.keymap.set('n', 'N', '<C-w>h')
|
||||||
|
--vim.keymap.set('n', 'T', '<C-w>l')
|
||||||
|
vim.keymap.set("n", "<S-g>", function() print "test" end)
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,16 @@
|
||||||
|
--vim.keymap.del("n", "<S-g>")
|
||||||
|
--vim.keymap.del("n", "<S-r>")
|
||||||
|
--vim.keymap.del("n", "<S-n>")
|
||||||
|
--vim.keymap.del("n", "<S-t>")
|
||||||
|
|
||||||
|
-- vim.keymap.set("n", "<S-g>", "<C-w>k")
|
||||||
|
-- vim.keymap.set("n", "<S-r>", "<C-w>j")
|
||||||
|
-- vim.keymap.set("n", "<S-n>", "<C-w>h")
|
||||||
|
-- vim.keymap.set("n", "<S-t>", "<C-w>l")
|
||||||
|
-- vim.keymap.set("n", "<S-g>", function() print "g" end)
|
||||||
|
-- vim.keymap.set("n", "<S-r>", function() print "r" end)
|
||||||
|
-- vim.keymap.set("n", "<S-n>", function() print "n" end)
|
||||||
|
-- vim.keymap.set("n", "<S-t>", function() print "t" end)
|
||||||
vim.keymap.set("n", "<S-g>", "<cmd>:wincmd k<cr>")
|
vim.keymap.set("n", "<S-g>", "<cmd>:wincmd k<cr>")
|
||||||
vim.keymap.set("n", "<S-r>", "<cmd>:wincmd j<cr>")
|
vim.keymap.set("n", "<S-r>", "<cmd>:wincmd j<cr>")
|
||||||
vim.keymap.set("n", "<S-n>", "<cmd>:wincmd h<cr>")
|
vim.keymap.set("n", "<S-n>", "<cmd>:wincmd h<cr>")
|
||||||
|
|
|
||||||
|
|
@ -1,38 +0,0 @@
|
||||||
return {
|
|
||||||
"actions-preview.nvim",
|
|
||||||
opts = function(_, opts)
|
|
||||||
local hl = require "actions-preview.highlight"
|
|
||||||
|
|
||||||
-- opts.diff = opts.diff or {}
|
|
||||||
-- opts.diff.ctxlen = 3
|
|
||||||
opts.highlight_command = {
|
|
||||||
hl.delta "/usr/bin/delta --no-gitconfig --side-by-side",
|
|
||||||
}
|
|
||||||
opts.backend = { "snacks" }
|
|
||||||
-- opts.telescope = opts.telescope or {}
|
|
||||||
opts.telescope = {
|
|
||||||
sorting_strategy = "ascending",
|
|
||||||
layout_strategy = "vertical",
|
|
||||||
layout_config = {
|
|
||||||
width = 0.8,
|
|
||||||
height = 0.9,
|
|
||||||
prompt_position = "top",
|
|
||||||
preview_cutoff = 20,
|
|
||||||
preview_height = function(_, _, max_lines) return max_lines - 15 end,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
---@type snacks.picker.Config
|
|
||||||
opts.snacks = {
|
|
||||||
layout = {
|
|
||||||
preset = "vertical",
|
|
||||||
-- assert -- backdrop = false,
|
|
||||||
-- -- width = 0.8,
|
|
||||||
-- -- height = 0.9,
|
|
||||||
-- { win = "input", height = 1, border = "rounded" },
|
|
||||||
-- { win = "list", border = "rounded" },
|
|
||||||
-- { win = "preview", title = "{preview}", border = "rounded", grow = true },
|
|
||||||
},
|
|
||||||
}
|
|
||||||
return opts
|
|
||||||
end,
|
|
||||||
}
|
|
||||||
|
|
@ -12,10 +12,10 @@ return {
|
||||||
opts = {
|
opts = {
|
||||||
-- Configure core features of AstroNvim
|
-- Configure core features of AstroNvim
|
||||||
features = {
|
features = {
|
||||||
large_buf = { size = 1024 * 256, lines = 10000 }, -- set global limits for large files for disabling features like treesitter
|
large_buf = { size = 1024 * 500, lines = 10000 }, -- set global limits for large files for disabling features like treesitter
|
||||||
autopairs = true, -- enable autopairs at start
|
autopairs = true, -- enable autopairs at start
|
||||||
cmp = true, -- enable completion at start
|
cmp = true, -- enable completion at start
|
||||||
diagnostics = { virtual_text = true, virtual_lines = false }, -- diagnostic settings on startup
|
diagnostics_mode = 3, -- diagnostic mode on start (0 = off, 1 = no signs/virtual text, 2 = no virtual text, 3 = on)
|
||||||
highlighturl = true, -- highlight URLs at start
|
highlighturl = true, -- highlight URLs at start
|
||||||
notifications = true, -- enable notifications at start
|
notifications = true, -- enable notifications at start
|
||||||
},
|
},
|
||||||
|
|
@ -24,26 +24,13 @@ return {
|
||||||
virtual_text = true,
|
virtual_text = true,
|
||||||
underline = true,
|
underline = true,
|
||||||
},
|
},
|
||||||
-- passed to `vim.filetype.add`
|
|
||||||
filetypes = {
|
|
||||||
-- see `:h vim.filetype.add` for usage
|
|
||||||
extension = {
|
|
||||||
foo = "fooscript",
|
|
||||||
},
|
|
||||||
filename = {
|
|
||||||
[".foorc"] = "fooscript",
|
|
||||||
},
|
|
||||||
pattern = {
|
|
||||||
[".*/etc/foo/.*"] = "fooscript",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
-- vim options can be configured here
|
-- vim options can be configured here
|
||||||
options = {
|
options = {
|
||||||
opt = { -- vim.opt.<key>
|
opt = { -- vim.opt.<key>
|
||||||
relativenumber = true, -- sets vim.opt.relativenumber
|
relativenumber = true, -- sets vim.opt.relativenumber
|
||||||
number = true, -- sets vim.opt.number
|
number = true, -- sets vim.opt.number
|
||||||
spell = false, -- sets vim.opt.spell
|
spell = false, -- sets vim.opt.spell
|
||||||
signcolumn = "yes", -- sets vim.opt.signcolumn to yes
|
signcolumn = "auto", -- sets vim.opt.signcolumn to auto
|
||||||
wrap = false, -- sets vim.opt.wrap
|
wrap = false, -- sets vim.opt.wrap
|
||||||
},
|
},
|
||||||
g = { -- vim.g.<key>
|
g = { -- vim.g.<key>
|
||||||
|
|
@ -59,29 +46,33 @@ return {
|
||||||
n = {
|
n = {
|
||||||
-- second key is the lefthand side of the map
|
-- second key is the lefthand side of the map
|
||||||
|
|
||||||
-- navigate buffer tabs
|
-- navigate buffer tabs with `H` and `L`
|
||||||
["]b"] = { function() require("astrocore.buffer").nav(vim.v.count1) end, desc = "Next buffer" },
|
L = { function() require("astrocore.buffer").nav(vim.v.count1) end, desc = "Next buffer" },
|
||||||
["[b"] = { function() require("astrocore.buffer").nav(-vim.v.count1) end, desc = "Previous buffer" },
|
H = { function() require("astrocore.buffer").nav(-vim.v.count1) end, desc = "Previous buffer" },
|
||||||
|
|
||||||
-- mappings seen under group name "Buffer"
|
-- mappings seen under group name "Buffer"
|
||||||
["<Leader>bd"] = {
|
["<Leader>bD"] = {
|
||||||
function()
|
function()
|
||||||
require("astroui.status.heirline").buffer_picker(
|
require("astroui.status.heirline").buffer_picker(
|
||||||
)
|
function(bufnr) require("astrocore.buffer").close(bufnr) end
|
||||||
|
)
|
||||||
end,
|
end,
|
||||||
desc = "Close buffer from tabline",
|
desc = "Pick to close",
|
||||||
},
|
},
|
||||||
|
|
||||||
-- tables with just a `desc` key will be registered with which-key if it's installed
|
-- tables with just a `desc` key will be registered with which-key if it's installed
|
||||||
-- this is useful for naming menus
|
-- this is useful for naming menus
|
||||||
["<Leader>b"] = { desc = "Buffers" },
|
["<Leader>b"] = { desc = "Buffers" },
|
||||||
|
-- quick save
|
||||||
|
-- ["<C-s>"] = { ":w!<cr>", desc = "Save File" }, -- change description but the same command
|
||||||
|
--
|
||||||
["<S-g>"] = { "<C-w>k" },
|
["<S-g>"] = { "<C-w>k" },
|
||||||
["<S-r>"] = { "<C-w>j" },
|
["<S-r>"] = { "<C-w>j" },
|
||||||
["<S-n>"] = { "<C-w>h" },
|
["<S-n>"] = { "<C-w>h" },
|
||||||
["<S-t>"] = { "<C-w>l" },
|
["<S-t>"] = { "<C-w>l" },
|
||||||
|
},
|
||||||
|
t = {
|
||||||
-- setting a mapping to false will disable it
|
-- setting a mapping to false will disable it
|
||||||
-- ["<C-S>"] = false,
|
-- ["<esc>"] = false,
|
||||||
},
|
},
|
||||||
v = {
|
v = {
|
||||||
["<S-up>"] = { ":m '<-2<CR>gv=gv'" },
|
["<S-up>"] = { ":m '<-2<CR>gv=gv'" },
|
||||||
|
|
|
||||||
|
|
@ -10,9 +10,14 @@ return {
|
||||||
"AstroNvim/astrolsp",
|
"AstroNvim/astrolsp",
|
||||||
---@type AstroLSPOpts
|
---@type AstroLSPOpts
|
||||||
opts = {
|
opts = {
|
||||||
|
-- Configuration table of features provided by AstroLSP
|
||||||
features = {
|
features = {
|
||||||
semantic_tokens = true,
|
autoformat = true, -- enable or disable auto formatting on start
|
||||||
|
codelens = true, -- enable/disable codelens refresh on start
|
||||||
|
inlay_hints = false, -- enable/disable inlay hints on start
|
||||||
|
semantic_tokens = true, -- enable/disable semantic token highlighting
|
||||||
},
|
},
|
||||||
|
-- customize lsp formatting options
|
||||||
formatting = {
|
formatting = {
|
||||||
-- control auto formatting on save
|
-- control auto formatting on save
|
||||||
format_on_save = {
|
format_on_save = {
|
||||||
|
|
@ -27,8 +32,6 @@ return {
|
||||||
disabled = { -- disable formatting capabilities for the listed language servers
|
disabled = { -- disable formatting capabilities for the listed language servers
|
||||||
-- disable lua_ls formatting capability if you want to use StyLua to format your lua code
|
-- disable lua_ls formatting capability if you want to use StyLua to format your lua code
|
||||||
-- "lua_ls",
|
-- "lua_ls",
|
||||||
"volar",
|
|
||||||
"vtsls",
|
|
||||||
},
|
},
|
||||||
timeout_ms = 1000, -- default format timeout
|
timeout_ms = 1000, -- default format timeout
|
||||||
-- filter = function(client) -- fully override the default formatting function
|
-- filter = function(client) -- fully override the default formatting function
|
||||||
|
|
@ -39,61 +42,64 @@ return {
|
||||||
servers = {
|
servers = {
|
||||||
-- "pyright"
|
-- "pyright"
|
||||||
},
|
},
|
||||||
-- customize language server configuration passed to `vim.lsp.config`
|
-- customize language server configuration options passed to `lspconfig`
|
||||||
-- client specific configuration can also go in `lsp/` in your configuration root (see `:h lsp-config`)
|
---@diagnostic disable: missing-fields
|
||||||
config = {
|
config = {
|
||||||
-- ["*"] = { capabilities = {} }, -- modify default LSP client settings such as capabilities
|
-- clangd = { capabilities = { offsetEncoding = "utf-8" } },
|
||||||
},
|
},
|
||||||
-- customize how language servers are attached
|
-- customize how language servers are attached
|
||||||
handlers = {
|
handlers = {
|
||||||
-- a function with the key `*` modifies the default handler, functions takes the server name as the parameter
|
-- a function without a key is simply the default handler, functions take two parameters, the server name and the configured options table for that server
|
||||||
-- ["*"] = function(server) vim.lsp.enable(server) end
|
-- function(server, opts) require("lspconfig")[server].setup(opts) end
|
||||||
|
|
||||||
-- the key is the server that is being setup with `vim.lsp.config`
|
-- the key is the server that is being setup with `lspconfig`
|
||||||
-- rust_analyzer = false, -- setting a handler to false will disable the set up of that language server
|
-- rust_analyzer = false, -- setting a handler to false will disable the set up of that language server
|
||||||
|
-- pyright = function(_, opts) require("lspconfig").pyright.setup(opts) end -- or a custom handler function can be passed
|
||||||
},
|
},
|
||||||
-- Configure buffer local auto commands to add when attaching a language server
|
-- Configure buffer local auto commands to add when attaching a language server
|
||||||
autocmds = {
|
autocmds = {
|
||||||
-- first key is the `augroup` to add the auto commands to (:h augroup)
|
-- first key is the `augroup` to add the auto commands to (:h augroup)
|
||||||
lsp_codelens_refresh = {
|
lsp_document_highlight = {
|
||||||
-- Optional condition to create/delete auto command group
|
-- Optional condition to create/delete auto command group
|
||||||
-- can either be a string of a client capability or a function of `fun(client, bufnr): boolean`
|
-- can either be a string of a client capability or a function of `fun(client, bufnr): boolean`
|
||||||
-- condition will be resolved for each client on each execution and if it ever fails for all clients,
|
-- condition will be resolved for each client on each execution and if it ever fails for all clients,
|
||||||
-- the auto commands will be deleted for that buffer
|
-- the auto commands will be deleted for that buffer
|
||||||
cond = "textDocument/codeLens",
|
cond = "textDocument/documentHighlight",
|
||||||
-- cond = function(client, bufnr) return client.name == "lua_ls" end,
|
-- cond = function(client, bufnr) return client.name == "lua_ls" end,
|
||||||
-- list of auto commands to set
|
-- list of auto commands to set
|
||||||
{
|
{
|
||||||
-- events to trigger
|
-- events to trigger
|
||||||
event = { "InsertLeave", "BufEnter" },
|
event = { "CursorHold", "CursorHoldI" },
|
||||||
-- the rest of the autocmd options (:h nvim_create_autocmd)
|
-- the rest of the autocmd options (:h nvim_create_autocmd)
|
||||||
desc = "Refresh codelens (buffer)",
|
desc = "Document Highlighting",
|
||||||
callback = function(args)
|
callback = function() vim.lsp.buf.document_highlight() end,
|
||||||
if require("astrolsp").config.features.codelens then vim.lsp.codelens.refresh { bufnr = args.buf } end
|
},
|
||||||
end,
|
{
|
||||||
|
event = { "CursorMoved", "CursorMovedI", "BufLeave" },
|
||||||
|
desc = "Document Highlighting Clear",
|
||||||
|
callback = function() vim.lsp.buf.clear_references() end,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
-- mappings to be set up on attaching of a language server
|
-- mappings to be set up on attaching of a language server
|
||||||
mappings = {
|
mappings = {
|
||||||
n = {
|
n = {
|
||||||
|
gl = { function() vim.diagnostic.open_float() end, desc = "Hover diagnostics" },
|
||||||
-- a `cond` key can provided as the string of a server capability to be required to attach, or a function with `client` and `bufnr` parameters from the `on_attach` that returns a boolean
|
-- a `cond` key can provided as the string of a server capability to be required to attach, or a function with `client` and `bufnr` parameters from the `on_attach` that returns a boolean
|
||||||
gD = {
|
-- gD = {
|
||||||
function() vim.lsp.buf.declaration() end,
|
-- function() vim.lsp.buf.declaration() end,
|
||||||
desc = "Declaration of current symbol",
|
-- desc = "Declaration of current symbol",
|
||||||
cond = "textDocument/declaration",
|
-- cond = "textDocument/declaration",
|
||||||
},
|
-- },
|
||||||
["<Leader>uY"] = {
|
-- ["<Leader>uY"] = {
|
||||||
function() require("astrolsp.toggles").buffer_semantic_tokens() end,
|
-- function() require("astrolsp.toggles").buffer_semantic_tokens() end,
|
||||||
desc = "Toggle LSP semantic highlight (buffer)",
|
-- desc = "Toggle LSP semantic highlight (buffer)",
|
||||||
cond = function(client)
|
-- cond = function(client) return client.server_capabilities.semanticTokensProvider and vim.lsp.semantic_tokens end,
|
||||||
return client.supports_method "textDocument/semanticTokens/full" and vim.lsp.semantic_tokens ~= nil
|
-- }
|
||||||
end,
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
-- A custom `on_attach` function to be run after the default `on_attach` function
|
-- A custom `on_attach` function to be run after the default `on_attach` function
|
||||||
-- takes two parameters `client` and `bufnr` (`:h lsp-attach`)
|
-- takes two parameters `client` and `bufnr` (`:h lspconfig-setup`)
|
||||||
on_attach = function(client, bufnr)
|
on_attach = function(client, bufnr)
|
||||||
-- this would disable semanticTokensProvider for all clients
|
-- this would disable semanticTokensProvider for all clients
|
||||||
-- client.server_capabilities.semanticTokensProvider = nil
|
-- client.server_capabilities.semanticTokensProvider = nil
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
--if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
|
||||||
|
|
||||||
-- AstroUI provides the basis for configuring the AstroNvim User Interface
|
-- AstroUI provides the basis for configuring the AstroNvim User Interface
|
||||||
-- Configuration documentation can be found with `:h astroui`
|
-- Configuration documentation can be found with `:h astroui`
|
||||||
-- NOTE: We highly recommend setting up the Lua Language Server (`:LspInstall lua_ls`)
|
-- NOTE: We highly recommend setting up the Lua Language Server (`:LspInstall lua_ls`)
|
||||||
|
|
@ -9,13 +11,13 @@ return {
|
||||||
---@type AstroUIOpts
|
---@type AstroUIOpts
|
||||||
opts = {
|
opts = {
|
||||||
-- change colorscheme
|
-- change colorscheme
|
||||||
colorscheme = "catppuccin",
|
colorscheme = "catppuccin-macchiato",
|
||||||
-- AstroUI allows you to easily modify highlight groups easily for any and all colorschemes
|
-- AstroUI allows you to easily modify highlight groups easily for any and all colorschemes
|
||||||
highlights = {
|
highlights = {
|
||||||
init = { -- this table overrides highlights in all themes
|
init = { -- this table overrides highlights in all themes
|
||||||
-- Normal = { bg = "#000000" },
|
-- Normal = { bg = "#000000" },
|
||||||
},
|
},
|
||||||
astrodark = { -- a table of overrides/changes when applying the astrotheme theme
|
astrotheme = { -- a table of overrides/changes when applying the astrotheme theme
|
||||||
-- Normal = { bg = "#000000" },
|
-- Normal = { bg = "#000000" },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -1,82 +0,0 @@
|
||||||
--if true then return {} end
|
|
||||||
|
|
||||||
return {
|
|
||||||
"olimorris/codecompanion.nvim",
|
|
||||||
opts = function(_, opts)
|
|
||||||
opts = opts or {}
|
|
||||||
|
|
||||||
-- Wir bauen die Struktur EXAKT wie in deinem Doku-Beispiel
|
|
||||||
opts.adapters = {
|
|
||||||
-- Die Ebene 'http' ist hier der entscheidende Container
|
|
||||||
http = {
|
|
||||||
my_imac = function()
|
|
||||||
return require("codecompanion.adapters").extend("openai_compatible", {
|
|
||||||
env = {
|
|
||||||
url = os.getenv "LOCAL_LLM", -- Dein lokaler iMac Port
|
|
||||||
api_key = "local-not-needed",
|
|
||||||
},
|
|
||||||
schema = {
|
|
||||||
model = {
|
|
||||||
default = "qwen2.5-7b-coder",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
end,
|
|
||||||
my_gemini = function()
|
|
||||||
return require("codecompanion.adapters").extend("gemini", {
|
|
||||||
env = {
|
|
||||||
-- Ersetze dies durch deinen echten API Key oder nutze eine Umgebungsvariable
|
|
||||||
api_key = os.getenv "GEMENI_API_KEY",
|
|
||||||
},
|
|
||||||
schema = {
|
|
||||||
model = {
|
|
||||||
--default = "gemini-2.5-flash", -- oder "gemini-1.5-flash"
|
|
||||||
default = "gemma-2-2b-it-Q8_0",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
-- Jetzt sagen wir den Strategien, wo sie suchen sollen:
|
|
||||||
-- Der Pfad ist intern nun "http.my_imac"
|
|
||||||
opts.strategies = {
|
|
||||||
chat = { adapter = "my_gemini" },
|
|
||||||
inline = { adapter = "my_gemini" },
|
|
||||||
agent = { adapter = "my_gemini" },
|
|
||||||
}
|
|
||||||
opts.prompt_library = {
|
|
||||||
["Generate Commit Message"] = {
|
|
||||||
strategy = "chat",
|
|
||||||
description = "Erstellt eine Commit-Message basierend auf den Staged Changes",
|
|
||||||
opts = {
|
|
||||||
index = 1,
|
|
||||||
is_default = true,
|
|
||||||
is_slash_cmd = true, -- Erlaubt /commit im Chat
|
|
||||||
short_name = "commit",
|
|
||||||
auto_submit = true,
|
|
||||||
},
|
|
||||||
prompts = {
|
|
||||||
{
|
|
||||||
role = "system",
|
|
||||||
content = "Write a concise commit message in Conventional Commits format based on the diff provided. Use present tense. Do not use wordy explanations.",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
role = "user",
|
|
||||||
content = function()
|
|
||||||
return "Hier ist der Diff der gestageden Änderungen:\n\n```diff\n"
|
|
||||||
.. vim.fn.system "git diff --staged"
|
|
||||||
.. "\n```"
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
return opts
|
|
||||||
end,
|
|
||||||
keys = {
|
|
||||||
{ "<leader>gc", "<cmd>CodeCompanion /commit<cr>", desc = "AI Generate Commit Message" },
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
--if true then return {} end
|
||||||
|
|
||||||
|
return {
|
||||||
|
"zbirenbaum/copilot.lua",
|
||||||
|
opts = {
|
||||||
|
suggestion = {
|
||||||
|
keymap = {
|
||||||
|
accept = "<C-f>",
|
||||||
|
accept_word = false,
|
||||||
|
accept_line = false,
|
||||||
|
next = "<C-t>",
|
||||||
|
prev = "<C-S-t>",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
return {
|
|
||||||
"snacks.nvim",
|
|
||||||
opts = function(_, opts)
|
|
||||||
opts.indent.chunk.char = {
|
|
||||||
-- Benutzt die "Heavy" oder "Rounded" Nerd Font Varianten
|
|
||||||
corner_top = "╭",
|
|
||||||
corner_bottom = "╰",
|
|
||||||
horizontal = "─",
|
|
||||||
vertical = "┆", -- Gestrichelte Linie wirkt weniger erdrückend
|
|
||||||
arrow = "❯", -- Ein schöner Nerd-Font Chevron
|
|
||||||
}
|
|
||||||
return opts
|
|
||||||
end,
|
|
||||||
}
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
return {
|
|
||||||
"lsp_signature.nvim",
|
|
||||||
opts = function(_, opts) opts.hint_enable = true end,
|
|
||||||
}
|
|
||||||
|
|
@ -1,102 +0,0 @@
|
||||||
-- Hole die Macchiato Palette von Catppuccin
|
|
||||||
local cp = require("catppuccin.palettes").get_palette "macchiato"
|
|
||||||
|
|
||||||
local colors = {
|
|
||||||
red = cp.red, -- #ed8796
|
|
||||||
grey = cp.surface2, -- Ein mittleres Grau für die B-Sektion
|
|
||||||
black = cp.crust, -- Sehr dunkles Grau/Schwarz für die Ränder
|
|
||||||
white = cp.text, -- Haupttextfarbe
|
|
||||||
light_green = cp.teal, -- Für den Insert-Modus (etwas frischer)
|
|
||||||
orange = cp.peach, -- Für den Visual-Modus
|
|
||||||
green = cp.green, -- Für den Replace-Modus
|
|
||||||
bg_center = cp.mantle, -- Hintergrund für den mittleren Teil (C)
|
|
||||||
}
|
|
||||||
|
|
||||||
local theme = {
|
|
||||||
normal = {
|
|
||||||
a = { fg = cp.base, bg = cp.blue, gui = "bold" }, -- Blau für Normal Mode
|
|
||||||
b = { fg = colors.white, bg = colors.grey },
|
|
||||||
c = { fg = colors.white, bg = colors.bg_center },
|
|
||||||
},
|
|
||||||
insert = { a = { fg = cp.base, bg = colors.light_green, gui = "bold" } },
|
|
||||||
visual = { a = { fg = cp.base, bg = colors.orange, gui = "bold" } },
|
|
||||||
replace = { a = { fg = cp.base, bg = colors.green, gui = "bold" } },
|
|
||||||
command = { a = { fg = cp.base, bg = cp.yellow, gui = "bold" } },
|
|
||||||
}
|
|
||||||
|
|
||||||
local empty = require("lualine.component"):extend()
|
|
||||||
function empty:draw(default_highlight)
|
|
||||||
self.status = ""
|
|
||||||
self.applied_separator = ""
|
|
||||||
self:apply_highlights(default_highlight)
|
|
||||||
self:apply_section_separators()
|
|
||||||
return self.status
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Hilfsfunktion für die Trenner
|
|
||||||
local function process_sections(sections)
|
|
||||||
for name, section in pairs(sections) do
|
|
||||||
-- Wir nutzen hier cp.mantle für die Lücken, damit es zum Catppuccin-Fluss passt
|
|
||||||
for pos = #section - 1, 1, -1 do
|
|
||||||
table.insert(section, pos + 1, { empty, color = { fg = colors.white, bg = cp.mantle } })
|
|
||||||
end
|
|
||||||
|
|
||||||
for id, comp in ipairs(section) do
|
|
||||||
if type(comp) ~= "table" then
|
|
||||||
comp = { comp }
|
|
||||||
section[id] = comp
|
|
||||||
end
|
|
||||||
-- Die schrägen Trenner ( und ) bleiben erhalten
|
|
||||||
local is_left = name:sub(9, 10) < "x"
|
|
||||||
comp.separator = is_left and { right = "" } or { left = "" }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
return sections
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Deine Hilfsfunktionen bleiben identisch
|
|
||||||
local function search_result()
|
|
||||||
if vim.v.hlsearch == 0 then return "" end
|
|
||||||
local last_search = vim.fn.getreg "/"
|
|
||||||
if not last_search or last_search == "" then return "" end
|
|
||||||
local searchcount = vim.fn.searchcount { maxcount = 9999 }
|
|
||||||
return last_search .. " (" .. searchcount.current .. "/" .. searchcount.total .. ")"
|
|
||||||
end
|
|
||||||
|
|
||||||
local function modified()
|
|
||||||
if vim.bo.modified then
|
|
||||||
return " ●" -- Ein schönerer Punkt für Catppuccin
|
|
||||||
elseif vim.bo.modifiable == false or vim.bo.readonly == true then
|
|
||||||
return " " -- Ein Schloss-Icon für Readonly
|
|
||||||
end
|
|
||||||
return ""
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Rückgabe für das Lualine Setup
|
|
||||||
return {
|
|
||||||
"lualine.nvim",
|
|
||||||
opts = {
|
|
||||||
options = {
|
|
||||||
theme = theme,
|
|
||||||
component_separators = "",
|
|
||||||
section_separators = { left = "", right = "" },
|
|
||||||
disabled_filetypes = { "alpha", "dashboard", "NvimTree" },
|
|
||||||
},
|
|
||||||
sections = process_sections {
|
|
||||||
lualine_a = { "mode" },
|
|
||||||
lualine_b = { "branch", "diff", "diagnostics" },
|
|
||||||
lualine_c = { "filename", modified },
|
|
||||||
lualine_x = { search_result, "filetype" },
|
|
||||||
lualine_y = { "progress" },
|
|
||||||
lualine_z = { "location" },
|
|
||||||
},
|
|
||||||
inactive_sections = {
|
|
||||||
lualine_a = {},
|
|
||||||
lualine_b = {},
|
|
||||||
lualine_c = { "filename" },
|
|
||||||
lualine_x = { "location" },
|
|
||||||
lualine_y = {},
|
|
||||||
lualine_z = {},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
@ -1,122 +0,0 @@
|
||||||
if true then return {} end
|
|
||||||
|
|
||||||
local colors = {
|
|
||||||
red = "#ca1243",
|
|
||||||
grey = "#a0a1a7",
|
|
||||||
black = "#383a42",
|
|
||||||
white = "#f3f3f3",
|
|
||||||
light_green = "#83a598",
|
|
||||||
orange = "#fe8019",
|
|
||||||
green = "#8ec07c",
|
|
||||||
}
|
|
||||||
|
|
||||||
local theme = {
|
|
||||||
normal = {
|
|
||||||
a = { fg = colors.white, bg = colors.black },
|
|
||||||
b = { fg = colors.white, bg = colors.grey },
|
|
||||||
c = { fg = colors.black, bg = colors.white },
|
|
||||||
z = { fg = colors.white, bg = colors.black },
|
|
||||||
},
|
|
||||||
insert = { a = { fg = colors.black, bg = colors.light_green } },
|
|
||||||
visual = { a = { fg = colors.black, bg = colors.orange } },
|
|
||||||
replace = { a = { fg = colors.black, bg = colors.green } },
|
|
||||||
}
|
|
||||||
|
|
||||||
local empty = require("lualine.component"):extend()
|
|
||||||
function empty:draw(default_highlight)
|
|
||||||
self.status = ""
|
|
||||||
self.applied_separator = ""
|
|
||||||
self:apply_highlights(default_highlight)
|
|
||||||
self:apply_section_separators()
|
|
||||||
return self.status
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Put proper separators and gaps between components in sections
|
|
||||||
local function process_sections(sections)
|
|
||||||
for name, section in pairs(sections) do
|
|
||||||
local left = name:sub(9, 10) < "x"
|
|
||||||
for pos = 1, name ~= "lualine_z" and #section or #section - 1 do
|
|
||||||
table.insert(section, pos * 2, { empty, color = { fg = colors.white, bg = colors.white } })
|
|
||||||
end
|
|
||||||
for id, comp in ipairs(section) do
|
|
||||||
if type(comp) ~= "table" then
|
|
||||||
comp = { comp }
|
|
||||||
section[id] = comp
|
|
||||||
end
|
|
||||||
comp.separator = left and { right = "" } or { left = "" }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
return sections
|
|
||||||
end
|
|
||||||
|
|
||||||
local function search_result()
|
|
||||||
if vim.v.hlsearch == 0 then return "" end
|
|
||||||
local last_search = vim.fn.getreg "/"
|
|
||||||
if not last_search or last_search == "" then return "" end
|
|
||||||
local searchcount = vim.fn.searchcount { maxcount = 9999 }
|
|
||||||
return last_search .. "(" .. searchcount.current .. "/" .. searchcount.total .. ")"
|
|
||||||
end
|
|
||||||
|
|
||||||
local function modified()
|
|
||||||
if vim.bo.modified then
|
|
||||||
return "+"
|
|
||||||
elseif vim.bo.modifiable == false or vim.bo.readonly == true then
|
|
||||||
return "-"
|
|
||||||
end
|
|
||||||
return ""
|
|
||||||
end
|
|
||||||
|
|
||||||
-- require("lualine").setup {}
|
|
||||||
|
|
||||||
return {
|
|
||||||
"lualine.nvim",
|
|
||||||
opts = {
|
|
||||||
|
|
||||||
options = {
|
|
||||||
theme = theme,
|
|
||||||
component_separators = "",
|
|
||||||
section_separators = { left = "", right = "" },
|
|
||||||
},
|
|
||||||
sections = process_sections {
|
|
||||||
lualine_a = { "mode" },
|
|
||||||
lualine_b = {
|
|
||||||
"branch",
|
|
||||||
"diff",
|
|
||||||
{
|
|
||||||
"diagnostics",
|
|
||||||
source = { "nvim" },
|
|
||||||
sections = { "error" },
|
|
||||||
diagnostics_color = { error = { bg = colors.red, fg = colors.white } },
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"diagnostics",
|
|
||||||
source = { "nvim" },
|
|
||||||
sections = { "warn" },
|
|
||||||
diagnostics_color = { warn = { bg = colors.orange, fg = colors.white } },
|
|
||||||
},
|
|
||||||
{ "filename", file_status = false, path = 1 },
|
|
||||||
{ modified, color = { bg = colors.red } },
|
|
||||||
{
|
|
||||||
"%w",
|
|
||||||
cond = function() return vim.wo.previewwindow end,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"%r",
|
|
||||||
cond = function() return vim.bo.readonly end,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"%q",
|
|
||||||
cond = function() return vim.bo.buftype == "quickfix" end,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
lualine_c = {},
|
|
||||||
lualine_x = {},
|
|
||||||
lualine_y = { search_result, "filetype" },
|
|
||||||
lualine_z = { "%l:%c", "%p%%/%L" },
|
|
||||||
},
|
|
||||||
inactive_sections = {
|
|
||||||
lualine_c = { "%f %y %m" },
|
|
||||||
lualine_x = {},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
@ -1,28 +1,43 @@
|
||||||
if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
|
if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
|
||||||
|
|
||||||
-- Customize Mason
|
-- Customize Mason plugins
|
||||||
|
|
||||||
---@type LazySpec
|
---@type LazySpec
|
||||||
return {
|
return {
|
||||||
-- use mason-tool-installer for automatically installing Mason packages
|
-- use mason-lspconfig to configure LSP installations
|
||||||
{
|
{
|
||||||
"WhoIsSethDaniel/mason-tool-installer.nvim",
|
"williamboman/mason-lspconfig.nvim",
|
||||||
-- overrides `require("mason-tool-installer").setup(...)`
|
-- overrides `require("mason-lspconfig").setup(...)`
|
||||||
opts = {
|
opts = function(_, opts)
|
||||||
-- Make sure to use the names found in `:Mason`
|
-- add more things to the ensure_installed table protecting against community packs modifying it
|
||||||
ensure_installed = {
|
opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, {
|
||||||
-- install language servers
|
"lua_ls",
|
||||||
"lua-language-server",
|
-- add more arguments for adding more language servers
|
||||||
|
})
|
||||||
-- install formatters
|
end,
|
||||||
|
},
|
||||||
|
-- use mason-null-ls to configure Formatters/Linter installation for null-ls sources
|
||||||
|
{
|
||||||
|
"jay-babu/mason-null-ls.nvim",
|
||||||
|
-- overrides `require("mason-null-ls").setup(...)`
|
||||||
|
opts = function(_, opts)
|
||||||
|
-- add more things to the ensure_installed table protecting against community packs modifying it
|
||||||
|
opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, {
|
||||||
|
"prettier",
|
||||||
"stylua",
|
"stylua",
|
||||||
|
-- add more arguments for adding more null-ls sources
|
||||||
-- install debuggers
|
})
|
||||||
"debugpy",
|
end,
|
||||||
|
|
||||||
-- install any other package
|
|
||||||
"tree-sitter-cli",
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"jay-babu/mason-nvim-dap.nvim",
|
||||||
|
-- overrides `require("mason-nvim-dap").setup(...)`
|
||||||
|
opts = function(_, opts)
|
||||||
|
-- add more things to the ensure_installed table protecting against community packs modifying it
|
||||||
|
opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, {
|
||||||
|
"python",
|
||||||
|
-- add more arguments for adding more debuggers
|
||||||
|
})
|
||||||
|
end,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,20 +5,18 @@ if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
|
||||||
---@type LazySpec
|
---@type LazySpec
|
||||||
return {
|
return {
|
||||||
"nvimtools/none-ls.nvim",
|
"nvimtools/none-ls.nvim",
|
||||||
opts = function(_, opts)
|
opts = function(_, config)
|
||||||
-- opts variable is the default configuration table for the setup function call
|
-- config variable is the default configuration table for the setup function call
|
||||||
-- local null_ls = require "null-ls"
|
-- local null_ls = require "null-ls"
|
||||||
|
|
||||||
-- Check supported formatters and linters
|
-- Check supported formatters and linters
|
||||||
-- https://github.com/nvimtools/none-ls.nvim/tree/main/lua/null-ls/builtins/formatting
|
-- https://github.com/nvimtools/none-ls.nvim/tree/main/lua/null-ls/builtins/formatting
|
||||||
-- https://github.com/nvimtools/none-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics
|
-- https://github.com/nvimtools/none-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics
|
||||||
|
config.sources = {
|
||||||
-- Only insert new sources, do not replace the existing ones
|
|
||||||
-- (If you wish to replace, use `opts.sources = {}` instead of the `list_insert_unique` function)
|
|
||||||
opts.sources = require("astrocore").list_insert_unique(opts.sources, {
|
|
||||||
-- Set a formatter
|
-- Set a formatter
|
||||||
-- null_ls.builtins.formatting.stylua,
|
-- null_ls.builtins.formatting.stylua,
|
||||||
-- null_ls.builtins.formatting.prettier,
|
-- null_ls.builtins.formatting.prettier,
|
||||||
})
|
}
|
||||||
|
return config -- return final config table
|
||||||
end,
|
end,
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,69 +0,0 @@
|
||||||
-- if true then return {} end
|
|
||||||
return {
|
|
||||||
"mrcjkb/rustaceanvim",
|
|
||||||
-- To avoid being surprised by breaking changes,
|
|
||||||
-- I recommend you set a version range
|
|
||||||
version = "^9",
|
|
||||||
-- This plugin implements proper lazy-loading (see :h lua-plugin-lazy).
|
|
||||||
-- No need for lazy.nvim to lazy-load it.
|
|
||||||
lazy = false,
|
|
||||||
}
|
|
||||||
-- return {
|
|
||||||
-- "mrcjkb/rustaceanvim",
|
|
||||||
-- version = "^8",
|
|
||||||
-- ft = "rust",
|
|
||||||
-- specs = {
|
|
||||||
-- {
|
|
||||||
-- "AstroNvim/astrolsp",
|
|
||||||
-- optional = true,
|
|
||||||
-- ---@type AstroLSPOpts
|
|
||||||
-- opts = {
|
|
||||||
-- handlers = { rust_analyzer = false }, -- disable setup of `rust_analyzer`
|
|
||||||
-- },
|
|
||||||
-- },
|
|
||||||
-- },
|
|
||||||
-- opts = function()
|
|
||||||
-- local adapter
|
|
||||||
-- local codelldb_installed = pcall(function() return require("mason-registry").get_package "codelldb" end)
|
|
||||||
-- local cfg = require "rustaceanvim.config"
|
|
||||||
-- if codelldb_installed then
|
|
||||||
-- local codelldb_path = vim.fn.exepath "codelldb"
|
|
||||||
-- local this_os = vim.uv.os_uname().sysname
|
|
||||||
--
|
|
||||||
-- local liblldb_path = vim.fn.expand "$MASON/share/lldb"
|
|
||||||
-- -- The path in windows is different
|
|
||||||
-- if this_os:find "Windows" then
|
|
||||||
-- liblldb_path = liblldb_path .. "\\bin\\lldb.dll"
|
|
||||||
-- else
|
|
||||||
-- -- The liblldb extension is .so for linux and .dylib for macOS
|
|
||||||
-- liblldb_path = liblldb_path .. "/lib/liblldb" .. (this_os == "Linux" and ".so" or ".dylib")
|
|
||||||
-- end
|
|
||||||
-- adapter = cfg.get_codelldb_adapter(codelldb_path, liblldb_path)
|
|
||||||
-- else
|
|
||||||
-- adapter = cfg.get_codelldb_adapter()
|
|
||||||
-- end
|
|
||||||
--
|
|
||||||
-- local astrolsp_opts = vim.lsp.config["rust_analyzer"] or {}
|
|
||||||
-- local server = {
|
|
||||||
-- ---@type table | (fun(project_root:string|nil, default_settings: table|nil):table) -- The rust-analyzer settings or a function that creates them.
|
|
||||||
-- settings = function(project_root, default_settings)
|
|
||||||
-- local astrolsp_settings = astrolsp_opts.settings or {}
|
|
||||||
--
|
|
||||||
-- local merge_table = require("astrocore").extend_tbl(default_settings or {}, astrolsp_settings)
|
|
||||||
-- local ra = require "rustaceanvim.config.server"
|
|
||||||
-- -- load_rust_analyzer_settings merges any found settings with the passed in default settings table and then returns that table
|
|
||||||
-- return ra.load_rust_analyzer_settings(project_root, {
|
|
||||||
-- settings_file_pattern = "rust-analyzer.json",
|
|
||||||
-- default_settings = merge_table,
|
|
||||||
-- })
|
|
||||||
-- end,
|
|
||||||
-- }
|
|
||||||
-- local final_server = require("astrocore").extend_tbl(astrolsp_opts, server)
|
|
||||||
-- return {
|
|
||||||
-- server = final_server,
|
|
||||||
-- dap = { adapter = adapter, load_rust_types = true },
|
|
||||||
-- tools = { enable_clippy = false },
|
|
||||||
-- }
|
|
||||||
-- end,
|
|
||||||
-- config = function(_, opts) vim.g.rustaceanvim = require("astrocore").extend_tbl(opts, vim.g.rustaceanvim) end,
|
|
||||||
-- }
|
|
||||||
|
|
@ -1,34 +1,16 @@
|
||||||
-- if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
|
if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
|
||||||
|
|
||||||
-- Customize Treesitter
|
-- Customize Treesitter
|
||||||
-- --------------------
|
|
||||||
-- Treesitter customizations are handled with AstroCore
|
|
||||||
-- as nvim-treesitter simply provides a download utility for parsers
|
|
||||||
|
|
||||||
---@type LazySpec
|
---@type LazySpec
|
||||||
return {
|
return {
|
||||||
"AstroNvim/astrocore",
|
"nvim-treesitter/nvim-treesitter",
|
||||||
---@type AstroCoreOpts
|
opts = function(_, opts)
|
||||||
opts = {
|
-- add more things to the ensure_installed table protecting against community packs modifying it
|
||||||
treesitter = {
|
opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, {
|
||||||
enabled = true,
|
|
||||||
highlight = true, -- enable/disable treesitter based highlighting
|
|
||||||
indent = true, -- enable/disable treesitter based indentation
|
|
||||||
auto_install = true, -- enable/disable automatic installation of detected languages
|
|
||||||
ensure_installed = {
|
|
||||||
"lua",
|
"lua",
|
||||||
"vim",
|
"vim",
|
||||||
"vue",
|
|
||||||
"html",
|
|
||||||
"css",
|
|
||||||
"javascript",
|
|
||||||
"typescript",
|
|
||||||
"tsx",
|
|
||||||
"rust",
|
|
||||||
"ron",
|
|
||||||
"toml",
|
|
||||||
-- add more arguments for adding more treesitter parsers
|
-- add more arguments for adding more treesitter parsers
|
||||||
},
|
})
|
||||||
},
|
end,
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,192 +1,85 @@
|
||||||
-- if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
|
if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
|
||||||
|
|
||||||
-- You can also add or configure plugins by creating files in this `plugins/` folder
|
-- You can also add or configure plugins by creating files in this `plugins/` folder
|
||||||
-- PLEASE REMOVE THE EXAMPLES YOU HAVE NO INTEREST IN BEFORE ENABLING THIS FILE
|
|
||||||
-- Here are some examples:
|
-- Here are some examples:
|
||||||
|
|
||||||
--@type LazySpec
|
---@type LazySpec
|
||||||
return {
|
return {
|
||||||
--
|
|
||||||
-- -- == Examples of Adding Plugins ==
|
-- == Examples of Adding Plugins ==
|
||||||
--
|
|
||||||
-- "andweeb/presence.nvim",
|
"andweeb/presence.nvim",
|
||||||
-- {
|
|
||||||
-- "ray-x/lsp_signature.nvim",
|
|
||||||
-- event = "BufRead",
|
|
||||||
-- config = function() require("lsp_signature").setup() end,
|
|
||||||
-- },
|
|
||||||
--
|
|
||||||
-- -- == Examples of Overriding Plugins ==
|
|
||||||
--
|
|
||||||
-- -- customize dashboard options
|
|
||||||
-- {
|
|
||||||
-- "folke/snacks.nvim",
|
|
||||||
-- opts = {
|
|
||||||
-- dashboard = {
|
|
||||||
-- preset = {
|
|
||||||
-- header = table.concat({
|
|
||||||
-- " █████ ███████ ████████ ██████ ██████ ",
|
|
||||||
-- "██ ██ ██ ██ ██ ██ ██ ██",
|
|
||||||
-- "███████ ███████ ██ ██████ ██ ██",
|
|
||||||
-- "██ ██ ██ ██ ██ ██ ██ ██",
|
|
||||||
-- "██ ██ ███████ ██ ██ ██ ██████ ",
|
|
||||||
-- "",
|
|
||||||
-- "███ ██ ██ ██ ██ ███ ███",
|
|
||||||
-- "████ ██ ██ ██ ██ ████ ████",
|
|
||||||
-- "██ ██ ██ ██ ██ ██ ██ ████ ██",
|
|
||||||
-- "██ ██ ██ ██ ██ ██ ██ ██ ██",
|
|
||||||
-- "██ ████ ████ ██ ██ ██",
|
|
||||||
-- }, "\n"),
|
|
||||||
-- },
|
|
||||||
-- },
|
|
||||||
-- },
|
|
||||||
-- },
|
|
||||||
--
|
|
||||||
-- -- You can disable default plugins as follows:
|
|
||||||
-- { "max397574/better-escape.nvim", enabled = false },
|
|
||||||
--
|
|
||||||
-- -- You can also easily customize additional setup of plugins that is outside of the plugin's setup call
|
|
||||||
-- {
|
|
||||||
-- "L3MON4D3/LuaSnip",
|
|
||||||
-- config = function(plugin, opts)
|
|
||||||
-- require "astronvim.plugins.configs.luasnip"(plugin, opts) -- include the default astronvim config that calls the setup call
|
|
||||||
-- -- add more custom luasnip configuration such as filetype extend or custom snippets
|
|
||||||
-- local luasnip = require "luasnip"
|
|
||||||
-- luasnip.filetype_extend("javascript", { "javascriptreact" })
|
|
||||||
-- end,
|
|
||||||
-- },
|
|
||||||
--
|
|
||||||
-- {
|
|
||||||
-- "windwp/nvim-autopairs",
|
|
||||||
-- config = function(plugin, opts)
|
|
||||||
-- require "astronvim.plugins.configs.nvim-autopairs"(plugin, opts) -- include the default astronvim config that calls the setup call
|
|
||||||
-- -- add more custom autopairs configuration such as custom rules
|
|
||||||
-- local npairs = require "nvim-autopairs"
|
|
||||||
-- local Rule = require "nvim-autopairs.rule"
|
|
||||||
-- local cond = require "nvim-autopairs.conds"
|
|
||||||
-- npairs.add_rules(
|
|
||||||
-- {
|
|
||||||
-- Rule("$", "$", { "tex", "latex" })
|
|
||||||
-- -- don't add a pair if the next character is %
|
|
||||||
-- :with_pair(cond.not_after_regex "%%")
|
|
||||||
-- -- don't add a pair if the previous character is xxx
|
|
||||||
-- :with_pair(
|
|
||||||
-- cond.not_before_regex("xxx", 3)
|
|
||||||
-- )
|
|
||||||
-- -- don't move right when repeat character
|
|
||||||
-- :with_move(cond.none())
|
|
||||||
-- -- don't delete if the next character is xx
|
|
||||||
-- :with_del(cond.not_after_regex "xx")
|
|
||||||
-- -- disable adding a newline when you press <cr>
|
|
||||||
-- :with_cr(cond.none()),
|
|
||||||
-- },
|
|
||||||
-- -- disable for .vim files, but it work for another filetypes
|
|
||||||
-- Rule("a", "a", "-vim")
|
|
||||||
-- )
|
|
||||||
-- end,
|
|
||||||
-- },
|
|
||||||
{
|
{
|
||||||
"myakove/homeassistant-nvim",
|
"ray-x/lsp_signature.nvim",
|
||||||
dependencies = {
|
event = "BufRead",
|
||||||
"neovim/nvim-lspconfig", -- Required for LSP
|
config = function() require("lsp_signature").setup() end,
|
||||||
"nvim-telescope/telescope.nvim", -- Optional, for entity picker
|
|
||||||
},
|
},
|
||||||
event = { "BufRead", "BufNewFile" }, -- Load on file open
|
|
||||||
config = function()
|
-- == Examples of Overriding Plugins ==
|
||||||
require("homeassistant").setup {
|
|
||||||
lsp = {
|
-- customize alpha options
|
||||||
enabled = true,
|
{
|
||||||
-- LSP server command (default: homeassistant-lsp --stdio)
|
"goolord/alpha-nvim",
|
||||||
cmd = { "homeassistant-lsp", "--stdio" },
|
opts = function(_, opts)
|
||||||
-- File types to attach LSP to
|
-- customize the dashboard header
|
||||||
filetypes = { "yaml", "yaml.homeassistant", "python", "json" },
|
opts.section.header.val = {
|
||||||
-- LSP server settings
|
" █████ ███████ ████████ ██████ ██████",
|
||||||
settings = {
|
"██ ██ ██ ██ ██ ██ ██ ██",
|
||||||
homeassistant = {
|
"███████ ███████ ██ ██████ ██ ██",
|
||||||
host = "ws://192.168.5.249:8123/api/websocket",
|
"██ ██ ██ ██ ██ ██ ██ ██",
|
||||||
token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiI0MDVjMjY3NzVlMzk0NDhkOTI0NTE0OWNhOGZmMWIwYiIsImlhdCI6MTc2ODQ3ODYyOSwiZXhwIjoyMDgzODM4NjI5fQ.2-mN42_ebqwo7VPRTqwSb7ieBDboipJbnXea-g7Quro",
|
"██ ██ ███████ ██ ██ ██ ██████",
|
||||||
timeout = 5000,
|
" ",
|
||||||
},
|
" ███ ██ ██ ██ ██ ███ ███",
|
||||||
cache = {
|
" ████ ██ ██ ██ ██ ████ ████",
|
||||||
enabled = true,
|
" ██ ██ ██ ██ ██ ██ ██ ████ ██",
|
||||||
ttl = 300, -- 5 minutes
|
" ██ ██ ██ ██ ██ ██ ██ ██ ██",
|
||||||
},
|
" ██ ████ ████ ██ ██ ██",
|
||||||
diagnostics = {
|
|
||||||
enabled = true,
|
|
||||||
debounce = 500,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
-- Optional: UI settings
|
|
||||||
-- ui = {
|
|
||||||
-- dashboard = {
|
|
||||||
-- width = 0.8,
|
|
||||||
-- height = 0.8,
|
|
||||||
-- border = "rounded",
|
|
||||||
-- },
|
|
||||||
-- },
|
|
||||||
-- Optional: Custom keymaps (set to false to disable defaults)
|
|
||||||
-- keymaps = {
|
|
||||||
-- dashboard = "<leader>hd",
|
|
||||||
-- picker = "<leader>hp",
|
|
||||||
-- reload_cache = "<leader>hr",
|
|
||||||
-- debug = "<leader>hD",
|
|
||||||
-- edit_dashboard = "<leader>he",
|
|
||||||
-- },
|
|
||||||
}
|
}
|
||||||
|
return opts
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"nosduco/remote-sshfs.nvim",
|
|
||||||
dependencies = { "nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim" },
|
|
||||||
opts = {
|
|
||||||
-- Refer to the configuration section below
|
|
||||||
-- or leave empty for defaults
|
|
||||||
},
|
|
||||||
},
|
|
||||||
-- You can disable default plugins as follows:
|
-- You can disable default plugins as follows:
|
||||||
-- { "max397574/better-escape.nvim", enabled = false },
|
{ "max397574/better-escape.nvim", enabled = false },
|
||||||
|
|
||||||
-- You can also easily customize additional setup of plugins that is outside of the plugin's setup call
|
-- You can also easily customize additional setup of plugins that is outside of the plugin's setup call
|
||||||
-- {
|
{
|
||||||
-- "L3MON4D3/LuaSnip",
|
"L3MON4D3/LuaSnip",
|
||||||
-- config = function(plugin, opts)
|
config = function(plugin, opts)
|
||||||
-- -- add more custom luasnip configuration such as filetype extend or custom snippets
|
require "astronvim.plugins.configs.luasnip"(plugin, opts) -- include the default astronvim config that calls the setup call
|
||||||
-- local luasnip = require "luasnip"
|
-- add more custom luasnip configuration such as filetype extend or custom snippets
|
||||||
-- luasnip.filetype_extend("javascript", { "javascriptreact" })
|
local luasnip = require "luasnip"
|
||||||
--
|
luasnip.filetype_extend("javascript", { "javascriptreact" })
|
||||||
-- -- include the default astronvim config that calls the setup call
|
end,
|
||||||
-- require "astronvim.plugins.configs.luasnip"(plugin, opts)
|
},
|
||||||
-- end,
|
|
||||||
-- },
|
{
|
||||||
--
|
"windwp/nvim-autopairs",
|
||||||
-- {
|
config = function(plugin, opts)
|
||||||
-- "windwp/nvim-autopairs",
|
require "astronvim.plugins.configs.nvim-autopairs"(plugin, opts) -- include the default astronvim config that calls the setup call
|
||||||
-- config = function(plugin, opts)
|
-- add more custom autopairs configuration such as custom rules
|
||||||
-- require "astronvim.plugins.configs.nvim-autopairs"(plugin, opts) -- include the default astronvim config that calls the setup call
|
local npairs = require "nvim-autopairs"
|
||||||
-- -- add more custom autopairs configuration such as custom rules
|
local Rule = require "nvim-autopairs.rule"
|
||||||
-- local npairs = require "nvim-autopairs"
|
local cond = require "nvim-autopairs.conds"
|
||||||
-- local Rule = require "nvim-autopairs.rule"
|
npairs.add_rules(
|
||||||
-- local cond = require "nvim-autopairs.conds"
|
{
|
||||||
-- npairs.add_rules(
|
Rule("$", "$", { "tex", "latex" })
|
||||||
-- {
|
-- don't add a pair if the next character is %
|
||||||
-- Rule("$", "$", { "tex", "latex" })
|
:with_pair(cond.not_after_regex "%%")
|
||||||
-- -- don't add a pair if the next character is %
|
-- don't add a pair if the previous character is xxx
|
||||||
-- :with_pair(cond.not_after_regex "%%")
|
:with_pair(
|
||||||
-- -- don't add a pair if the previous character is xxx
|
cond.not_before_regex("xxx", 3)
|
||||||
-- :with_pair(
|
)
|
||||||
-- cond.not_before_regex("xxx", 3)
|
-- don't move right when repeat character
|
||||||
-- )
|
:with_move(cond.none())
|
||||||
-- -- don't move right when repeat character
|
-- don't delete if the next character is xx
|
||||||
-- :with_move(cond.none())
|
:with_del(cond.not_after_regex "xx")
|
||||||
-- -- don't delete if the next character is xx
|
-- disable adding a newline when you press <cr>
|
||||||
-- :with_del(cond.not_after_regex "xx")
|
:with_cr(cond.none()),
|
||||||
-- -- disable adding a newline when you press <cr>
|
},
|
||||||
-- :with_cr(cond.none()),
|
-- disable for .vim files, but it work for another filetypes
|
||||||
-- },
|
Rule("a", "a", "-vim")
|
||||||
-- -- disable for .vim files, but it work for another filetypes
|
)
|
||||||
-- Rule("a", "a", "-vim")
|
end,
|
||||||
-- )
|
},
|
||||||
-- end,
|
|
||||||
-- },
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
--if true then return {} end
|
|
||||||
|
|
||||||
return {
|
|
||||||
"windows.nvim",
|
|
||||||
opts = function(_, opts)
|
|
||||||
opts.autowidth = { enable = true }
|
|
||||||
return opts
|
|
||||||
end,
|
|
||||||
-- event = "WindowsEnableAutoWidth",
|
|
||||||
dependencies = {
|
|
||||||
"AstroNvim/astrocore",
|
|
||||||
opts = {
|
|
||||||
mappings = {
|
|
||||||
n = {
|
|
||||||
["<Leader>W"] = function() vim.cmd "WindowsMaximize" end,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
@ -1,5 +1,18 @@
|
||||||
if true then return end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
|
if true then return end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
|
||||||
|
|
||||||
-- This will run last in the setup process.
|
-- This will run last in the setup process and is a good place to configure
|
||||||
-- This is just pure lua so anything that doesn't
|
-- things like custom filetypes. This just pure lua so anything that doesn't
|
||||||
-- fit in the normal config locations above can go here
|
-- fit in the normal config locations above can go here
|
||||||
|
|
||||||
|
-- Set up custom filetypes
|
||||||
|
vim.filetype.add {
|
||||||
|
extension = {
|
||||||
|
foo = "fooscript",
|
||||||
|
},
|
||||||
|
filename = {
|
||||||
|
["Foofile"] = "fooscript",
|
||||||
|
},
|
||||||
|
pattern = {
|
||||||
|
["~/%.config/foo/.*"] = "fooscript",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue