some changes

This commit is contained in:
2026-01-24 00:50:45 -07:00
parent 9c7c68c8f4
commit 50a8c1fcc7
8 changed files with 56 additions and 35 deletions

View File

@@ -73,7 +73,7 @@ autocmd("BufWritePre", {
})
-- Set specific options for certain filetypes
augroup("FileTypeSettings", { clear = true })
augroup("FileTypeSettings", { clear = false })
-- Go files: use tabs
autocmd("FileType", {

View File

@@ -1,6 +1,7 @@
-- Custom keymaps
local map = vim.keymap.set
-- Terminal keymaps
-- <leader>th - Open terminal in horizontal split
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>")
-- Git Support
map("n", "<leader>gg", "<cmd>Neogit<cr>", { desc = "Neogit"})
map("n", "<leader>gg", "<cmd>Neogit<cr>", { desc = "Neogit" })

View File

@@ -6,7 +6,7 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
if vim.v.shell_error ~= 0 then
vim.api.nvim_echo({
{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
{ out, "WarningMsg" },
{ out, "WarningMsg" },
{ "\nPress any key to exit..." },
}, true, {})
vim.fn.getchar()
@@ -27,7 +27,7 @@ require("lazy").setup({
"LazyVim/LazyVim",
import = "lazyvim.plugins",
opts = {
colorscheme = "tokyonight",
colorscheme = "catppuccin-mocha",
},
},
-- Import LazyVim extras for languages
@@ -46,7 +46,7 @@ require("lazy").setup({
lazy = false,
version = false,
},
install = { colorscheme = { "tokyonight", "habamax" } },
install = { colorscheme = { "tokyonight", "habamax", "catpuccin-mocha" } },
checker = {
enabled = true,
notify = false,

View File

@@ -63,3 +63,7 @@ vim.diagnostic.config({
border = "rounded",
},
})
-- Python
vim.g.lazyvim_python_lsp = "pyright"
vim.g.lazyvim_python_ruff = "ruff"

View File

@@ -193,21 +193,21 @@ return {
},
},
},
{
"zbirenbaum/copilot.lua",
cmd = "Copilot",
event = "InsertEnter",
opts = {
suggestion = {
enabled = true,
auto_trigger = true,
keymap = {
accept = "<C-l>",
next = "<C-n>",
prev = "<C-p>",
},
},
panel = { enabled = false },
},
}
-- {
-- "zbirenbaum/copilot.lua",
-- cmd = "Copilot",
-- event = "InsertEnter",
-- opts = {
-- suggestion = {
-- enabled = true,
-- auto_trigger = true,
-- keymap = {
-- accept = "<C-l>",
-- next = "<C-n>",
-- prev = "<C-p>",
-- },
-- },
-- panel = { enabled = false },
-- },
-- }
}

View File

@@ -33,10 +33,14 @@ return {
"yaml-language-server", -- YAML
"marksman", -- Markdown
"sqlls", -- SQL
"pyright", --Python
"ruff", --Python
"docker-language-server", -- Docker
-- Linters
"golangci-lint",
"eslint_d",
"markdownlint",
"hadolint",
-- Formatters
"gofumpt",
"goimports",
@@ -57,7 +61,7 @@ return {
-- Go
gopls = {
-- 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 = {
gopls = {
gofumpt = true,
@@ -189,6 +193,10 @@ return {
sqlls = {
root_dir = make_root_detector({ ".sqllsrc.json", "sqlls.json", ".git" }),
},
-- Docker
dockerls = {},
docker_compose_language_server = {},
},
},
},
@@ -214,6 +222,7 @@ return {
"yaml",
"markdown",
"markdown_inline",
"ninja",
"sql",
"make",
"vim",
@@ -223,6 +232,7 @@ return {
"diff",
"gitcommit",
"git_rebase",
"dockerfile",
},
highlight = { enable = true },
indent = { enable = true },

View File

@@ -12,6 +12,14 @@ return {
},
config = function()
require("neotest").setup({
log_level = vim.log.levels.WARN,
discovery = {
enabled = true,
concurrent = 0,
},
running = {
concurrent = true,
},
adapters = {
require("neotest-go")({
experimental = {
@@ -29,4 +37,3 @@ return {
end,
},
}