Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nvim/lua/gerrrt/plugins/ccc-nvim.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
-- ================================================================================================
return {
"uga-rosa/ccc.nvim",
event = { "BufReadPost", "BufNewFile" },
ft = { "css", "scss", "sass", "less", "html", "javascript", "javascriptreact", "typescript", "typescriptreact", "svelte", "vue" },
cmd = { "CccPick", "CccConvert", "CccHighlighterToggle" },
config = function()
require("ccc").setup({
Expand Down
27 changes: 16 additions & 11 deletions nvim/lua/gerrrt/plugins/mini-nvim.lua
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
-- ================================================================================================
-- TITLE : mini.nvim modules | small, focused editing upgrades
-- LINKS : https://github.com/echasnovski/mini.nvim
-- NOTE : Removed mini.comment (Neovim ships native gc/gcc since 0.10) and mini.icons
-- (nvim-web-devicons already covers icons and several plugins depend on it).
-- NOTE : Removed mini.comment (Neovim ships native gc/gcc since 0.10).
-- Consolidated from separate per-module specs into a single spec so lazy.nvim only
-- tracks one plugin entry and runtime/lockfile overhead is minimized.
-- mini.move owns <A-h/j/k/l> line moving; mini.bufremove backs <leader>bd.
-- ================================================================================================
return {
{ "echasnovski/mini.ai", version = "*", opts = {} },
{ "echasnovski/mini.move", version = "*", opts = {} },
{ "echasnovski/mini.surround", version = "*", opts = {} },
{ "echasnovski/mini.cursorword", version = "*", opts = {} },
{ "echasnovski/mini.indentscope", version = "*", opts = {} },
{ "echasnovski/mini.pairs", version = "*", opts = {} },
{ "echasnovski/mini.trailspace", version = "*", opts = {} },
{ "echasnovski/mini.bufremove", version = "*", opts = {} },
{ "echasnovski/mini.notify", version = "*", opts = {} },
"echasnovski/mini.nvim",
version = "*",
config = function()
require("mini.ai").setup({})
require("mini.move").setup({})
require("mini.surround").setup({})
require("mini.cursorword").setup({})
require("mini.indentscope").setup({})
require("mini.pairs").setup({})
require("mini.trailspace").setup({})
require("mini.bufremove").setup({})
require("mini.notify").setup({})
end,
}
6 changes: 3 additions & 3 deletions nvim/lua/gerrrt/plugins/nvim-lint.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-- ================================================================================================
-- TITLE : nvim-lint | standalone linter runner
-- LINKS : https://github.com/mfussenegger/nvim-lint
-- ABOUT : Runs a filetype's linter on read / write / leaving insert mode, surfacing results as
-- ABOUT : Runs a filetype's linter on write / leaving insert mode, surfacing results as
-- normal diagnostics (Trouble, <leader>cd, [d/]d all work). Binaries installed by
-- mason-tool-installer in conform.lua.
-- ASTRAL: Python is intentionally NOT here — the ruff language server (servers/ruff.lua)
Expand All @@ -10,7 +10,7 @@
-- ================================================================================================
return {
"mfussenegger/nvim-lint",
event = { "BufReadPost", "BufNewFile", "BufWritePost" },
event = { "BufReadPost", "BufNewFile" },
config = function()
local lint = require("lint")
lint.linters_by_ft = {
Expand All @@ -31,7 +31,7 @@ return {
}

local grp = vim.api.nvim_create_augroup("NvimLint", { clear = true })
vim.api.nvim_create_autocmd({ "BufWritePost", "BufReadPost", "InsertLeave" }, {
vim.api.nvim_create_autocmd({ "BufWritePost", "InsertLeave" }, {
group = grp,
callback = function()
require("lint").try_lint()
Expand Down
2 changes: 1 addition & 1 deletion nvim/lua/gerrrt/plugins/rustaceanvim.lua
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ end
return {
"mrcjkb/rustaceanvim",
version = "^6",
lazy = false,
ft = "rust",
config = config,
}
3 changes: 3 additions & 0 deletions nvim/lua/gerrrt/servers/emmet_ls.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,8 @@ return function(capabilities)
"svelte",
"vue",
},
root_dir = function(fname)
return vim.fs.root(fname, { "package.json", ".git" })
end,
})
end
9 changes: 9 additions & 0 deletions nvim/lua/gerrrt/servers/tailwindcss.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,14 @@ return function(capabilities)
vim.lsp.config("tailwindcss", {
capabilities = capabilities,
filetypes = { "javascript", "javascriptreact", "typescript", "typescriptreact", "vue", "svelte" },
root_dir = function(fname)
return vim.fs.root(fname, {
"tailwind.config.js",
"tailwind.config.ts",
"tailwind.config.mjs",
"postcss.config.js",
"postcss.config.ts",
})
Comment on lines +6 to +12
end,
})
end
3 changes: 3 additions & 0 deletions nvim/lua/gerrrt/servers/ts_ls.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@ return function(capabilities)
capabilities = capabilities,
filetypes = { "typescript", "javascript", "typescriptreact", "javascriptreact" },
settings = { typescript = { indentStyle = "space", indentSize = 2 } },
root_dir = function(fname)
return vim.fs.root(fname, { "tsconfig.json", "jsconfig.json", "package.json" })
end,
})
end