Compare commits

...

2 Commits

Author SHA1 Message Date
vasili 928c8be999 chore: post-merge cleanup 2026-07-23 21:53:03 -07:00
vasili 6ef459026f chore: add oxlint, take upstream changes 2026-07-23 21:49:07 -07:00
2 changed files with 29 additions and 27 deletions
+3
View File
@@ -17,6 +17,9 @@ starship = "latest"
"npm:vscode-langservers-extracted" = "latest" "npm:vscode-langservers-extracted" = "latest"
tmux = "latest" tmux = "latest"
fzf = "latest" fzf = "latest"
talosctl = "latest"
k9s = "latest"
kubectl = "latest"
[env] [env]
RIPGREP_CONFIG_PATH = "{{ env.HOME }}/.config/ripgrep/config" RIPGREP_CONFIG_PATH = "{{ env.HOME }}/.config/ripgrep/config"
+8 -9
View File
@@ -28,12 +28,11 @@ vim.keymap.set("n", "<leader>cz", function() require("chezmoi.pick").mini() end)
vim.pack.add( vim.pack.add(
{ {
{ src = "https://github.com/andythigpen/nvim-coverage" }, -- Code coverage visualuzer { src = "https://github.com/andythigpen/nvim-coverage" }, -- Code coverage visualuzer
{ src = "https://github.com/esmuellert/nvim-eslint" }, -- Linter
{ src = "https://github.com/folke/lazydev.nvim" }, -- Lua Vim types { src = "https://github.com/folke/lazydev.nvim" }, -- Lua Vim types
{ src = "https://github.com/ibhagwan/fzf-lua" }, -- FZF Fuzzy Finder
{ src = "https://github.com/j-hui/fidget.nvim" }, -- LSP Status Popup { src = "https://github.com/j-hui/fidget.nvim" }, -- LSP Status Popup
{ { src = "https://github.com/kylechui/nvim-surround", version = vim.version.range("^4.0.0") },
src = "https://github.com/kylechui/nvim-surround",
version = vim.version.range("^4.0.0")
}, -- Surround
{ src = "https://github.com/lewis6991/gitsigns.nvim" }, -- Show git changes in the gutter { src = "https://github.com/lewis6991/gitsigns.nvim" }, -- Show git changes in the gutter
{ src = "https://github.com/mfussenegger/nvim-lint" }, -- Linter { src = "https://github.com/mfussenegger/nvim-lint" }, -- Linter
{ src = "https://github.com/neovim/nvim-lspconfig" }, -- Common LSP Configurations { src = "https://github.com/neovim/nvim-lspconfig" }, -- Common LSP Configurations
@@ -45,11 +44,9 @@ vim.pack.add(
{ src = "https://github.com/rebelot/kanagawa.nvim" }, -- Theme { src = "https://github.com/rebelot/kanagawa.nvim" }, -- Theme
{ src = "https://github.com/sbdchd/neoformat" }, -- Formatter { src = "https://github.com/sbdchd/neoformat" }, -- Formatter
{ src = "https://github.com/tpope/vim-fugitive" }, -- Git bindings { src = "https://github.com/tpope/vim-fugitive" }, -- Git bindings
{ src = "https://github.com/vim-airline/vim-airline-themes" }, -- Status bar theme
{ src = "https://github.com/vim-airline/vim-airline" }, -- Status bar { src = "https://github.com/vim-airline/vim-airline" }, -- Status bar
{ src = "https://github.com/vim-airline/vim-airline-themes" }, -- Status bar theme
{ src = "https://github.com/xvzc/chezmoi.nvim" }, -- Chezmoi dotfiles manager { src = "https://github.com/xvzc/chezmoi.nvim" }, -- Chezmoi dotfiles manager
{ src = "https://github.com/esmuellert/nvim-eslint" }, -- Linter
{ src = "https://github.com/ibhagwan/fzf-lua" }, -- FZF Fuzzy Finder
} }
) )
@@ -69,7 +66,8 @@ require("coverage").setup()
-- Lint -- Lint
require("lint").linters_by_ft = { require("lint").linters_by_ft = {
sh = { "shellcheck" } sh = { "shellcheck" },
ts = { "oxlint" },
} }
vim.api.nvim_create_autocmd({ "BufWritePost" }, { vim.api.nvim_create_autocmd({ "BufWritePost" }, {
callback = function() callback = function()
@@ -81,7 +79,7 @@ vim.api.nvim_create_autocmd({ "BufWritePost" }, {
vim.cmd.colorscheme "kanagawa-dragon" vim.cmd.colorscheme "kanagawa-dragon"
-- LSP -- LSP
vim.lsp.enable({ "lua_ls", "ts_ls", "bashls", "yamlls", "graphql", "jsonls" }) vim.lsp.enable({ "lua_ls", "ts_ls", "bashls", "yamlls", "graphql", "jsonls", "oxlint" })
---@type vim.lsp.Config ---@type vim.lsp.Config
local lua_ls_config = { local lua_ls_config = {
---@type lspconfig.settings.lua_ls ---@type lspconfig.settings.lua_ls
@@ -114,6 +112,7 @@ vim.opt.completeopt = { 'menuone', 'noselect', 'fuzzy' }
-- Fidget -- Fidget
require("fidget").setup {} require("fidget").setup {}
-- Diagnostic -- Diagnostic
require('tiny-inline-diagnostic').setup() require('tiny-inline-diagnostic').setup()
vim.diagnostic.config({ virtual_text = false }) vim.diagnostic.config({ virtual_text = false })