DavidOnTop/nvim
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

IDFK

Browse source
This commit is contained in:
davidontop 2024-04-18 19:17:22 +02:00
parent ac6ba45b85
commit b053b742ab
Signed by: DavidOnTop
GPG key ID: 5D05538A45D5149F
11 changed files with 195 additions and 178 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
after/init.lua
View file

@ -4,11 +4,10 @@ vim.opt.relativenumber = true
vim.opt.cursorline = true vim.opt.cursorline = true
vim.opt.cursorcolumn = true -- vim.cmd[[
vim.cmd[[ -- highlight CursorColumn guibg=none ctermbg=none
highlight CursorColumn guibg=none ctermbg=none -- highlight link CursorColumn CursorLine
highlight link CursorColumn CursorLine -- ]]
]]
-- fixmap -- fixmap
vim.cmd[[ vim.cmd[[
@ -27,9 +26,3 @@ vim.opt.relativenumber = true
vim.opt.cursorline = true vim.opt.cursorline = true
vim.opt.cursorcolumn = true
vim.cmd[[
highlight CursorColumn guibg=none ctermbg=none
highlight link CursorColumn CursorLine
]]

64
after/plugin/lsp.lua
View file

@ -85,17 +85,6 @@ local on_attach = function(client, bufnr)
end end
local servers = { local servers = {
clangd = {},
rust_analyzer = {
cargo = {
allFeatures = true,
},
inlayHints = {
closyreCaptureHints = {
enable = true,
},
},
},
-- sumneko_lua = { -- sumneko_lua = {
-- Lua = { -- Lua = {
-- workspace = { checkThirdParty = false }, -- workspace = { checkThirdParty = false },
@ -106,6 +95,7 @@ local servers = {
local capabilities = vim.lsp.protocol.make_client_capabilities() local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities) capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
capabilities.offsetEncoding = { "utf-16" } -- fix copilot
require('mason').setup() require('mason').setup()
require("mason-nvim-dap").setup({automatic_installation = true, handlers = { require("mason-nvim-dap").setup({automatic_installation = true, handlers = {
@ -127,27 +117,63 @@ mason_lspconfig.setup_handlers {
end, end,
} }
require("lspconfig").zls.setup{ require("lspconfig").rust_analyzer.setup{
cmd = {"zls"}, capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
settings = {
-- ["rust-analyzer"] = {
cargo = {
features = "all"
},
inlayHints = {
closyreCaptureHints = {
enable = true,
},
},
check = {
command = "clippy",
features = "all",
},
imports = {
preferPrelude = true,
}
-- },
},
} }
require("lspconfig").sourcekit.setup{ require("lspconfig").zls.setup{
--cmd = {"sourcekit-lsp"}, cmd = {"zls"},
on_attach = on_attach, on_attach = on_attach,
} }
require("lspconfig").tailwindcss.setup { require("lspconfig").tailwindcss.setup {
filetypes = { filetypes = {
"astro", "astro-markdown", "clojure", "django-html", "htmldjango", "edge", "eelixir", "elixir", "ejs", "erb", "eruby", "gohtml", "haml", "handlebars", "hbs", "html", "html-eex", "heex", "jade", "leaf", "liquid", "markdown", "mdx", "mustache", "njk", "nunjucks", "php", "razor", "slim", "twig", "css", "less", "postcss", "sass", "scss", "stylus", "sugarss", "javascript", "javascriptreact", "reason", "rescript", "typescript", "typescriptreact", "vue", "svelte", "astro", "astro-markdown", "clojure", "django-html", "htmldjango", "edge", "eelixir", "elixir", "ejs", "erb", "eruby", "gohtml", "haml", "handlebars", "hbs", "html", "html-eex", "heex", "jade", "leaf", "liquid", "markdown", "mdx", "mustache", "njk", "nunjucks", "php", "razor", "slim", "twig", "css", "less", "postcss", "sass", "scss", "stylus", "sugarss", "javascript", "javascriptreact", "reason", "rescript", "typescript", "typescriptreact", "vue", "svelte",
"rust", "rust", "fsharp",
}, },
init_options = { init_options = {
userLanguages = { userLanguages = {
rust = "html", rust = "html",
fsharp = "html",
}, },
}, },
root_dir = require("lspconfig").util.root_pattern("tailwind.config.js", "tailwind.config.ts"), root_dir = require("lspconfig").util.root_pattern("tailwind.config.cjs", "tailwind.config.mjs", "tailwind.config.js", "tailwind.config.ts"),
settings = {
tailwindCSS = {
--files = {exclude = ""},
classAttributes = { "class", "className", "class:list", "classList", "ngClass", "classes" },
lint = {
cssConflict = "warning",
invalidApply = "error",
invalidConfigPath = "error",
invalidScreen = "error",
invalidTailwindDirective = "error",
invalidVariant = "error",
recommendedVariantOrder = "warning"
},
validate = true
}
}
} }
-- lspinfo -- lspinfo
@ -212,3 +238,7 @@ vim.diagnostic.config({
update_in_insert = true, update_in_insert = true,
virtual_text = true, virtual_text = true,
}) })
require("luasnip.loaders.from_vscode").lazy_load()
require("luasnip.loaders.from_snipmate").lazy_load()

14
after/plugin/none-ls.lua Normal file
View file

@ -0,0 +1,14 @@
local null_ls = require("null-ls")
null_ls.setup({
sources = {
null_ls.builtins.formatting.stylua,
null_ls.builtins.formatting.shfmt,
null_ls.builtins.formatting.prettier,
null_ls.builtins.code_actions.gitsigns,
--null_ls.builtins.completion.luasnip,
null_ls.builtins.diagnostics.buf,
null_ls.builtins.formatting.biome,
null_ls.builtins.formatting.buf,
null_ls.builtins.formatting.fantomas,
}
})

130
lazy-lock.json
View file

@ -1,95 +1,93 @@
{ {
"Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
"LuaSnip": { "branch": "master", "commit": "954c81b53989097faaff0fabc11c29575288c3e1" }, "Ionide-vim": { "branch": "master", "commit": "d94dd8f0e34fe230bd84d930f63732619163ab6e" },
"catppuccin": { "branch": "main", "commit": "988c0b2dde4140572ed37c6b8b5d5deac0219f9f" }, "LspUI.nvim": { "branch": "legacy", "commit": "a9447e0131c4e34b3003f5da4a3026da49fb0db2" },
"LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
"catppuccin": { "branch": "main", "commit": "a1439ad7c584efb3d0ce14ccb835967f030450fe" },
"close-buffers.nvim": { "branch": "master", "commit": "3acbcad1211572342632a6c0151f839e7dead27f" }, "close-buffers.nvim": { "branch": "master", "commit": "3acbcad1211572342632a6c0151f839e7dead27f" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
"cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
"color-picker.nvim": { "branch": "master", "commit": "06cb5f853535dea529a523e9a0e8884cdf9eba4d" }, "color-picker.nvim": { "branch": "master", "commit": "06cb5f853535dea529a523e9a0e8884cdf9eba4d" },
"copilot.lua": { "branch": "master", "commit": "38a41d0d78f8823cc144c99784528b9a68bdd608" },
"crates.nvim": { "branch": "main", "commit": "1dffccc0a95f656ebe00cacb4de282473430c5a1" }, "crates.nvim": { "branch": "main", "commit": "1dffccc0a95f656ebe00cacb4de282473430c5a1" },
"dressing.nvim": { "branch": "master", "commit": "8b7ae53d7f04f33be3439a441db8071c96092d19" }, "editorconfig-vim": { "branch": "master", "commit": "8b7da79e9daee7a3f3a8d4fe29886b9756305aff" },
"editorconfig-vim": { "branch": "master", "commit": "95cb75e21d11206dad4bd3895c99459bdaa13dd1" }, "fidget.nvim": { "branch": "main", "commit": "1ba38e4cbb24683973e00c2e36f53ae64da38ef5" },
"fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" },
"friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, "gitsigns.nvim": { "branch": "main", "commit": "7e38f07cab0e5387f9f41e92474db174a63a4725" },
"gitsigns.nvim": { "branch": "main", "commit": "e93a158b8773946dc9940a4321d35c1b52c8e293" }, "go.nvim": { "branch": "master", "commit": "591a0b837420f27c734600fa5c6de87f18352e50" },
"go.nvim": { "branch": "master", "commit": "7b7c20029a817ef51f6b498388488e9850fe45ac" }, "gruvbox-baby": { "branch": "main", "commit": "bd52e62d8134647090108189e69c8b3cd18bdbbf" },
"gruvbox-baby": { "branch": "main", "commit": "be47338877e0536360290d66d26854e90dbc0004" }, "guihua.lua": { "branch": "master", "commit": "3b3126ae87c254f6849e708549ba76c39e3f42f8" },
"guihua.lua": { "branch": "master", "commit": "9fb6795474918b492d9ab01b1ebaf85e8bf6fe0b" }, "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
"harpoon": { "branch": "master", "commit": "867e212ac153e793f95b316d1731f3ca1894625e" }, "heirline.nvim": { "branch": "master", "commit": "03cff30d7e7d3ba6fdc00925f015822f79cef908" },
"heirline.nvim": { "branch": "master", "commit": "170e1b1fd7c11db00e46d802165fb277db601ae7" },
"hop.nvim": { "branch": "master", "commit": "1a1eceafe54b5081eae4cb91c723abd1d450f34b" }, "hop.nvim": { "branch": "master", "commit": "1a1eceafe54b5081eae4cb91c723abd1d450f34b" },
"indent-blankline.nvim": { "branch": "master", "commit": "7206c77cb931f79885fc47f88ae18f99148392eb" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
"kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, "kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" },
"lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" },
"lsp-inlayhints.nvim": { "branch": "main", "commit": "d981f65c9ae0b6062176f0accb9c151daeda6f16" }, "lsp-inlayhints.nvim": { "branch": "main", "commit": "d981f65c9ae0b6062176f0accb9c151daeda6f16" },
"lsp-lens.nvim": { "branch": "main", "commit": "48bb1a7e271424c15f3d588d54adc9b7c319d977" }, "lsp-lens.nvim": { "branch": "main", "commit": "48bb1a7e271424c15f3d588d54adc9b7c319d977" },
"lsp_signature.nvim": { "branch": "master", "commit": "fed2c8389c148ff1dfdcdca63c2b48d08a50dea0" }, "lsp_signature.nvim": { "branch": "master", "commit": "c6aeb2f1d2538bbdfdaab1664d9d4c3c75aa9db8" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "9453e3d6cd2ca45d96e20f343e8f1b927364b630" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "44509689b9bf3984d729cc264aacb31cb7f41668" },
"mason-nvim-dap.nvim": { "branch": "main", "commit": "5b4db7c0d6873436b42bcda0ba7cd4efa9206745" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" },
"mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" },
"mellow.nvim": { "branch": "main", "commit": "6e5845571d4543b282cf915f2410c5b77064c014" }, "melange-nvim": { "branch": "master", "commit": "5feb4a08876b81ccb61cae1adaffa2e737124922" },
"mini.nvim": { "branch": "main", "commit": "6b84d4f83597260fd18a0af1939317e0e424ac39" }, "mellow.nvim": { "branch": "main", "commit": "52c3571fa8c2e7faec09e0fb3da56fca89576297" },
"mini.nvim": { "branch": "main", "commit": "e623d29561746637b49d30d6434338f88f44e856" },
"minimal.nvim": { "branch": "main", "commit": "22d837b814d3bd22625640ef63cc73b8507f291d" }, "minimal.nvim": { "branch": "main", "commit": "22d837b814d3bd22625640ef63cc73b8507f291d" },
"monokai-pro.nvim": { "branch": "master", "commit": "0e5c5ee732540604a2714849a1a1d66a2a43988a" }, "monokai-pro.nvim": { "branch": "master", "commit": "aafde73a622435891d36b411d8623e705ead6293" },
"neo-tree.nvim": { "branch": "v2.x", "commit": "80dc74d081823649809f78370fa5b204aa9a853a" }, "neo-tree.nvim": { "branch": "v2.x", "commit": "80dc74d081823649809f78370fa5b204aa9a853a" },
"neodev.nvim": { "branch": "main", "commit": "c4ce017bd4bacf60bf59330cec9e93c5d5e104a6" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" },
"neoscroll.nvim": { "branch": "master", "commit": "e85740d1a54ab0f10127b08c67a291053bc3acfa" }, "neoscroll.nvim": { "branch": "master", "commit": "c48f15b11877df2cfc5c39666fb8a2524df13bec" },
"nightfox.nvim": { "branch": "main", "commit": "eb82712f86319272f4b7b9dbb4ec6df650e6987f" }, "nightfox.nvim": { "branch": "main", "commit": "ce0cdf8538c8c0b9c8fb2884d3d1090c8faf515d" },
"nui.nvim": { "branch": "main", "commit": "c9b4de623d19a85b353ff70d2ae9c77143abe69c" }, "none-ls.nvim": { "branch": "main", "commit": "63457547ffb7c7223d0f91feb1145393cc7b6728" },
"nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" },
"numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" }, "numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" },
"nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" }, "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" },
"nvim-bqf": { "branch": "main", "commit": "bdc2a4e5bb670b3c0e33ada9c0eec636d93a0748" }, "nvim-bqf": { "branch": "main", "commit": "52703d7adc3be3f7c09eea9a80c5b8caa615fb25" },
"nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, "nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" },
"nvim-dap": { "branch": "master", "commit": "d7749eb3d9933a75d2244820308ce442f646c7ae" }, "nvim-dap": { "branch": "master", "commit": "6ae8a14828b0f3bff1721a35a1dfd604b6a933bb" },
"nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" }, "nvim-dap-ui": { "branch": "master", "commit": "f7d75cca202b52a60c520ec7b1ec3414d6e77b0f" },
"nvim-dap-virtual-text": { "branch": "master", "commit": "57f1dbd0458dd84a286b27768c142e1567f3ce3b" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "3e8e207513e6ef520894950acd76b79902714103" },
"nvim-jdtls": { "branch": "master", "commit": "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8" }, "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" },
"nvim-lspconfig": { "branch": "master", "commit": "6c797ff9324094e333e2ace9526ca4a62ad9d1ca" }, "nvim-lspconfig": { "branch": "master", "commit": "9eb6d866840df0f3fb1d2e8f34a7e0cfdf80f980" },
"nvim-navbuddy": { "branch": "master", "commit": "f137a3466a6cd1965cdcc5398daff54e66eebbe5" }, "nvim-navbuddy": { "branch": "master", "commit": "f34237e8a41ebc6e2716af2ebf49854d8c5289c8" },
"nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
"nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
"nvim-surround": { "branch": "main", "commit": "633a0ab03159569a66b65671b0ffb1a6aed6cf18" }, "nvim-surround": { "branch": "main", "commit": "a4e30d33add8a9743b4f518b3a788b3c8e5def71" },
"nvim-treesitter": { "branch": "master", "commit": "f861bc6148e7bc715f6a09bd34bb1f577b62a248" }, "nvim-treesitter": { "branch": "master", "commit": "208d504421e4ac53f4230a34cd4b831e8e76cb69" },
"nvim-treesitter-context": { "branch": "master", "commit": "bf4d15ee4e96ff5201f16a4ed14443670662eb90" }, "nvim-treesitter-context": { "branch": "master", "commit": "e6e71047bb323fb36f5664993a42adaac252bb36" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "ec1c5bdb3d87ac971749fa6c7dbc2b14884f1f6a" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c" },
"nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
"nvim-web-devicons": { "branch": "master", "commit": "5efb8bd06841f91f97c90e16de85e96d57e9c862" }, "nvim-web-devicons": { "branch": "master", "commit": "b3468391470034353f0e5110c70babb5c62967d3" },
"oh-lucy.nvim": { "branch": "main", "commit": "706c74fe8dcc2014dc17bbc861a05d27623e06e3" }, "oh-lucy.nvim": { "branch": "main", "commit": "b53f8c8735ca7e788994147bfa10eb04331eaf7c" },
"one_monokai.nvim": { "branch": "main", "commit": "73d9af8029a02844f61f46165f896d8b231217b6" }, "one_monokai.nvim": { "branch": "main", "commit": "bafc4e9ed069e47439cce077592aefb126da2bfa" },
"playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" }, "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
"plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" },
"popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
"pretty-fold.nvim": { "branch": "master", "commit": "a7d8b424abe0eedf50116c460fbe6dfd5783b1d5" }, "pretty-fold.nvim": { "branch": "master", "commit": "a7d8b424abe0eedf50116c460fbe6dfd5783b1d5" },
"rainbow_csv.nvim": { "branch": "main", "commit": "a520dabf1c74d7d7d8341dd3f3570063ef51b3aa" }, "rainbow_csv.nvim": { "branch": "main", "commit": "5033e3abd4fb0a0ee07232530a032296535704b4" },
"rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" }, "rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" },
"sonokai": { "branch": "master", "commit": "bdce098fc9e7202d3c555e2dc98c755ca1c23835" }, "sonokai": { "branch": "master", "commit": "da162343354fbd9bf9cd49293a856f0e3761e8ac" },
"sort.nvim": { "branch": "main", "commit": "c789da6968337d2a61104a929880b5f144e02855" }, "sort.nvim": { "branch": "main", "commit": "c789da6968337d2a61104a929880b5f144e02855" },
"suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "suda.vim": { "branch": "master", "commit": "04469d855e36fffcda6be036eb7ff005f64fa0d6" },
"swift": { "branch": "main", "commit": "43d8c37f8184128cd1c6368bb55022484767d92a" }, "telescope-dap.nvim": { "branch": "master", "commit": "8c88d9716c91eaef1cdea13cb9390d8ef447dbfe" },
"telescope-dap.nvim": { "branch": "master", "commit": "4e2d5efb92062f0b865fe59b200b5ed7793833bf" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope.nvim": { "branch": "0.1.x", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" },
"telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
"templ.vim": { "branch": "main", "commit": "5cc48b93a4538adca0003c4bc27af844bb16ba24" }, "templ.vim": { "branch": "main", "commit": "5cc48b93a4538adca0003c4bc27af844bb16ba24" },
"todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" }, "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" },
"toggleterm.nvim": { "branch": "main", "commit": "cbd041d91b90cd3c02df03fe6133208888f8e008" }, "toggleterm.nvim": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" },
"tokyodark.nvim": { "branch": "master", "commit": "4bfb42924274abc5de9f5f4779075b77c6112c85" }, "tokyodark.nvim": { "branch": "master", "commit": "fa25db55c4ce361363a2dcd4ff20daab39a96e47" },
"transparent.nvim": { "branch": "main", "commit": "fd35a46f4b7c1b244249266bdcb2da3814f01724" }, "transparent.nvim": { "branch": "main", "commit": "fd35a46f4b7c1b244249266bdcb2da3814f01724" },
"tree-sitter-just": { "branch": "main", "commit": "4e5f5f3ff37b12a1bbf664eb3966b3019e924594" }, "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
"undotree": { "branch": "master", "commit": "36ff7abb6b60980338344982ad4cdf03f7961ecd" }, "vim-dadbod": { "branch": "master", "commit": "960bbb7de11b7282a68d579a64e838b487934493" },
"vim-cmake": { "branch": "master", "commit": "d7fd95efff39d58bd2f8dc8113ec4380fa50c1d8" },
"vim-dadbod": { "branch": "master", "commit": "738cfc2ea6a1510fe23cba9006fef9291be70f7b" },
"vim-dadbod-completion": { "branch": "master", "commit": "c920cb0ba3dff4b1b0ed373e1c0b3007dec696c2" }, "vim-dadbod-completion": { "branch": "master", "commit": "c920cb0ba3dff4b1b0ed373e1c0b3007dec696c2" },
"vim-dadbod-ui": { "branch": "master", "commit": "9ddb0623e69d696b7a8355b93e3950a8dc6e00a0" }, "vim-dadbod-ui": { "branch": "master", "commit": "066922699bdf1c6e14d517b844454b12b93ce25a" },
"vim-glsl": { "branch": "master", "commit": "bfd330a271933c3372fcfa8ce052970746c8e9dd" }, "vim-glsl": { "branch": "master", "commit": "bfd330a271933c3372fcfa8ce052970746c8e9dd" },
"vim-racer": { "branch": "master", "commit": "d1aead98a936cd8165b3329511d7c987226eb3a6" }, "vim-racer": { "branch": "master", "commit": "d1aead98a936cd8165b3329511d7c987226eb3a6" },
"vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
"vim-visual-multi": { "branch": "master", "commit": "aec289a9fdabaa0ee6087d044d75b32e12084344" }, "vim-slint": { "branch": "main", "commit": "9badce3860297562bb5e80ba1666628f9e0ac632" },
"vim-visual-multi": { "branch": "master", "commit": "e2ff111f123da6cf97f95b96b10eb95854f953c9" },
"which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
"wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" }, "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" },
"zig-tools.nvim": { "branch": "master", "commit": "78a85278fe5d480da2f01df4db898757d7e953b5" },
"zig.vim": { "branch": "master", "commit": "54c216e5306a5c3878a60596aacb94dca8652ab9" } "zig.vim": { "branch": "master", "commit": "54c216e5306a5c3878a60596aacb94dca8652ab9" }
} }

9
lua/config/commands.lua
View file

@ -174,3 +174,12 @@ vim.api.nvim_create_user_command("Justt", function()
end end
}):find() }):find()
end, {}) end, {})
vim.api.nvim_create_autocmd('TextYankPost', {
desc = 'Highlight when yanking (copying) text',
group = vim.api.nvim_create_augroup('HightlightYank', { clear = true }),
callback = function()
vim.highlight.on_yank()
end,
})

35
lua/config/keymap.lua
View file

@ -1,18 +1,19 @@
local wk = require("which-key") local wk = require("which-key")
local keys = { local keys = {
a = {"<cmd>Copilot suggestion accept<cr>", "Accept Copilot"},
e = { e = {
name = "Toggle", name = "Toggle",
e = {"<cmd>NeoTreeFloatToggle<CR>", "NeoTree"}, e = {"<cmd>NeoTreeFloatToggle<CR>", "NeoTree"},
w = {vim.cmd.Ex, "netrw"}, w = {vim.cmd.Ex, "netrw"},
s = {"<cmd>NeoTreeShowToggle<CR>", "neotree sidebar"},
g = {"<cmd>NeoTreeFloatToggle git_status<CR>", "Git Status"}, g = {"<cmd>NeoTreeFloatToggle git_status<CR>", "Git Status"},
b = {"<cmd>NeoTreeFloatToggle buffers<CR>", "Buffers"}, -- b = {"<cmd>NeoTreeFloatToggle buffers<CR>", "Buffers"},
c = {"<cmd>NeoTreeClose<CR>" , "Close"}, c = {"<cmd>NeoTreeClose<CR>" , "Close"},
u = {vim.cmd.UndotreeToggle, "UndoTree"}, u = {vim.cmd.UndotreeToggle, "UndoTree"},
}, },
c = { c = {
name = "LSP", name = "LSP",
f = {function () vim.lsp.buf.format() end, "Format"},
w = {function () vim.lsp.buf.workspace_symbol("") end, "workspace symbol"}, w = {function () vim.lsp.buf.workspace_symbol("") end, "workspace symbol"},
d = {function () vim.diagnostic.open_float() end, "diagnostic"}, d = {function () vim.diagnostic.open_float() end, "diagnostic"},
a = {function () vim.lsp.buf.code_action() end, "code actions"}, a = {function () vim.lsp.buf.code_action() end, "code actions"},
@ -28,15 +29,6 @@ local keys = {
s = {"<cmd>LspStart<cr>", "Start"}, s = {"<cmd>LspStart<cr>", "Start"},
r = {"<cmd>LspRestart<cr>", "Restart"}, r = {"<cmd>LspRestart<cr>", "Restart"},
}, },
c = {
name = "Copilot",
a = {"<cmd>Copilot suggestion accept<cr>", "Accept"},
d = {"<cmd>Copilot suggestion dismiss<cr>", "Dismiss"},
l = {"<cmd>Copilot suggestion accept_line<cr>", "Line"},
w = {"<cmd>Copilot suggestion accept_word<cr>", "Word"},
n = {"<cmd>Copilot suggestion next<cr>", "Next"},
p = {"<cmd>Copilot suggestion prev<cr>", "Previous"},
}
}, },
b = { b = {
name = "Buffer", name = "Buffer",
@ -46,6 +38,11 @@ local keys = {
L = {vim.cmd.blast, "Last"}, L = {vim.cmd.blast, "Last"},
b = {require("telescope.builtin").buffers, "Picker"}, b = {require("telescope.builtin").buffers, "Picker"},
c = {"<cmd>:bp | sp | bn | bd<cr>", "Close"}, c = {"<cmd>:bp | sp | bn | bd<cr>", "Close"},
C = {"<cmd>:bp | sp | bn | bd!<cr>", "Close Force"},
d = {function() vim.cmd("bd") end, "Delete buffer"},
D = {function() vim.cmd("bd!") end, "Delete buffer Force"},
o = {function() vim.cmd("BDelete other") end, "Delete other buffers"},
m = {function() vim.cmd("BDelete select") end, "Select buffer to delete"},
}, },
f = { f = {
name = "Telescope & fzf", name = "Telescope & fzf",
@ -71,12 +68,6 @@ local keys = {
vim.opt.nu = true vim.opt.nu = true
vim.opt.relativenumber = true vim.opt.relativenumber = true
end, "Fix number and relative numbers"}, end, "Fix number and relative numbers"},
m = {function ()
vim.cmd[[
highlight CursorColumn guibg=none ctermbg=none
highlight link CursorColumn CursorLine
]]
end, "Fix cursor highlight"},
}, },
h = { h = {
name = "Hop", name = "Hop",
@ -106,8 +97,8 @@ local keys = {
q = { q = {
name = "Quick nav", name = "Quick nav",
q = {require("harpoon.ui").toggle_quick_menu, "Menu"}, q = {require("harpoon.ui").toggle_quick_menu, "Menu"},
a = {require("harpoon.mark").add_file, "Add file"}, a = {function () require("harpoon"):list():append() end, "Add file"},
r = {require("harpoon.mark").rm_file, "Remove File"}, r = {function () require("harpoon"):list():remove() end, "Remove File"},
}, },
} }
@ -162,7 +153,7 @@ end, {desc = "fuzzy find"})
vim.keymap.set('i', '<C-Space>f?', require('telescope.builtin').oldfiles, { desc = 'Find recently opened files' }) vim.keymap.set('i', '<C-Space>f?', require('telescope.builtin').oldfiles, { desc = 'Find recently opened files' })
for i = 9, 1, -1 do for i = 9, 1, -1 do
vim.keymap.set("n", "<M-" .. i .. ">", function() require("harpoon.ui").nav_file(i) end, {desc = ""}) vim.keymap.set("n", "<M-" .. i .. ">", function() require("harpoon"):list():select(i) end, {desc = ""})
vim.keymap.set("i", "<M-" .. i .. ">", function() require("harpoon.ui").nav_file(i) end, {desc = ""}) vim.keymap.set("i", "<M-" .. i .. ">", function() require("harpoon"):list():select(i) end, {desc = ""})
vim.keymap.set("v", "<M-" .. i .. ">", function() require("harpoon.ui").nav_file(i) end, {desc = ""}) vim.keymap.set("v", "<M-" .. i .. ">", function() require("harpoon"):list():select(i) end, {desc = ""})
end end

75
lua/config/packages.lua
View file

@ -14,7 +14,6 @@ return {
}, },
{ {
"j-hui/fidget.nvim", "j-hui/fidget.nvim",
tag = "legacy",
dependencies = { dependencies = {
"neovim/nvim-lspconfig", "neovim/nvim-lspconfig",
}, },
@ -41,6 +40,18 @@ return {
"rafamadriz/friendly-snippets" "rafamadriz/friendly-snippets"
}, },
}, },
{
"nvimtools/none-ls.nvim"
},
{
"jinzhongjia/LspUI.nvim",
branch = "legacy",
config = function()
require("LspUI").setup({
prompt = false
})
end
},
-- syntax highlighting -- syntax highlighting
{ {
@ -66,13 +77,13 @@ return {
"nvim-telescope/telescope-fzf-native.nvim", "nvim-telescope/telescope-fzf-native.nvim",
build = "make", build = "make",
}, },
"nvim-lua/popup.nvim",
-- debugging -- debugging
"mfussenegger/nvim-dap", "mfussenegger/nvim-dap",
"jay-babu/mason-nvim-dap.nvim", "jay-babu/mason-nvim-dap.nvim",
{ {
"rcarriga/nvim-dap-ui", "rcarriga/nvim-dap-ui",
tag = "v4.0.0",
dependencies = { dependencies = {
"mfussenegger/nvim-dap" "mfussenegger/nvim-dap"
}, },
@ -86,7 +97,6 @@ return {
"lvimuser/lsp-inlayhints.nvim", "lvimuser/lsp-inlayhints.nvim",
"echasnovski/mini.nvim", "echasnovski/mini.nvim",
{'kazhala/close-buffers.nvim', config = true}, {'kazhala/close-buffers.nvim', config = true},
{'stevearc/dressing.nvim', opts = {}},
{ {
'anuvyklack/pretty-fold.nvim', 'anuvyklack/pretty-fold.nvim',
opts = { opts = {
@ -111,7 +121,13 @@ return {
opts = {} opts = {}
}, },
{ {
"ThePrimeagen/harpoon" "ThePrimeagen/harpoon",
branch = "harpoon2",
dependencies = { "nvim-lua/plenary.nvim" },
init = function ()
local harpoon = require("harpoon")
harpoon:setup()
end
}, },
{ {
"sQVe/sort.nvim", "sQVe/sort.nvim",
@ -155,15 +171,6 @@ return {
vim.notify = require("notify") vim.notify = require("notify")
end end
}, },
{
"nvim-neo-tree/neo-tree.nvim",
branch = "v2.x",
dependencies = {
"nvim-lua/plenary.nvim",
"nvim-tree/nvim-web-devicons",
"MunifTanjim/nui.nvim",
},
},
{ {
"kevinhwang91/nvim-bqf", "kevinhwang91/nvim-bqf",
event = { "BufRead", "BufNew" }, event = { "BufRead", "BufNew" },
@ -275,11 +282,12 @@ return {
end, end,
}, },
{ {
"zbirenbaum/copilot.lua", "nvim-neo-tree/neo-tree.nvim",
opts = { branch = "v2.x",
suggestion = { dependencies = {
auto_trigger = true, "nvim-lua/plenary.nvim",
} "nvim-tree/nvim-web-devicons",
"MunifTanjim/nui.nvim",
}, },
}, },
@ -302,18 +310,8 @@ return {
}, },
-- lenguage specific -- lenguage specific
-- just -- f#
{ {"ionide/Ionide-vim"},
"IndianBoy42/tree-sitter-just",
opts = {}
},
-- swift
{
"apple/swift",
config = function(plugin)
vim.opt.rtp:append(plugin.dir .. "/utils/vim")
end
},
-- go -- go
{"joerdav/templ.vim"}, {"joerdav/templ.vim"},
{ {
@ -347,20 +345,11 @@ return {
"nvim-lua/plenary.nvim" "nvim-lua/plenary.nvim"
}, },
}, },
-- slint
{"slint-ui/vim-slint"},
-- zig -- zig
"ziglang/zig.vim", "ziglang/zig.vim",
{
"NTBBloodbath/zig-tools.nvim",
ft = "zig",
opts = {
integrations = {
zls = {
hints = true,
}
}
}
},
-- glsl -- glsl
"tikhomirov/vim-glsl", "tikhomirov/vim-glsl",
@ -368,11 +357,9 @@ return {
-- java -- java
"mfussenegger/nvim-jdtls", "mfussenegger/nvim-jdtls",
-- c && c++ && cmake
"cdelledonne/vim-cmake",
-- themes -- themes
"xiyaowong/transparent.nvim", "xiyaowong/transparent.nvim",
"savq/melange-nvim",
"EdenEast/nightfox.nvim", "EdenEast/nightfox.nvim",
"luisiacc/gruvbox-baby", "luisiacc/gruvbox-baby",

2
lua/config/pmstrap.lua
View file

@ -19,6 +19,6 @@ require("lazy").setup("config.packages", {
lazy = false lazy = false
}, },
install = { install = {
colorscheme = { "monokai-pro" }, colorscheme = { "melange" },
} }
}) })

15
lua/config/sets.lua
View file

@ -1,13 +1,10 @@
-- numbers -- numbers
vim.opt.nu = true
vim.opt.number = true vim.opt.number = true
vim.opt.relativenumber = true vim.opt.relativenumber = true
-- tab && indent -- tab && indent
vim.opt.tabstop = 4 vim.opt.tabstop = 4
vim.opt.softtabstop = 0 vim.opt.softtabstop = 0
--vim.opt.noexpandtab = true
vim.cmd("set expandtab")
vim.opt.shiftwidth = 4 vim.opt.shiftwidth = 4
vim.opt.smartindent = true vim.opt.smartindent = true
vim.o.breakindent = true vim.o.breakindent = true
@ -32,14 +29,9 @@ vim.o.smartcase = true
-- colors -- colors
vim.opt.termguicolors = true vim.opt.termguicolors = true
vim.cmd("colorscheme monokai-pro") vim.cmd.colorscheme "melange"
vim.opt.cursorline = true vim.opt.cursorline = true
vim.opt.cursorcolumn = true
vim.cmd[[
highlight CursorColumn guibg=none ctermbg=none
highlight link CursorColumn CursorLine
]]
-- misc -- misc
vim.opt.swapfile = false vim.opt.swapfile = false
@ -49,9 +41,12 @@ vim.opt.sidescrolloff = 8
vim.opt.signcolumn = "yes" vim.opt.signcolumn = "yes"
vim.opt.isfname:append("@-@") vim.opt.isfname:append("@-@")
vim.opt.updatetime = 50 vim.opt.updatetime = 50
vim.opt.timeoutlen = 300
vim.o.mouse = "a" vim.o.mouse = "a"
vim.opt.showmode = false vim.opt.showmode = false
vim.g.have_nerd_font = true
vim.o.completeopt = "menuone,noselect" vim.o.completeopt = "menuone,noselect"
vim.filetype.add({extension = {leaf = 'html'}}) -- vim.filetype.add({extension = {leaf = 'html'}})