Skip to content

Commit 5bdc9a9

Browse files
committed
working?
1 parent 83f02db commit 5bdc9a9

File tree

7 files changed

+31
-8
lines changed

7 files changed

+31
-8
lines changed

init.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ require('lazy').setup({
6060
require 'plugins.treesitter',
6161
require 'plugins.vim-tmux-navigator',
6262
require 'plugins.zellij',
63+
6364
}, {
6465
ui = {
6566
-- If you have a Nerd Font, set icons to an empty table which will use the

lua/core/options.lua

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ vim.o.shiftwidth = 4 -- the number of spaces ins
2424
vim.o.tabstop = 2 -- insert n spaces for a tab
2525
vim.o.softtabstop = 4 -- Number of spaces that a tab counts for while performing editing operations
2626
vim.o.expandtab = true -- convert tabs to spaces
27-
vim.o.cursorline = true -- highlight the current line
27+
vim.o.cursorline = true -- highlight the current line
2828
vim.o.splitbelow = true -- force all horizontal splits to go below current window
2929
vim.o.splitright = true -- force all vertical splits to go to the right of current window
3030
vim.o.swapfile = false -- creates a swapfile
@@ -60,4 +60,12 @@ vim.opt.foldlevel = 99 -- Keep folds open by default
6060

6161

6262

63-
63+
vim.api.nvim_create_autocmd("FileType", {
64+
pattern = "templ",
65+
callback = function()
66+
vim.bo.tabstop = 2
67+
vim.bo.shiftwidth = 2
68+
vim.bo.softtabstop = 2
69+
vim.bo.expandtab = true
70+
end,
71+
})

lua/core/ui.lua

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ return {
3232
event = 'VimEnter',
3333
opts = function(_, opts)
3434
local logo = [[
35-
3635
████████ ████████
3736
██ ██ ██
3837
▒▒▒▒▒▒▒▒▒▒▒▒▒▒██▒▒▒▒ ████
@@ -46,14 +45,14 @@ return {
4645
████ ████ ██ ████ ████
4746
████ ████ ████ ████
4847
██████████ ██████████
49-
5048
]]
51-
5249
logo = string.rep('\n', 8) .. logo .. '\n\n'
5350

54-
-- 🔥 Ensure `opts.config` is a table before modifying
5551
opts.config = opts.config or {}
5652
opts.config.header = vim.split(logo, '\n')
53+
54+
-- ✅ Disable project module to avoid error
55+
opts.config.project = { enable = false }
5756
end,
5857
},
5958
}

lua/plugins/aaa.lua

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
return {
2+
{ "mason-org/mason.nvim", version = "^1.0.0" },
3+
{ "mason-org/mason-lspconfig.nvim", version = "^1.0.0" },
4+
}

lua/plugins/conform.lua

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,18 @@ return {
44
config = function()
55
require("conform").setup({
66
formatters_by_ft = {
7-
templ = { "templ", "prettier" }, -- Use templ first, then Prettier for embedded content
7+
-- Disable formatters for .templ files
8+
templ = {},
9+
10+
-- Add your other filetype configs here as needed
11+
-- e.g., go = { "gofmt" },
812
},
913
format_on_save = {
1014
timeout_ms = 500,
1115
lsp_fallback = true,
1216
},
1317
})
1418
end,
15-
event = { "BufReadPre", "BufNewFile" }, -- Load only when opening a file
19+
event = { "BufReadPre", "BufNewFile" },
1620
}
1721
}

lua/plugins/none-ls.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ return {
1919
'eslint_d', -- ts/js linter
2020
'shfmt',
2121
'ruff',
22+
'goimports'
2223
},
2324
-- auto-install configured formatters & linters (with null-ls)
2425
automatic_installation = true,

lua/plugins/unimpaired.lua

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
return {
2+
{
3+
"tpope/vim-unimpaired",
4+
lazy = false, -- Load immediately since it provides useful mappings
5+
}
6+
}

0 commit comments

Comments
 (0)