Compare commits

...

3 Commits

Author SHA1 Message Date
vasili 538f838612 Apply Patch 2026-07-30 11:31:43 -07:00
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
3 changed files with 113 additions and 95 deletions
+7
View File
@@ -17,6 +17,13 @@ starship = "latest"
"npm:vscode-langservers-extracted" = "latest" "npm:vscode-langservers-extracted" = "latest"
tmux = "latest" tmux = "latest"
fzf = "latest" fzf = "latest"
java = "26"
ast-grep = "latest"
bat = "latest"
stylua = "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"
+99 -95
View File
@@ -12,7 +12,9 @@ vim.cmd([[set listchars=tab:▸\ ,eol:¬]])
vim.keymap.set("n", "<leader>r", ":edit $MYVIMRC<cr>") vim.keymap.set("n", "<leader>r", ":edit $MYVIMRC<cr>")
vim.keymap.set("n", "<leader>f", vim.lsp.buf.format) vim.keymap.set("n", "<leader>f", vim.lsp.buf.format)
vim.keymap.set("n", "<leader>D", vim.lsp.buf.definition) vim.keymap.set("n", "<leader>D", vim.lsp.buf.definition)
vim.keymap.set("n", "<leader>U", function() MiniExtra.pickers.lsp({ scope = "references" }) end) vim.keymap.set("n", "<leader>U", function()
MiniExtra.pickers.lsp({ scope = "references" })
end)
vim.keymap.set("n", "<leader>p", vim.lsp.buf.hover, { desc = "LSP Hover" }) vim.keymap.set("n", "<leader>p", vim.lsp.buf.hover, { desc = "LSP Hover" })
vim.keymap.set("n", "<leader>l", ":set list!<cr>") vim.keymap.set("n", "<leader>l", ":set list!<cr>")
vim.keymap.set("n", "<leader>]", ":bn<cr>") vim.keymap.set("n", "<leader>]", ":bn<cr>")
@@ -21,140 +23,142 @@ vim.keymap.set("n", "<leader>d", ":bd<cr>")
vim.keymap.set("n", "<esc><esc>", "<esc>:nohlsearch<cr><esc>") vim.keymap.set("n", "<esc><esc>", "<esc>:nohlsearch<cr><esc>")
vim.keymap.set("n", "<space>", "zz") vim.keymap.set("n", "<space>", "zz")
vim.keymap.set("n", "<leader>w", ":update<cr>") vim.keymap.set("n", "<leader>w", ":update<cr>")
vim.keymap.set("n", "<c-p>", function() FzfLua.files() end) vim.keymap.set("n", "<c-p>", function()
FzfLua.files()
end)
vim.keymap.set("n", "<leader>h", ":Pick help<cr>") vim.keymap.set("n", "<leader>h", ":Pick help<cr>")
vim.keymap.set("n", "<leader>cz", function() require("chezmoi.pick").mini() end) -- Pick from chezmoi managed files vim.keymap.set("n", "<leader>cz", function()
require("chezmoi.pick").mini()
end) -- Pick from chezmoi managed files
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/folke/lazydev.nvim" }, -- Lua Vim types
{ src = "https://github.com/folke/lazydev.nvim" }, -- Lua Vim types { 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",
src = "https://github.com/kylechui/nvim-surround", version = vim.version.range("^4.0.0"),
version = vim.version.range("^4.0.0") }, -- Surround
}, -- 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 { src = "https://github.com/nvim-lua/plenary.nvim" }, -- Base functions library
{ src = "https://github.com/nvim-lua/plenary.nvim" }, -- Base functions library { src = "https://github.com/nvim-mini/mini.extra" }, -- Additional things for mini tools
{ src = "https://github.com/nvim-mini/mini.extra" }, -- Additional things for mini tools { src = "https://github.com/nvim-mini/mini.icons" }, -- Icons for Ctrl-P
{ src = "https://github.com/nvim-mini/mini.icons" }, -- Icons for Ctrl-P { src = "https://github.com/nvim-mini/mini.pick" }, -- Ctrl-P Alternative
{ src = "https://github.com/nvim-mini/mini.pick" }, -- Ctrl-P Alternative { src = "https://github.com/rachartier/tiny-inline-diagnostic.nvim" }, -- Inline diagnostics
{ src = "https://github.com/rachartier/tiny-inline-diagnostic.nvim" }, -- Inline diagnostics { 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-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/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/esmuellert/nvim-eslint" }, -- Linter { src = "https://github.com/ibhagwan/fzf-lua" }, -- FZF Fuzzy Finder
{ src = "https://github.com/ibhagwan/fzf-lua" }, -- FZF Fuzzy Finder })
}
)
-- Airline -- Airline
vim.cmd [[ vim.cmd([[
let g:airline#extensions#tabline#enabled = 1 let g:airline#extensions#tabline#enabled = 1
]] ]])
-- Ctrl-P -- Ctrl-P
require("mini.pick").setup() require("mini.pick").setup()
require("mini.icons").setup() require("mini.icons").setup()
require("mini.extra").setup() require("mini.extra").setup()
require("fzf-lua").setup({ 'fzf-tmux' }) require("fzf-lua").setup({ "fzf-tmux" })
-- Coverage -- Coverage
require("coverage").setup() require("coverage").setup()
-- Lint -- Lint
require("lint").linters_by_ft = { require("lint").linters_by_ft = {
sh = { "shellcheck" } sh = { "shellcheck" },
} }
vim.api.nvim_create_autocmd({ "BufWritePost" }, { vim.api.nvim_create_autocmd({ "BufWritePost" }, {
callback = function() callback = function()
require("lint").try_lint() require("lint").try_lint()
end, end,
}) })
-- Theme -- Theme
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" })
---@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
settings = { settings = {
Lua = { Lua = {
workspace = { workspace = {
library = vim.api.nvim_get_runtime_file("", true), library = vim.api.nvim_get_runtime_file("", true),
} },
} },
} },
} }
vim.lsp.config("lua_ls", lua_ls_config) vim.lsp.config("lua_ls", lua_ls_config)
-- Autocomplete -- Autocomplete
vim.o.autocomplete = true vim.o.autocomplete = true
vim.api.nvim_create_autocmd('LspAttach', { vim.api.nvim_create_autocmd("LspAttach", {
callback = function(ev) callback = function(ev)
local client = assert(vim.lsp.get_client_by_id(ev.data.client_id)) local client = assert(vim.lsp.get_client_by_id(ev.data.client_id))
if client:supports_method('textDocument/completion') then if client:supports_method("textDocument/completion") then
vim.lsp.completion.enable(true, client.id, ev.buf, { autotrigger = true }) vim.lsp.completion.enable(true, client.id, ev.buf, { autotrigger = true })
end end
vim.keymap.set('i', '<C-Space>', function() vim.keymap.set("i", "<C-Space>", function()
vim.lsp.completion.get() vim.lsp.completion.get()
end, { buffer = ev.buf }) end, { buffer = ev.buf })
end, end,
}) })
vim.opt.complete:append("o") vim.opt.complete:append("o")
vim.opt.completeopt = { 'menuone', 'noselect', 'fuzzy' } 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 })
-- Chezmoi -- Chezmoi
require("chezmoi").setup { require("chezmoi").setup({
edit = { edit = {
watch = false, watch = false,
force = false, force = false,
ignore_patterns = { ignore_patterns = {
"run_onchange_.*", "run_onchange_.*",
"run_once_.*", "run_once_.*",
"%.chezmoiignore", "%.chezmoiignore",
"%.chezmoitemplate", "%.chezmoitemplate",
-- Add custom patterns here -- Add custom patterns here
}, },
}, },
events = { events = {
on_open = { on_open = {
notification = { notification = {
enable = true, enable = true,
msg = "Opened a chezmoi-managed file", msg = "Opened a chezmoi-managed file",
opts = {}, opts = {},
}, },
}, },
on_watch = { on_watch = {
notification = { notification = {
enable = true, enable = true,
msg = "This file will be automatically applied", msg = "This file will be automatically applied",
opts = {}, opts = {},
}, },
}, },
on_apply = { on_apply = {
notification = { notification = {
enable = true, enable = true,
msg = "Successfully applied", msg = "Successfully applied",
opts = {}, opts = {},
}, },
}, },
}, },
} })
-- Surround -- Surround
require("nvim-surround").setup({}) require("nvim-surround").setup({})
+7
View File
@@ -1,3 +1,10 @@
"$schema" = 'https://starship.rs/config-schema.json'
[custom.arch]
command = 'arch'
when = true
format = 'on [$output]($style) '
disabled = true
[gcloud] [gcloud]
format = 'on [$symbol(\($project\))]($style) ' format = 'on [$symbol(\($project\))]($style) '