Compare commits
54 Commits
eb1c15e09a
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| e144c2530e | |||
| 77a32b9eef | |||
| ae95eb1480 | |||
| 6f17872ae0 | |||
| e35c69881a | |||
| c0dc6540f0 | |||
| 1f3fe12f13 | |||
| 35b7a62a1e | |||
| f66e518acc | |||
| 4335223c83 | |||
| 61a1a99700 | |||
| e9a591d25d | |||
| 40200b5e89 | |||
| 803bf6e106 | |||
| 01690eb95f | |||
| cacaba7987 | |||
| cbc6672152 | |||
| e7296d71a4 | |||
| 7d509c7ea9 | |||
| 7d41249b98 | |||
| ecfdbdcd77 | |||
| ea9f5df6c2 | |||
| 04e50f3c4b | |||
| 8224f496ac | |||
| 5614dfaa28 | |||
| 4f81730b37 | |||
| 18e32b6c09 | |||
| cf26719d20 | |||
| be462d58ea | |||
| f02977f653 | |||
| 4655b2da81 | |||
| d597afc5ee | |||
| 4f14f477b7 | |||
| afda9abeb1 | |||
| 9333743843 | |||
| 8892bcd443 | |||
| bbcd67572c | |||
| c3cb372a2b | |||
| ceb333da2e | |||
| 5f0afc4341 | |||
| 4d7f062742 | |||
| 8de18e70ae | |||
| 549db6ba67 | |||
| 8c1491871a | |||
| 6624ceb341 | |||
| 6a5abb5777 | |||
| de9624997b | |||
| a8b282c990 | |||
| c618582216 | |||
| 024d0020cd | |||
| 5d28a675d5 | |||
| be241284ff | |||
| 3ec0813f8a | |||
| 95add5d757 |
14
init.lua
14
init.lua
@@ -1,5 +1,5 @@
|
||||
local lazypath = vim.env.LAZY or vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||
if not (vim.env.LAZY or vim.loop.fs_stat(lazypath)) then
|
||||
if not (vim.env.LAZY or (vim.uv or vim.loop).fs_stat(lazypath)) then
|
||||
vim.g.astronvim_first_install = true
|
||||
vim.fn.system({
|
||||
"git",
|
||||
@@ -13,14 +13,10 @@ end
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
|
||||
if not pcall(require, "lazy") then
|
||||
vim.api.nvim_echo(
|
||||
{
|
||||
{ ("Unable to load lazy from: %s\n"):format(lazypath), "ErrorMsg" },
|
||||
{ "Press any key to exit...", "MoreMsg" },
|
||||
},
|
||||
true,
|
||||
{}
|
||||
)
|
||||
vim.api.nvim_echo({
|
||||
{ ("Unable to load lazy from: %s\n"):format(lazypath), "ErrorMsg" },
|
||||
{ "Press any key to exit...", "MoreMsg" },
|
||||
}, true, {})
|
||||
vim.fn.getchar()
|
||||
vim.cmd.quit()
|
||||
end
|
||||
|
||||
74
lazy-lock.json
Normal file
74
lazy-lock.json
Normal file
@@ -0,0 +1,74 @@
|
||||
{
|
||||
"AstroNvim": { "branch": "main", "commit": "f9bce33cab08bd3c327f8a1619eba63c9b7262ae" },
|
||||
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
|
||||
"aerial.nvim": { "branch": "master", "commit": "6ab1a0ce4874d21610fc5a67a6c82c7b943c635b" },
|
||||
"astrocommunity": { "branch": "main", "commit": "4e6feff7aa400cf5742c72d03cc238163ed20be6" },
|
||||
"astrocore": { "branch": "main", "commit": "c797dd5a592e2bd154f2503e231b8a4083659534" },
|
||||
"astrolsp": { "branch": "main", "commit": "414775e4b49a46bd7105cc5498ea7bb312359bf2" },
|
||||
"astrotheme": { "branch": "main", "commit": "0a3fb361f1e3d6a0cbb42e93f3d01fb5203b6752" },
|
||||
"astroui": { "branch": "main", "commit": "4943abbd42674b43249313afe83b91065a40e4be" },
|
||||
"better-escape.nvim": { "branch": "master", "commit": "199dcc2643dec5d8dbdab4ec672cf405224dcb3b" },
|
||||
"blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" },
|
||||
"blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" },
|
||||
"clangd_extensions.nvim": { "branch": "main", "commit": "b67cc417d9020fb4b83d46662351b4d16894905e" },
|
||||
"cmake-tools.nvim": { "branch": "master", "commit": "88e07c6bff838a5bda2f461e9c1122b79ff0829f" },
|
||||
"cmp-dap": { "branch": "master", "commit": "ea92773e84c0ad3288c3bc5e452ac91559669087" },
|
||||
"conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" },
|
||||
"crates.nvim": { "branch": "main", "commit": "ac9fa498a9edb96dc3056724ff69d5f40b898453" },
|
||||
"dev-tools.nvim": { "branch": "main", "commit": "96cf12d605f4f2cee0a0b844f8df5d1e8b33db38" },
|
||||
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
|
||||
"garbage-day.nvim": { "branch": "main", "commit": "08c46d9d6c918207ee04983c3eb6a89753e960a4" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" },
|
||||
"guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" },
|
||||
"heirline.nvim": { "branch": "master", "commit": "fae936abb5e0345b85c3a03ecf38525b0828b992" },
|
||||
"inc-rename.nvim": { "branch": "main", "commit": "8ae25b35ae16ca4bd5de3d3c472eec3b574018d4" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
||||
"lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" },
|
||||
"lsplinks.nvim": { "branch": "master", "commit": "94d729170e95298ce86ba41ef66f8756f6062b34" },
|
||||
"luarocks.nvim": { "branch": "main", "commit": "1db9093915eb16ba2473cfb8d343ace5ee04130a" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
|
||||
"mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" },
|
||||
"mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" },
|
||||
"mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" },
|
||||
"mason.nvim": { "branch": "main", "commit": "197f6352c276bbc2d25541dfce00ec50d1a4e88f" },
|
||||
"mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
|
||||
"neo-tree.nvim": { "branch": "main", "commit": "f1deac7ecec88c28a250d890ba7bb35843e69cbd" },
|
||||
"neoconf.nvim": { "branch": "main", "commit": "907a1fe4e346aab2989af6848d7d697098506c5e" },
|
||||
"neogit": { "branch": "master", "commit": "6617978288d58eb121754b5dd890e893d9a7e8d6" },
|
||||
"none-ls.nvim": { "branch": "main", "commit": "db2a48b79cfcdab8baa5d3f37f21c78b6705c62e" },
|
||||
"nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
|
||||
"nvim-dap": { "branch": "master", "commit": "14fe46ae16eb272629144a93f7738f5279665a4f" },
|
||||
"nvim-dap-repl-highlights": { "branch": "master", "commit": "4f4cdb9ccd567512fd4f602e411b8f7ab5f69002" },
|
||||
"nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" },
|
||||
"nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" },
|
||||
"nvim-highlight-colors": { "branch": "main", "commit": "b42a5ccec7457b44e89f7ed3b3afb1b375bb2093" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "fa2662510d30b06168b6e2e6915518decde6bbac" },
|
||||
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
|
||||
"nvim-spider": { "branch": "main", "commit": "220efa63c20830a9bf0593a57366b96dd5790212" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "89ebe73cd2836db80a22d9748999ace0241917a5" },
|
||||
"nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
|
||||
"nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" },
|
||||
"nvim-ufo": { "branch": "main", "commit": "a52c92c3bbaa10f0c9b547a50adaa8c7d8b29f94" },
|
||||
"nvim-window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
|
||||
"refactoring.nvim": { "branch": "master", "commit": "74b608dfee827c2372250519d433cc21cb083407" },
|
||||
"resession.nvim": { "branch": "master", "commit": "cc819b0489938d03e4f3532a583354f0287c015b" },
|
||||
"rustaceanvim": { "branch": "master", "commit": "12504405821c05874d2d1f6b5ec919f9808e2c99" },
|
||||
"schemastore.nvim": { "branch": "main", "commit": "05924b7383fa17f13f7a7e7ecc8ce83b3c340ce2" },
|
||||
"smart-splits.nvim": { "branch": "master", "commit": "ddb23c1a1cf1507bda487cda7f6e4690965ef9f5" },
|
||||
"snacks.nvim": { "branch": "main", "commit": "5eac729fa290248acfe10916d92a5ed5e5c0f9ed" },
|
||||
"telescope-dap.nvim": { "branch": "master", "commit": "783366bd6c1e7fa0a5c59c07db37f49c805a28df" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
|
||||
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
|
||||
"toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
|
||||
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
|
||||
"vim-abolish": { "branch": "master", "commit": "dcbfe065297d31823561ba787f51056c147aa682" },
|
||||
"vim-easy-align": { "branch": "master", "commit": "9815a55dbcd817784458df7a18acacc6f82b1241" },
|
||||
"vim-illuminate": { "branch": "master", "commit": "0d1e93684da00ab7c057410fecfc24f434698898" },
|
||||
"vim-sandwich": { "branch": "master", "commit": "74cf93d58ccc567d8e2310a69860f1b93af19403" },
|
||||
"vim-slint": { "branch": "main", "commit": "9badce3860297562bb5e80ba1666628f9e0ac632" },
|
||||
"vimwiki": { "branch": "dev", "commit": "72792615e739d0eb54a9c8f7e0a46a6e2407c9e8" },
|
||||
"which-key.nvim": { "branch": "main", "commit": "fcbf4eea17cb299c02557d576f0d568878e354a4" }
|
||||
}
|
||||
@@ -1,13 +1,11 @@
|
||||
require("lazy").setup{
|
||||
spec = {
|
||||
-- TODO: remove branch v4 on release
|
||||
{
|
||||
"AstroNvim/AstroNvim",
|
||||
branch = "v4",
|
||||
import = "astronvim.plugins",
|
||||
},
|
||||
{ import = "plugins" },
|
||||
require("lazy").setup({
|
||||
{
|
||||
"AstroNvim/AstroNvim",
|
||||
version = "^5",
|
||||
import = "astronvim.plugins",
|
||||
},
|
||||
{ import = "plugins" },
|
||||
} --[[@as LazySpec]], {
|
||||
install = { colorscheme = { "astrodark", "habamax" } },
|
||||
performance = {
|
||||
rtp = {
|
||||
@@ -26,4 +24,4 @@ require("lazy").setup{
|
||||
patterns = {},
|
||||
fallback = true, -- Fallback to git when local plugin doesn't exist
|
||||
},
|
||||
} --[[@as LazyConfig]]
|
||||
}) --[[@as LazyConfig]]
|
||||
|
||||
@@ -1,13 +1,2 @@
|
||||
---@type LazySpec
|
||||
return {
|
||||
{ "goolord/alpha-nvim", enabled = false },
|
||||
-- Which-key
|
||||
-- {
|
||||
-- "folke/which-key.nvim",
|
||||
-- opts = {
|
||||
-- plugins = {
|
||||
-- registers = false,
|
||||
-- },
|
||||
-- },
|
||||
-- }
|
||||
}
|
||||
return {}
|
||||
|
||||
@@ -3,38 +3,46 @@ local work = not home
|
||||
|
||||
---@type LazySpec
|
||||
return {
|
||||
{ "AstroNvim/astrocommunity", branch = "v4" },
|
||||
{ "AstroNvim/astrocommunity" },
|
||||
|
||||
-- Language packs
|
||||
{ enabled = true, import = "astrocommunity.pack.cpp" },
|
||||
{ enabled = true, import = "astrocommunity.pack.json" },
|
||||
{ enabled = true, import = "astrocommunity.pack.lua" },
|
||||
{ enabled = true, import = "astrocommunity.pack.markdown" },
|
||||
{ enabled = true, import = "astrocommunity.pack.rust" },
|
||||
|
||||
{ enabled = home, import = "astrocommunity.pack.bash" },
|
||||
{ enabled = home, import = "astrocommunity.pack.rust" },
|
||||
{ enabled = home, import = "astrocommunity.pack.html-css" },
|
||||
{ enabled = home, import = "astrocommunity.pack.just" },
|
||||
{ enabled = home, import = "astrocommunity.pack.tailwindcss" },
|
||||
|
||||
{ enabled = work, import = "astrocommunity.pack.cs" },
|
||||
{ enabled = work, import = "astrocommunity.pack.ps1" },
|
||||
|
||||
{ enabled = false, import = "astrocommunity.pack.html-css" },
|
||||
{ enabled = false, import = "astrocommunity.pack.java" },
|
||||
{ enabled = false, import = "astrocommunity.pack.proto" },
|
||||
{ enabled = false, import = "astrocommunity.pack.wgsl" }, -- WebGLShaderLanguage
|
||||
|
||||
-- DAP
|
||||
-- Figure out if needed when you finaly try to use the DAP
|
||||
-- { import = "astrocommunity.debugging.telescope-dap-nvim" },
|
||||
-- { import = "astrocommunity.debugging.nvim-dap-virtual-text" },
|
||||
-- { import = "astrocommunity.debugging.nvim-dap-repl-highlights" },
|
||||
{ enabled = true, import = "astrocommunity.debugging.telescope-dap-nvim" },
|
||||
{ enabled = true, import = "astrocommunity.debugging.nvim-dap-virtual-text" },
|
||||
{ enabled = true, import = "astrocommunity.debugging.nvim-dap-repl-highlights" },
|
||||
|
||||
-- Others
|
||||
-- { import = "astrocommunity.debugging.nvim-bqf" },
|
||||
{ import = "astrocommunity.motion.nvim-surround" }, -- Surround
|
||||
-- Motions
|
||||
{ import = "astrocommunity.syntax.vim-sandwich" }, -- Surround
|
||||
{ import = "astrocommunity.motion.nvim-spider" }, -- Move in subwords
|
||||
{ import = "astrocommunity.lsp.lsp-signature-nvim" }, -- Support for lsp signatureHelp
|
||||
-- Lsp
|
||||
{ import = "astrocommunity.diagnostics.trouble-nvim" }, -- Diagnostics navigation
|
||||
{ import = "astrocommunity.lsp.dev-tools-nvim" }, -- Nicer menus
|
||||
{ import = "astrocommunity.lsp.garbage-day-nvim" }, -- Kill unused LSP servers
|
||||
{ import = "astrocommunity.lsp.inc-rename-nvim" }, -- Visual renaming of lsp symbols
|
||||
{ import = "astrocommunity.lsp.lsplinks-nvim" }, -- Support for document links (needed?)
|
||||
|
||||
-- CVS
|
||||
{ import = "astrocommunity.git.diffview-nvim" }, -- Diff
|
||||
{ import = "astrocommunity.git.neogit"}, -- Git
|
||||
{ import = "astrocommunity.git.neogit" }, -- Git
|
||||
-- Tools
|
||||
{ import = "astrocommunity.editing-support.conform-nvim" },
|
||||
{ import = "astrocommunity.editing-support.refactoring-nvim" },
|
||||
{ import = "astrocommunity.syntax.vim-easy-align" },
|
||||
}
|
||||
|
||||
@@ -3,27 +3,55 @@ return {
|
||||
"AstroNvim/astrocore",
|
||||
---@type AstroCoreOpts
|
||||
opts = {
|
||||
features = {
|
||||
large_buf = { size = 1024 * 256, lines = 10000 },
|
||||
autopairs = true,
|
||||
cmp = true,
|
||||
diagnostics = { virtual_text = false, virtual_lines = true },
|
||||
highlighturl = true,
|
||||
notifications = true,
|
||||
},
|
||||
options = {
|
||||
opt = {
|
||||
clipboard = "",
|
||||
cmdheight = 1,
|
||||
cmdheight = 0,
|
||||
diffopt = {
|
||||
-- default
|
||||
"internal",
|
||||
"closeoff",
|
||||
"filler",
|
||||
-- end default
|
||||
"iwhite",
|
||||
"algorithm:histogram",
|
||||
"indent-heuristic",
|
||||
"linematch:60",
|
||||
},
|
||||
expandtab = true,
|
||||
foldmethod = "syntax",
|
||||
foldnestmax = 150,
|
||||
grepprg = vim.fn.executable("rg") and "rg --vimgrep" or nil,
|
||||
guifont = { "VictorMono Nerd Font", "Hack Nerd Font Mono", ":h10" },
|
||||
listchars = { tab = "> ", extends = ">", precedes = "<", space = "·" },
|
||||
number = true,
|
||||
path = vim.list_extend(vim.opt.path:get(), { "**" }),
|
||||
guifont = {
|
||||
"VictorMono Nerd Font",
|
||||
"Hack Nerd Font Mono",
|
||||
":h10",
|
||||
},
|
||||
listchars = {
|
||||
tab = "> ",
|
||||
extends = ">",
|
||||
precedes = "<",
|
||||
space = "·",
|
||||
},
|
||||
linebreak = true,
|
||||
breakat = " (),;{}[]",
|
||||
showbreak = "",
|
||||
number = false,
|
||||
pumblend = 0,
|
||||
relativenumber = false,
|
||||
shiftwidth = 4,
|
||||
signcolumn = "auto",
|
||||
spell = false,
|
||||
tabstop = 4,
|
||||
textwidth = 120,
|
||||
textwidth = 100,
|
||||
winblend = 0,
|
||||
wrap = true,
|
||||
winblend = 50,
|
||||
pumblend = 30,
|
||||
},
|
||||
g = {
|
||||
neovide_hide_mouse_when_typing = true,
|
||||
|
||||
@@ -4,6 +4,12 @@ return {
|
||||
---@type AstroCoreOpts
|
||||
opts = {
|
||||
mappings = {
|
||||
n = {
|
||||
["<Leader>e"] = {
|
||||
"<Cmd>Neotree toggle reveal reveal_force_cwd<CR>",
|
||||
desc = "Toggle Explorer",
|
||||
},
|
||||
},
|
||||
t = {
|
||||
["<Esc>"] = [[<C-\><C-n>]],
|
||||
["<A-h>"] = [[<C-\><C-N><C-w>h]],
|
||||
|
||||
@@ -4,12 +4,25 @@ return {
|
||||
---@type AstroCoreOpts
|
||||
opts = {
|
||||
commands = {
|
||||
TermOpen = {
|
||||
function()
|
||||
vim.bo.number = false
|
||||
vim.bo.spell = false
|
||||
end,
|
||||
desc = "Remove linenumber in term buffers",
|
||||
CopyFilename = {
|
||||
'let @+=expand("%:p")',
|
||||
desc = "Copy filename to clipboard",
|
||||
},
|
||||
P4Edit = {
|
||||
"!p4 edit %:p",
|
||||
desc = "Edit in perforce",
|
||||
},
|
||||
P4History = {
|
||||
"!p4vc history %:p",
|
||||
desc = "Perforce history",
|
||||
},
|
||||
P4Timelapse = {
|
||||
"!p4vc tlv %:p",
|
||||
desc = "Perfoce timelapse view",
|
||||
},
|
||||
P4RevisionGraph = {
|
||||
"!p4vc revisiongraph %:p",
|
||||
desc = "Perforce revision graph",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
@@ -1,36 +1,48 @@
|
||||
---@type LazySpec
|
||||
return {
|
||||
"AstroNvim/astrolsp",
|
||||
---@type AstroLSPOpts
|
||||
opts = {
|
||||
features = {
|
||||
autoformat = false,
|
||||
inlay_hints = false, -- BUG: upstream https://github.com/neovim/neovim/issues/27645
|
||||
},
|
||||
formatting = {
|
||||
format_on_save = {
|
||||
enabled = false,
|
||||
},
|
||||
timeout_ms = 1000,
|
||||
},
|
||||
mappings = {
|
||||
n = {
|
||||
gh = {
|
||||
function() require("clangd_extensions.switch_source_header").switch_source_header() end,
|
||||
desc = "Switch to matching source or header file",
|
||||
cond = "textDocument/switchSourceHeader",
|
||||
{
|
||||
"AstroNvim/astrolsp",
|
||||
optional = true,
|
||||
---@type AstroLSPOpts
|
||||
opts = {
|
||||
---@diagnostic disable: missing-fields
|
||||
config = {
|
||||
clangd = {
|
||||
filetypes = { "c", "cpp", "objc", "objcpp", "cuda" },
|
||||
cmd = {
|
||||
"clangd",
|
||||
"--header-insertion=never", -- Disable auto includes
|
||||
"--enable-config", -- Enable .clangd and clangd.yaml files
|
||||
},
|
||||
},
|
||||
slint_lsp = {
|
||||
root_dir = function() end, -- Fix missing root_dir issue in neoconf (lspconfig doesn't define it...)
|
||||
},
|
||||
qmlls = {
|
||||
cmd = { "qmlls6" },
|
||||
},
|
||||
},
|
||||
servers = {
|
||||
"qmlls",
|
||||
},
|
||||
features = {
|
||||
signature_help = true,
|
||||
inlay_hints = true,
|
||||
codelens = true,
|
||||
semantic_tokens = true,
|
||||
},
|
||||
},
|
||||
---@diagnostic disable: missing-fields
|
||||
config = {
|
||||
clangd = {
|
||||
filetypes = { 'c', 'cpp', 'objc', 'objcpp', 'cuda' },
|
||||
cmd = {
|
||||
"clangd",
|
||||
"--header-insertion=never", -- Disable auto includes
|
||||
"--enable-config", -- Enable .clangd and clangd.yaml files
|
||||
},
|
||||
},
|
||||
{
|
||||
"zeioth/garbage-day.nvim",
|
||||
optional = true,
|
||||
opts = {
|
||||
excluded_lsp_clients = {
|
||||
"null-ls",
|
||||
"jdtls",
|
||||
"marksman",
|
||||
"lua_ls",
|
||||
"dev-tools",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
12
lua/plugins/21-format.lua
Normal file
12
lua/plugins/21-format.lua
Normal file
@@ -0,0 +1,12 @@
|
||||
---@type LazySpec
|
||||
return {
|
||||
"stevearc/conform.nvim",
|
||||
optional = true,
|
||||
---@module "conform"
|
||||
---@type conform.setupOpts
|
||||
opts = {
|
||||
formatters_by_ft = {
|
||||
rust = { "leptosfmt", lsp_format = "first" },
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -1,23 +1,4 @@
|
||||
---@type LazySpec
|
||||
return {
|
||||
{
|
||||
"astronvim/astrocore",
|
||||
opts = {
|
||||
commands = {
|
||||
LuaSnipExitOnModeChange = {
|
||||
function(evt)
|
||||
local ok, luasnip = pcall(require, "luasnip")
|
||||
if
|
||||
ok
|
||||
and luasnip.session
|
||||
and luasnip.session.current_nodes[evt.buf]
|
||||
and not luasnip.session.jump_active
|
||||
then
|
||||
luasnip.unlink_current()
|
||||
end
|
||||
end,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{ "L3MON4D3/LuaSnip", enabled = false },
|
||||
}
|
||||
|
||||
@@ -1,13 +1,23 @@
|
||||
---@type LazySpec
|
||||
return {
|
||||
--[[
|
||||
{
|
||||
"lewis6991/gitsigns.nvim",
|
||||
"folke/snacks.nvim",
|
||||
optional = true,
|
||||
--@type snacks.Config
|
||||
opts = {
|
||||
signcolumn = false,
|
||||
numhl = true,
|
||||
current_line_blame_opts = { ignore_whitespace = true },
|
||||
gitbrowse = {
|
||||
remote_patterns = {
|
||||
{ "^gitea@(.+):(.+)$", "https://%1/%2" },
|
||||
},
|
||||
url_patterns = {
|
||||
["git.niverton.ovh"] = {
|
||||
branch = "/src/branch/{branch}",
|
||||
file = "/src/branch/{branch}/{file}#L{line_start}-L{line_end}",
|
||||
permalink = "/src/commit/{commit}/{file}#L{line_start}-L{line_end}",
|
||||
commit = "/commit/{commit}",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
]]
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ return {
|
||||
buffer_active = { bold = true, italic = false },
|
||||
tab_active = { bold = true },
|
||||
},
|
||||
colors = function(colors) return require("astrobox.heirline").setup_colors(colors) end,
|
||||
colors = require("astrobox.heirline").setup_colors,
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -21,7 +21,9 @@ return {
|
||||
|
||||
opts.statusline = {
|
||||
hl = "statusline",
|
||||
comp.mode({ mode_text = { hl = { bold = true }, padding = { left = 1, right = 1 } } }),
|
||||
comp.mode({
|
||||
mode_text = { hl = { bold = true }, padding = { left = 1, right = 1 } },
|
||||
}),
|
||||
comp.file_info({
|
||||
filetype = false,
|
||||
filename = {
|
||||
@@ -37,7 +39,7 @@ return {
|
||||
comp.treesitter({ padding = { right = 1 } }), -- Extra space to separate from next component
|
||||
comp.git_diff(),
|
||||
comp.git_branch(),
|
||||
comp.nav({ scrollbar = false }),
|
||||
comp.nav({ scrollbar = false, padding = { right = 1 } }),
|
||||
}
|
||||
|
||||
local get_file_path = status.provider.filename({
|
||||
@@ -53,11 +55,15 @@ return {
|
||||
end
|
||||
|
||||
opts.winbar = {
|
||||
init = function(self) self.bufnr = vim.api.nvim_get_current_buf() end,
|
||||
init = function(self)
|
||||
self.bufnr = vim.api.nvim_get_current_buf()
|
||||
end,
|
||||
fallthrough = false,
|
||||
{
|
||||
-- Display file path when window is not active
|
||||
condition = function() return not status.condition.is_active() end,
|
||||
condition = function()
|
||||
return not status.condition.is_active()
|
||||
end,
|
||||
{
|
||||
-- Set display priority to hide when component is too big to fit
|
||||
flexible = 1,
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
---@type LazySpec
|
||||
return {
|
||||
-- { "echasnovski/mini.align", event = "User AstroFile" },
|
||||
{ "tpope/vim-abolish", event = "User AstroFile" },
|
||||
{ "tpope/vim-abolish", event = "User AstroFile" },
|
||||
{ "slint-ui/vim-slint", ft = "slint" },
|
||||
-- { "stevearc/profile.nvim", lazy = false }, -- Profiling lua
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
column_width = 120
|
||||
column_width = 100
|
||||
line_endings = "Unix"
|
||||
indent_type = "Spaces"
|
||||
call_parentheses = "Always"
|
||||
collapse_simple_statement = "Always"
|
||||
collapse_simple_statement = "Never"
|
||||
|
||||
[sort_requires]
|
||||
enabled = true
|
||||
|
||||
Reference in New Issue
Block a user