aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--nvim/.config/nvim/lazy-lock.json62
-rw-r--r--nvim/.config/nvim/lua/plugins/conform.lua12
-rw-r--r--nvim/.config/nvim/lua/plugins/dressing.lua33
-rw-r--r--nvim/.config/nvim/lua/plugins/gruvbox.lua15
-rw-r--r--nvim/.config/nvim/lua/plugins/indent_blankline.lua27
-rw-r--r--nvim/.config/nvim/lua/plugins/nvim-lint.lua59
-rw-r--r--nvim/.config/nvim/lua/plugins/treesitter.lua15
7 files changed, 87 insertions, 136 deletions
diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
index cd0a05c..4dd2c05 100644
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -1,7 +1,7 @@
{
"Comment.nvim": { "branch": "master", "commit": "e51f2b142d88bb666dcaa77d93a07f4b419aca70" },
"LuaSnip": { "branch": "master", "commit": "0b4950a237ce441a6a3a947d501622453f6860ea" },
- "SchemaStore.nvim": { "branch": "main", "commit": "d2a3d1da007549c921f7b0e22521d1c20d09c8a7" },
+ "SchemaStore.nvim": { "branch": "main", "commit": "686687585c040529f7efa68aa433282068c9d78b" },
"cellular-automaton.nvim": { "branch": "main", "commit": "b7d056dab963b5d3f2c560d92937cb51db61cb5b" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
@@ -15,61 +15,61 @@
"cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" },
"cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
- "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
- "conform.nvim": { "branch": "master", "commit": "8f86444d62fc4f012a56732b8fb2c595e1e21fde" },
- "dressing.nvim": { "branch": "master", "commit": "c1e1d5fa44fe08811b6ef4aadac2b50e602f9504" },
+ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
+ "conform.nvim": { "branch": "master", "commit": "1281e26948fc06994e0e0cdcaafdd9bbd28929e7" },
+ "dressing.nvim": { "branch": "master", "commit": "1f2d1206a03bd3add8aedf6251e4534611de577f" },
"ferris.nvim": { "branch": "main", "commit": "2ba71012d108dd630ef33681c767a8462709cd90" },
"git-conflict.nvim": { "branch": "main", "commit": "896261933afe2fddf6fb043d9cd4d88301b151a9" },
"gitsigns.nvim": { "branch": "main", "commit": "bb808fc7376ed7bac0fbe8f47b83d4bf01738167" },
- "gruvbox.nvim": { "branch": "main", "commit": "fc2b7df3d8384e1ba32d0c5d515931f5ea366eb1" },
- "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" },
- "lazy.nvim": { "branch": "main", "commit": "3ad55ae678876516156cca2f361c51f7952a924b" },
- "mason-lspconfig.nvim": { "branch": "main", "commit": "f014db32437aa61c86fc0ef1067cd2bc6a37205c" },
- "mason-nvim-dap.nvim": { "branch": "main", "commit": "e4d56b400e9757b1dc77d620fd3069396e92d5fc" },
+ "gruvbox.nvim": { "branch": "main", "commit": "477c62493c82684ed510c4f70eaf83802e398898" },
+ "indent-blankline.nvim": { "branch": "master", "commit": "29be0919b91fb59eca9e90690d76014233392bef" },
+ "lazy.nvim": { "branch": "main", "commit": "16603c6917435d8446f7357cb61095138a417085" },
+ "mason-lspconfig.nvim": { "branch": "main", "commit": "bbc7d7709ea6aa85add78b745b2439f18b0bc240" },
+ "mason-nvim-dap.nvim": { "branch": "main", "commit": "f0cd12f7a8a310c58cecebddb6b219ffad1cfd0f" },
"mason-update-all": { "branch": "main", "commit": "007a4085fe5e830b9139313652e1553bf1a9b857" },
- "mason.nvim": { "branch": "main", "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" },
+ "mason.nvim": { "branch": "main", "commit": "eabf6d347fdb75be360d4c0ced1145670a171453" },
"neoconf.nvim": { "branch": "main", "commit": "00dcf2b81c45de1768b4171faa16729f0888cfb8" },
- "neodev.nvim": { "branch": "main", "commit": "e9dd1535759794635a951644c183beb327879407" },
+ "neodev.nvim": { "branch": "main", "commit": "80487e4f7bfa11c2ef2a1b461963db019aad6a73" },
"neotest": { "branch": "master", "commit": "901891484db3d46ce43d56871273dc7d40621356" },
"neotest-go": { "branch": "main", "commit": "1a15e1136db43775214a3e7a598f8930c29c94b7" },
"neotest-plenary": { "branch": "master", "commit": "dcaf5ed67a9e28a246e9783319e5aa6c9ea1c584" },
"neotest-python": { "branch": "master", "commit": "81d2265efac717bb567bc15cc652ae10801286b3" },
"neotest-rust": { "branch": "main", "commit": "03e036a310379f132d4e39387e9076396132ce3f" },
- "noice.nvim": { "branch": "main", "commit": "791c7adda821fd03529f995df2ee284ad591dabd" },
- "nui.nvim": { "branch": "main", "commit": "c8de23342caf8d50b15d6b28368d36a56a69d76f" },
- "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
+ "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" },
+ "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" },
+ "nvim-cmp": { "branch": "main", "commit": "51260c02a8ffded8e16162dcf41a23ec90cfba62" },
"nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" },
- "nvim-dap": { "branch": "master", "commit": "b3d4408e29d924fe130c9397a7c3b3630b3ea671" },
- "nvim-dap-go": { "branch": "main", "commit": "1b508e9db330108d3b5d62a6d9cc01fe6bbdd4e0" },
+ "nvim-dap": { "branch": "master", "commit": "4048f37bc8b1a36fe1f5fde0df7d84aef71380e4" },
+ "nvim-dap-go": { "branch": "main", "commit": "a5cc8dcad43f0732585d4793deb02a25c4afb766" },
"nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" },
"nvim-dap-repl-highlights": { "branch": "master", "commit": "97a2b322c05cf945c5aabaad5e599a20b25e77d9" },
"nvim-dap-virtual-text": { "branch": "master", "commit": "57f1dbd0458dd84a286b27768c142e1567f3ce3b" },
- "nvim-jdtls": { "branch": "master", "commit": "3ca419c52a7c20a2565237db2c110ed68fc7e6f1" },
- "nvim-lint": { "branch": "master", "commit": "1065763f115a7765ef237347ad676ba348d7193a" },
- "nvim-lspconfig": { "branch": "master", "commit": "4266f9bb36b4fb09edd19b67d95043cf7ff88ddf" },
- "nvim-notify": { "branch": "master", "commit": "94859430020f5cf32a1b97ddd9e596fed9db7981" },
+ "nvim-jdtls": { "branch": "master", "commit": "503a399e0d0b5d432068ab5ae24b9848891b0d53" },
+ "nvim-lint": { "branch": "master", "commit": "8d2bd9a2d1f0b41c96dfa0c998cc22ba152935ed" },
+ "nvim-lspconfig": { "branch": "master", "commit": "d0467b9574b48429debf83f8248d8cee79562586" },
+ "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" },
"nvim-texlabconfig": { "branch": "master", "commit": "b817297fd07bd6c127df56d01f439f2f838c49ed" },
- "nvim-treesitter": { "branch": "master", "commit": "fc93fa5c07df7cd578a3ea82d7c075c0460a6884" },
- "nvim-treesitter-context": { "branch": "master", "commit": "b6c763db8cc486215ba96e0a67418848a710ab25" },
- "nvim-treesitter-textobjects": { "branch": "master", "commit": "bd103502252027434ec42f628d2dbf54821d4ce6" },
- "nvim-ts-context-commentstring": { "branch": "main", "commit": "95e9ba9de4289d221666b66fd930d157c7ca08c6" },
+ "nvim-treesitter": { "branch": "master", "commit": "c5a7533113b2deb7db899d387b877389cc8b6113" },
+ "nvim-treesitter-context": { "branch": "master", "commit": "2806d83e3965017382ce08792ee527e708fa1bd4" },
+ "nvim-treesitter-textobjects": { "branch": "master", "commit": "e69a504baf2951d52e1f1fbb05145d43f236cbf1" },
+ "nvim-ts-context-commentstring": { "branch": "main", "commit": "92e688f013c69f90c9bbd596019ec10235bc51de" },
"nvim-ts-hint-textobject": { "branch": "master", "commit": "5a28bff46c05d28bdb4bcaef67e046eb915a9390" },
"oil.nvim": { "branch": "master", "commit": "956d7fc89b0bd1f9ea6515ca10c1e2a293e4d8fd" },
"peek.nvim": { "branch": "master", "commit": "67752e7581f88da6899838985a05705b008e4185" },
- "plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" },
+ "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
"presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
"pretty-fold.nvim": { "branch": "master", "commit": "a7d8b424abe0eedf50116c460fbe6dfd5783b1d5" },
- "refactoring.nvim": { "branch": "master", "commit": "be6505be8bdd306646bb81399312c02927a60a51" },
- "statuscol.nvim": { "branch": "main", "commit": "0944234914438695050eec6f83b4669864680c1a" },
+ "refactoring.nvim": { "branch": "master", "commit": "5831194debd23920a32abd9fefd5dddba44e34fc" },
+ "statuscol.nvim": { "branch": "main", "commit": "98d02fc90ebd7c4674ec935074d1d09443d49318" },
"telescope-dap.nvim": { "branch": "master", "commit": "4e2d5efb92062f0b865fe59b200b5ed7793833bf" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
"telescope-live-grep-args.nvim": { "branch": "master", "commit": "851c0997d55601f2afd7290db0f90dc364e29f58" },
"telescope-symbols.nvim": { "branch": "master", "commit": "f2060117d965df4a626f068a4ebbd8ee051aa076" },
"telescope-undo.nvim": { "branch": "main", "commit": "3dec002ea3e7952071d26fbb5d01e2038a58a554" },
- "telescope.nvim": { "branch": "master", "commit": "40c8d2fc2b729dd442eda093cf8c9496d6e23732" },
- "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" },
- "tokyonight.nvim": { "branch": "main", "commit": "9a01eada39558dc3243278e6805d90e8dff45dc0" },
+ "telescope.nvim": { "branch": "master", "commit": "4522d7e3ea75ffddabdc39957168a8a7060b5df0" },
+ "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" },
+ "tokyonight.nvim": { "branch": "main", "commit": "f247ee700b569ed43f39320413a13ba9b0aef0db" },
"vim-hjson": { "branch": "master", "commit": "adc104d4a4041a482e1af1914895a119e343c7e1" },
"vim-tridactyl": { "branch": "master", "commit": "fdd069bde3a34c786abed4601b6d59a065590ad9" },
- "virt-column.nvim": { "branch": "master", "commit": "5fc72873dc3175eddbdbbedea8071919c99ad755" }
+ "virt-column.nvim": { "branch": "master", "commit": "9c82009c53e5f9d43b6c0f5e8cb69c53663b786a" }
} \ No newline at end of file
diff --git a/nvim/.config/nvim/lua/plugins/conform.lua b/nvim/.config/nvim/lua/plugins/conform.lua
index 2d2deb4..37eee44 100644
--- a/nvim/.config/nvim/lua/plugins/conform.lua
+++ b/nvim/.config/nvim/lua/plugins/conform.lua
@@ -4,6 +4,8 @@ local M = {
version = "*",
event = "BufReadPre",
opts = {
+ format_on_save = false,
+ format_after_save = false,
formatters_by_ft = {
lua = { "stylua" },
css = { "prettier" },
@@ -17,9 +19,10 @@ local M = {
scss = { "prettier" },
sh = { "shfmt" },
},
- format_on_save = false,
- format_after_save = false,
formatters = {
+ prettier = {
+ prepend_args = { "--prose-wrap", "always" },
+ },
cbfmt = {
command = "cbfmt",
args = {
@@ -48,9 +51,4 @@ function M:init()
end, { desc = "format" })
end
-function M:config(opts)
- require("conform.util").add_formatter_args(require("conform.formatters.prettier"), { "--prose-wrap", "always" })
- require("conform").setup(opts)
-end
-
return M
diff --git a/nvim/.config/nvim/lua/plugins/dressing.lua b/nvim/.config/nvim/lua/plugins/dressing.lua
index 760c1ec..e9fa349 100644
--- a/nvim/.config/nvim/lua/plugins/dressing.lua
+++ b/nvim/.config/nvim/lua/plugins/dressing.lua
@@ -4,38 +4,7 @@ local M = {
dependencies = {
"nvim-telescope/telescope.nvim",
},
- opts = {
- input = {
- get_config = function(opts)
- if opts.kind == "cmd" then
- return {
- relative = "win",
- insert_only = false,
- }
- end
- end,
- },
- select = {
- get_config = function(opts)
- if opts.kind == "Ring history" then
- return {
- telescope = require("telescope.themes").get_dropdown({ preview = true }),
- }
- end
- end,
- format_item_override = {
- ["rust-tools/debuggables"] = function(item)
- item = item:gsub(" %-%-no%-run", "")
- item = item:gsub(" %-%-package", " -p")
- item = item:gsub(" %-%-all%-features", "")
- item = item:gsub(" %-%-all%-targets", "")
- item = item:gsub(" %-%-exact", "")
- item = item:gsub(" %-%-nocapture", "")
- return item
- end,
- },
- },
- },
+ opts = {},
}
function M.init()
diff --git a/nvim/.config/nvim/lua/plugins/gruvbox.lua b/nvim/.config/nvim/lua/plugins/gruvbox.lua
index d92d227..87811ae 100644
--- a/nvim/.config/nvim/lua/plugins/gruvbox.lua
+++ b/nvim/.config/nvim/lua/plugins/gruvbox.lua
@@ -6,17 +6,10 @@ local M = {
contrast = "hard",
transparent_mode = true,
overrides = {
- DiffDelete = { reverse = false },
- DiffAdd = { reverse = false },
- DiffChange = { reverse = false },
- DiffText = { reverse = false },
- IndentContext1 = { link = "GruvboxRed" },
- IndentContext2 = { link = "GruvboxOrange" },
- IndentContext3 = { link = "GruvboxYellow" },
- IndentContext4 = { link = "GruvboxGreen" },
- IndentContext5 = { link = "GruvboxAqua" },
- IndentContext6 = { link = "GruvboxBlue" },
- IndentContext7 = { link = "GruvboxPurple" },
+ DiffDelete = { link = "GruvboxRed" },
+ DiffAdd = { link = "GruvboxGreen" },
+ DiffChange = { link = "GruvboxAqua" },
+ DiffText = { link = "GruvboxYellow" },
},
},
}
diff --git a/nvim/.config/nvim/lua/plugins/indent_blankline.lua b/nvim/.config/nvim/lua/plugins/indent_blankline.lua
index 1dcfcd3..0cd6c03 100644
--- a/nvim/.config/nvim/lua/plugins/indent_blankline.lua
+++ b/nvim/.config/nvim/lua/plugins/indent_blankline.lua
@@ -3,32 +3,13 @@ local M = {
"lukas-reineke/indent-blankline.nvim",
version = "*",
event = "BufReadPre",
+ main = "ibl",
opts = {
- context_highlight_list = {
- "IndentContext1",
- "IndentContext2",
- "IndentContext3",
- "IndentContext4",
- "IndentContext5",
- "IndentContext6",
- "IndentContext7",
+ scope = {
+ show_start = false,
+ show_end = false,
},
- space_char_blankline = " ",
- show_end_of_line = true,
- show_current_context = true,
- use_treesitter = true,
- use_treesitter_scope = true,
},
}
-function M.init()
- vim.api.nvim_set_hl(0, "IndentContext1", { fg = "Red", default = true })
- vim.api.nvim_set_hl(0, "IndentContext2", { fg = "Brown", default = true })
- vim.api.nvim_set_hl(0, "IndentContext3", { fg = "Yellow", default = true })
- vim.api.nvim_set_hl(0, "IndentContext4", { fg = "Green", default = true })
- vim.api.nvim_set_hl(0, "IndentContext5", { fg = "Cyan", default = true })
- vim.api.nvim_set_hl(0, "IndentContext6", { fg = "Blue", default = true })
- vim.api.nvim_set_hl(0, "IndentContext7", { fg = "Magenta", default = true })
-end
-
return M
diff --git a/nvim/.config/nvim/lua/plugins/nvim-lint.lua b/nvim/.config/nvim/lua/plugins/nvim-lint.lua
index dad3a62..d8a8640 100644
--- a/nvim/.config/nvim/lua/plugins/nvim-lint.lua
+++ b/nvim/.config/nvim/lua/plugins/nvim-lint.lua
@@ -9,10 +9,49 @@ local M = {
lua = { "selene" },
markdown = { "markdownlint" },
},
+ linters = {
+ markdownlint = {
+ config = "markdownlint.yaml",
+ },
+ selene = {
+ config = "selene.toml",
+ },
+ },
},
}
+local function prepend(tbl, items)
+ for i, arg in ipairs(items or {}) do
+ table.insert(tbl, i, arg)
+ end
+ return tbl
+end
+
+local function with_config(args, filename)
+ return prepend(args, {
+ function()
+ local config = unpack(vim.fs.find(filename, {
+ path = vim.api.nvim_buf_get_name(0),
+ upward = true,
+ })) or ("%s/%s"):format(vim.fs.basename(filename), filename)
+ return vim.fn.filereadable(config) == 1 and string.format("--config=%s", config) or ""
+ end,
+ })
+end
+
function M:init()
+ local linters = self.opts.linters or {}
+ self.opts.linters = setmetatable({}, {
+ __index = function(t, k)
+ local ok, linter = pcall(require, "lint.linters." .. k)
+ if ok and linters[k] then
+ t[k] = vim.tbl_extend("force", { args = {} }, linter, linters[k] or {})
+ prepend(with_config(t[k].args, t[k].config), t[k].prepend_args)
+ end
+ return t[k]
+ end,
+ })
+
vim.api.nvim_create_autocmd({ "BufWritePost", "BufReadPost", "InsertLeave" }, {
callback = function()
require("lint").try_lint()
@@ -21,25 +60,7 @@ function M:init()
end
function M:config(opts)
- local markdownlint = require("lint").linters.markdownlint
- markdownlint.args = {
- "--config",
- ("%s/markdownlint/markdownlint.yaml"):format(vim.env.XDG_CONFIG_HOME),
- }
-
- local selene = require("lint").linters.selene
- selene.args = {
- "--display-style",
- "json",
- function()
- local config = vim.fs.find({ "selene.toml" }, { path = vim.api.nvim_buf_get_name(0), upward = true })
- if #config > 0 then
- return string.format("--config=%s", config[1])
- end
- end,
- "-",
- }
-
+ require("lint").linters = opts.linters
require("lint").linters_by_ft = opts.linters_by_ft
end
diff --git a/nvim/.config/nvim/lua/plugins/treesitter.lua b/nvim/.config/nvim/lua/plugins/treesitter.lua
index 16676ed..66f4be6 100644
--- a/nvim/.config/nvim/lua/plugins/treesitter.lua
+++ b/nvim/.config/nvim/lua/plugins/treesitter.lua
@@ -15,14 +15,8 @@ local M = {
dependencies = {
"nvim-treesitter/nvim-treesitter-textobjects",
"mfussenegger/nvim-ts-hint-textobject",
- {
- "LiadOz/nvim-dap-repl-highlights",
- config = true,
- },
- {
- "JoosepAlviste/nvim-ts-context-commentstring",
- config = true,
- },
+ { "LiadOz/nvim-dap-repl-highlights", opts = {} },
+ { "JoosepAlviste/nvim-ts-context-commentstring", opts = {} },
},
main = "nvim-treesitter.configs",
opts = {
@@ -124,11 +118,6 @@ local M = {
},
context_commentstring = {
enable = true,
- enable_autocmd = false,
- config = {
- c = "// %s",
- lua = "-- %s",
- },
},
},
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-09-20 06:29:35 +0000