some changes
This commit is contained in:
@@ -1,31 +1,30 @@
|
|||||||
{
|
{
|
||||||
"FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
|
"FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
|
||||||
"LazyVim": { "branch": "main", "commit": "28db03f958d58dfff3c647ce28fdc1cb88ac158d" },
|
"LazyVim": { "branch": "main", "commit": "28db03f958d58dfff3c647ce28fdc1cb88ac158d" },
|
||||||
"SchemaStore.nvim": { "branch": "main", "commit": "fb7b9034285a5658c746faa12eff8c1c9d9b11b1" },
|
"SchemaStore.nvim": { "branch": "main", "commit": "a0fad73139f98ea1d6e9d380374c16245e562f4f" },
|
||||||
"aerial.nvim": { "branch": "master", "commit": "7a6a42791eb2b54a7115c7db4488981f93471770" },
|
"aerial.nvim": { "branch": "master", "commit": "7a6a42791eb2b54a7115c7db4488981f93471770" },
|
||||||
"avante.nvim": { "branch": "main", "commit": "e89eb79abf5754645e20aa6074da10ed20bba33c" },
|
"avante.nvim": { "branch": "main", "commit": "e1e70be8ee34144d3ce4b0608e9b30aab3feb701" },
|
||||||
"blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" },
|
"blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" },
|
||||||
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
|
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
|
||||||
"catppuccin": { "branch": "main", "commit": "beaf41a30c26fd7d6c386d383155cbd65dd554cd" },
|
"catppuccin": { "branch": "main", "commit": "beaf41a30c26fd7d6c386d383155cbd65dd554cd" },
|
||||||
"conform.nvim": { "branch": "master", "commit": "c2526f1cde528a66e086ab1668e996d162c75f4f" },
|
"conform.nvim": { "branch": "master", "commit": "c2526f1cde528a66e086ab1668e996d162c75f4f" },
|
||||||
"copilot.lua": { "branch": "master", "commit": "2d7511494245129aa6c2176f9c71cc2bc1360ed9" },
|
|
||||||
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
|
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
|
||||||
"dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
|
"dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
|
||||||
"flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
|
"flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
|
||||||
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
|
"friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
|
||||||
"gitsigns.nvim": { "branch": "main", "commit": "42d6aed4e94e0f0bbced16bbdcc42f57673bd75e" },
|
"gitsigns.nvim": { "branch": "main", "commit": "abf82a65f185bd54adc0679f74b7d6e1ada690c9" },
|
||||||
"grug-far.nvim": { "branch": "main", "commit": "794f03c97afc7f4b03fb6ec5111be507df1850cf" },
|
"grug-far.nvim": { "branch": "main", "commit": "1f7a722a9b9f0206a345377c13e62542f484398a" },
|
||||||
"img-clip.nvim": { "branch": "main", "commit": "b6ddfb97b5600d99afe3452d707444afda658aca" },
|
"img-clip.nvim": { "branch": "main", "commit": "b6ddfb97b5600d99afe3452d707444afda658aca" },
|
||||||
"lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
|
"lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
|
||||||
"lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
|
"lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
|
||||||
"lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
|
"lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
|
||||||
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
|
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
|
||||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "80c0130c5f16b551865a69e832f1feadeedb5fbe" },
|
"mason-lspconfig.nvim": { "branch": "main", "commit": "4823a251e7578a835bb979c37df390fca692ba39" },
|
||||||
"mason-nvim-dap.nvim": { "branch": "main", "commit": "9a10e096703966335bd5c46c8c875d5b0690dade" },
|
"mason-nvim-dap.nvim": { "branch": "main", "commit": "9a10e096703966335bd5c46c8c875d5b0690dade" },
|
||||||
"mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
|
"mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
|
||||||
"mini.ai": { "branch": "main", "commit": "9eae720f2b20f6ad28cbfa0ddc524e10dc2c3201" },
|
"mini.ai": { "branch": "main", "commit": "9eae720f2b20f6ad28cbfa0ddc524e10dc2c3201" },
|
||||||
"mini.icons": { "branch": "main", "commit": "efc85e42262cd0c9e1fdbf806c25cb0be6de115c" },
|
"mini.icons": { "branch": "main", "commit": "efc85e42262cd0c9e1fdbf806c25cb0be6de115c" },
|
||||||
"mini.pairs": { "branch": "main", "commit": "d5a29b6254dad07757832db505ea5aeab9aad43a" },
|
"mini.pairs": { "branch": "main", "commit": "4089aa6ea6423e02e1a8326a7a7a00159f6f5e04" },
|
||||||
"neogit": { "branch": "master", "commit": "d8bf9102692250193b855acd9025a826f1af2729" },
|
"neogit": { "branch": "master", "commit": "d8bf9102692250193b855acd9025a826f1af2729" },
|
||||||
"neotest": { "branch": "master", "commit": "deadfb1af5ce458742671ad3a013acb9a6b41178" },
|
"neotest": { "branch": "master", "commit": "deadfb1af5ce458742671ad3a013acb9a6b41178" },
|
||||||
"neotest-go": { "branch": "main", "commit": "59b50505053f9c45a9febb79e11a56206c3e3901" },
|
"neotest-go": { "branch": "main", "commit": "59b50505053f9c45a9febb79e11a56206c3e3901" },
|
||||||
@@ -40,10 +39,10 @@
|
|||||||
"nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
|
"nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
|
||||||
"nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" },
|
"nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" },
|
||||||
"nvim-lint": { "branch": "master", "commit": "ca6ea12daf0a4d92dc24c5c9ae22a1f0418ade37" },
|
"nvim-lint": { "branch": "master", "commit": "ca6ea12daf0a4d92dc24c5c9ae22a1f0418ade37" },
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "92ee7d42320edfbb81f3cad851314ab197fa324a" },
|
"nvim-lspconfig": { "branch": "master", "commit": "419b082102fa813739588dd82e19a8b6b2442855" },
|
||||||
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
|
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
|
||||||
"nvim-remote-containers": { "branch": "master", "commit": "73c2cbc59b69b4026682aea6bab225831fb8eaa4" },
|
"nvim-remote-containers": { "branch": "master", "commit": "73c2cbc59b69b4026682aea6bab225831fb8eaa4" },
|
||||||
"nvim-treesitter": { "branch": "main", "commit": "e75c007f2747050c2c620dc862c77b8f242551a8" },
|
"nvim-treesitter": { "branch": "main", "commit": "88f1dfc211c3a2fb47f1451fd5edc972ec697e58" },
|
||||||
"nvim-treesitter-textobjects": { "branch": "main", "commit": "4d55f63252e04c5212daed958e4e940915ff16ce" },
|
"nvim-treesitter-textobjects": { "branch": "main", "commit": "4d55f63252e04c5212daed958e4e940915ff16ce" },
|
||||||
"nvim-ts-autotag": { "branch": "main", "commit": "db15f2e0df2f5db916e511e3fffb682ef2f6354f" },
|
"nvim-ts-autotag": { "branch": "main", "commit": "db15f2e0df2f5db916e511e3fffb682ef2f6354f" },
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "803353450c374192393f5387b6a0176d0972b848" },
|
"nvim-web-devicons": { "branch": "master", "commit": "803353450c374192393f5387b6a0176d0972b848" },
|
||||||
@@ -52,7 +51,7 @@
|
|||||||
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
|
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
|
||||||
"render-markdown.nvim": { "branch": "main", "commit": "c54380dd4d8d1738b9691a7c349ecad7967ac12e" },
|
"render-markdown.nvim": { "branch": "main", "commit": "c54380dd4d8d1738b9691a7c349ecad7967ac12e" },
|
||||||
"snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" },
|
"snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" },
|
||||||
"telescope.nvim": { "branch": "master", "commit": "0d8b6eaa0b5ae6bb3d9785f7a3ba4a4c6c1b1af2" },
|
"telescope.nvim": { "branch": "master", "commit": "ad7d9580338354ccc136e5b8f0aa4f880434dcdc" },
|
||||||
"todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
|
"todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
|
||||||
"toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
|
"toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
|
||||||
"tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" },
|
"tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" },
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ autocmd("BufWritePre", {
|
|||||||
})
|
})
|
||||||
|
|
||||||
-- Set specific options for certain filetypes
|
-- Set specific options for certain filetypes
|
||||||
augroup("FileTypeSettings", { clear = true })
|
augroup("FileTypeSettings", { clear = false })
|
||||||
|
|
||||||
-- Go files: use tabs
|
-- Go files: use tabs
|
||||||
autocmd("FileType", {
|
autocmd("FileType", {
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
-- Custom keymaps
|
-- Custom keymaps
|
||||||
local map = vim.keymap.set
|
local map = vim.keymap.set
|
||||||
|
|
||||||
|
|
||||||
-- Terminal keymaps
|
-- Terminal keymaps
|
||||||
-- <leader>th - Open terminal in horizontal split
|
-- <leader>th - Open terminal in horizontal split
|
||||||
map("n", "<leader>th", function()
|
map("n", "<leader>th", function()
|
||||||
@@ -110,4 +111,4 @@ map("n", "<leader>xw", "<cmd>Trouble workspace_diagnostics<cr>")
|
|||||||
map("n", "<leader>xt", "<cmd>Trouble todo<cr>")
|
map("n", "<leader>xt", "<cmd>Trouble todo<cr>")
|
||||||
|
|
||||||
-- Git Support
|
-- Git Support
|
||||||
map("n", "<leader>gg", "<cmd>Neogit<cr>", { desc = "Neogit"})
|
map("n", "<leader>gg", "<cmd>Neogit<cr>", { desc = "Neogit" })
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ require("lazy").setup({
|
|||||||
"LazyVim/LazyVim",
|
"LazyVim/LazyVim",
|
||||||
import = "lazyvim.plugins",
|
import = "lazyvim.plugins",
|
||||||
opts = {
|
opts = {
|
||||||
colorscheme = "tokyonight",
|
colorscheme = "catppuccin-mocha",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
-- Import LazyVim extras for languages
|
-- Import LazyVim extras for languages
|
||||||
@@ -46,7 +46,7 @@ require("lazy").setup({
|
|||||||
lazy = false,
|
lazy = false,
|
||||||
version = false,
|
version = false,
|
||||||
},
|
},
|
||||||
install = { colorscheme = { "tokyonight", "habamax" } },
|
install = { colorscheme = { "tokyonight", "habamax", "catpuccin-mocha" } },
|
||||||
checker = {
|
checker = {
|
||||||
enabled = true,
|
enabled = true,
|
||||||
notify = false,
|
notify = false,
|
||||||
|
|||||||
@@ -63,3 +63,7 @@ vim.diagnostic.config({
|
|||||||
border = "rounded",
|
border = "rounded",
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
-- Python
|
||||||
|
vim.g.lazyvim_python_lsp = "pyright"
|
||||||
|
vim.g.lazyvim_python_ruff = "ruff"
|
||||||
|
|||||||
@@ -193,21 +193,21 @@ return {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
-- {
|
||||||
"zbirenbaum/copilot.lua",
|
-- "zbirenbaum/copilot.lua",
|
||||||
cmd = "Copilot",
|
-- cmd = "Copilot",
|
||||||
event = "InsertEnter",
|
-- event = "InsertEnter",
|
||||||
opts = {
|
-- opts = {
|
||||||
suggestion = {
|
-- suggestion = {
|
||||||
enabled = true,
|
-- enabled = true,
|
||||||
auto_trigger = true,
|
-- auto_trigger = true,
|
||||||
keymap = {
|
-- keymap = {
|
||||||
accept = "<C-l>",
|
-- accept = "<C-l>",
|
||||||
next = "<C-n>",
|
-- next = "<C-n>",
|
||||||
prev = "<C-p>",
|
-- prev = "<C-p>",
|
||||||
},
|
-- },
|
||||||
},
|
-- },
|
||||||
panel = { enabled = false },
|
-- panel = { enabled = false },
|
||||||
},
|
-- },
|
||||||
}
|
-- }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,10 +33,14 @@ return {
|
|||||||
"yaml-language-server", -- YAML
|
"yaml-language-server", -- YAML
|
||||||
"marksman", -- Markdown
|
"marksman", -- Markdown
|
||||||
"sqlls", -- SQL
|
"sqlls", -- SQL
|
||||||
|
"pyright", --Python
|
||||||
|
"ruff", --Python
|
||||||
|
"docker-language-server", -- Docker
|
||||||
-- Linters
|
-- Linters
|
||||||
"golangci-lint",
|
"golangci-lint",
|
||||||
"eslint_d",
|
"eslint_d",
|
||||||
"markdownlint",
|
"markdownlint",
|
||||||
|
"hadolint",
|
||||||
-- Formatters
|
-- Formatters
|
||||||
"gofumpt",
|
"gofumpt",
|
||||||
"goimports",
|
"goimports",
|
||||||
@@ -57,7 +61,7 @@ return {
|
|||||||
-- Go
|
-- Go
|
||||||
gopls = {
|
gopls = {
|
||||||
-- Root detection: find go.work first, then go.mod, then git root
|
-- Root detection: find go.work first, then go.mod, then git root
|
||||||
root_dir = make_root_detector({ "go.work", "go.mod" }),
|
-- root_dir = make_root_detector({ "go.work", "go.mod" }),
|
||||||
settings = {
|
settings = {
|
||||||
gopls = {
|
gopls = {
|
||||||
gofumpt = true,
|
gofumpt = true,
|
||||||
@@ -189,6 +193,10 @@ return {
|
|||||||
sqlls = {
|
sqlls = {
|
||||||
root_dir = make_root_detector({ ".sqllsrc.json", "sqlls.json", ".git" }),
|
root_dir = make_root_detector({ ".sqllsrc.json", "sqlls.json", ".git" }),
|
||||||
},
|
},
|
||||||
|
|
||||||
|
-- Docker
|
||||||
|
dockerls = {},
|
||||||
|
docker_compose_language_server = {},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -214,6 +222,7 @@ return {
|
|||||||
"yaml",
|
"yaml",
|
||||||
"markdown",
|
"markdown",
|
||||||
"markdown_inline",
|
"markdown_inline",
|
||||||
|
"ninja",
|
||||||
"sql",
|
"sql",
|
||||||
"make",
|
"make",
|
||||||
"vim",
|
"vim",
|
||||||
@@ -223,6 +232,7 @@ return {
|
|||||||
"diff",
|
"diff",
|
||||||
"gitcommit",
|
"gitcommit",
|
||||||
"git_rebase",
|
"git_rebase",
|
||||||
|
"dockerfile",
|
||||||
},
|
},
|
||||||
highlight = { enable = true },
|
highlight = { enable = true },
|
||||||
indent = { enable = true },
|
indent = { enable = true },
|
||||||
|
|||||||
@@ -12,6 +12,14 @@ return {
|
|||||||
},
|
},
|
||||||
config = function()
|
config = function()
|
||||||
require("neotest").setup({
|
require("neotest").setup({
|
||||||
|
log_level = vim.log.levels.WARN,
|
||||||
|
discovery = {
|
||||||
|
enabled = true,
|
||||||
|
concurrent = 0,
|
||||||
|
},
|
||||||
|
running = {
|
||||||
|
concurrent = true,
|
||||||
|
},
|
||||||
adapters = {
|
adapters = {
|
||||||
require("neotest-go")({
|
require("neotest-go")({
|
||||||
experimental = {
|
experimental = {
|
||||||
@@ -29,4 +37,3 @@ return {
|
|||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user