This commit is contained in:
Walter Jenkins 2025-08-12 23:10:09 -05:00
parent 83f02dbde7
commit 5bdc9a9944
7 changed files with 31 additions and 8 deletions

View File

@ -60,6 +60,7 @@ require('lazy').setup({
require 'plugins.treesitter', require 'plugins.treesitter',
require 'plugins.vim-tmux-navigator', require 'plugins.vim-tmux-navigator',
require 'plugins.zellij', require 'plugins.zellij',
}, { }, {
ui = { ui = {
-- If you have a Nerd Font, set icons to an empty table which will use the -- If you have a Nerd Font, set icons to an empty table which will use the

View File

@ -60,4 +60,12 @@ vim.opt.foldlevel = 99 -- Keep folds open by default
vim.api.nvim_create_autocmd("FileType", {
pattern = "templ",
callback = function()
vim.bo.tabstop = 2
vim.bo.shiftwidth = 2
vim.bo.softtabstop = 2
vim.bo.expandtab = true
end,
})

View File

@ -32,7 +32,6 @@ return {
event = 'VimEnter', event = 'VimEnter',
opts = function(_, opts) opts = function(_, opts)
local logo = [[ local logo = [[
@ -46,14 +45,14 @@ return {
]] ]]
logo = string.rep('\n', 8) .. logo .. '\n\n' logo = string.rep('\n', 8) .. logo .. '\n\n'
-- 🔥 Ensure `opts.config` is a table before modifying
opts.config = opts.config or {} opts.config = opts.config or {}
opts.config.header = vim.split(logo, '\n') opts.config.header = vim.split(logo, '\n')
-- ✅ Disable project module to avoid error
opts.config.project = { enable = false }
end, end,
}, },
} }

4
lua/plugins/aaa.lua Normal file
View File

@ -0,0 +1,4 @@
return {
{ "mason-org/mason.nvim", version = "^1.0.0" },
{ "mason-org/mason-lspconfig.nvim", version = "^1.0.0" },
}

View File

@ -4,7 +4,11 @@ return {
config = function() config = function()
require("conform").setup({ require("conform").setup({
formatters_by_ft = { formatters_by_ft = {
templ = { "templ", "prettier" }, -- Use templ first, then Prettier for embedded content -- Disable formatters for .templ files
templ = {},
-- Add your other filetype configs here as needed
-- e.g., go = { "gofmt" },
}, },
format_on_save = { format_on_save = {
timeout_ms = 500, timeout_ms = 500,
@ -12,6 +16,6 @@ return {
}, },
}) })
end, end,
event = { "BufReadPre", "BufNewFile" }, -- Load only when opening a file event = { "BufReadPre", "BufNewFile" },
} }
} }

View File

@ -19,6 +19,7 @@ return {
'eslint_d', -- ts/js linter 'eslint_d', -- ts/js linter
'shfmt', 'shfmt',
'ruff', 'ruff',
'goimports'
}, },
-- auto-install configured formatters & linters (with null-ls) -- auto-install configured formatters & linters (with null-ls)
automatic_installation = true, automatic_installation = true,

View File

@ -0,0 +1,6 @@
return {
{
"tpope/vim-unimpaired",
lazy = false, -- Load immediately since it provides useful mappings
}
}