Compare commits

..

4 commits

Author SHA1 Message Date
github-actions[bot]
bd21447db6 chore: update flake.lock
Flake lock file updates:

• Updated input 'jj-nvim':
    'github:NicolasGB/jj.nvim/3d78c28f7e26d5c87f53e66e05a1393e6ca9fec2?narHash=sha256-G7ksxOJJmQeTbsdAYddSFWUs9kyW/nIL4mv0F3FiXAI%3D' (2026-02-13)
  → 'github:NicolasGB/jj.nvim/bbba4051c862473637e98277f284d12b050588ca?narHash=sha256-nokftWcAmmHX6UcH6O79xkLwbUpq1W8N9lf1e%2BNyGqE%3D' (2026-02-24)
• Updated input 'neovim-nightly-overlay':
    'github:nix-community/neovim-nightly-overlay/c3e52f66f877cddce4167041546524abb76c0a70?narHash=sha256-2UQHZ8BsRSwtzl2R1OqtYR80SQF%2BHG3kJdTxfiDZR9s%3D' (2026-02-16)
  → 'github:nix-community/neovim-nightly-overlay/744c005b53bd588a82b3662f82c791eecf4710ad?narHash=sha256-aWy20stlI6cl%2BUM1Ds8j4NSEfWTCp/VWW%2BSqQy%2BDOM8%3D' (2026-03-01)
• Updated input 'neovim-nightly-overlay/neovim-src':
    'github:neovim/neovim/7d8653575f2a1170f0c7651f271c45a15a185d5e?narHash=sha256-WB0xr61z2nHB3/u42xYilqDCA/x3tvVZ21/bx2pNmgc%3D' (2026-02-15)
  → 'github:neovim/neovim/8a79e3398a347248f067abe0c09097416fbf9cae?narHash=sha256-Bp%2BpAkfjSdUWV/giJFT9Gbp0wecQ%2BH4Kbh4%2BXfyOj5s%3D' (2026-02-28)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/56a06a9163181e6c7c0f9ec08fd4a6df2e5f76b4?narHash=sha256-ZucQ5EZ2AWIx0tsUEbM1pZWR2pm8q0SbIsbe3BSNjz0%3D' (2026-02-16)
  → 'github:NixOS/nixpkgs/96b187c6984f705ef930fa6d575f7e7f5dafddff?narHash=sha256-QYgww8vJTSl9SWxYP9ivFDP0WEwy1LsWieiJaaa2OXA%3D' (2026-03-01)
2026-03-01 10:23:51 +00:00
e5a176d5b7 improve blink.cmp perf in large directories
Some checks failed
build / build (nvim-min) (push) Failing after 3h0m1s
2026-02-23 22:51:32 -06:00
e9d4373ddc update difftool name
Some checks failed
build / build (nvim-min) (push) Failing after 36m59s
2026-02-15 23:36:13 -06:00
7000c3a405 diffedit inline 2026-02-15 23:12:26 -06:00
6 changed files with 46 additions and 40 deletions

24
flake.lock generated
View file

@ -181,11 +181,11 @@
"jj-nvim": {
"flake": false,
"locked": {
"lastModified": 1771004667,
"narHash": "sha256-G7ksxOJJmQeTbsdAYddSFWUs9kyW/nIL4mv0F3FiXAI=",
"lastModified": 1771953539,
"narHash": "sha256-nokftWcAmmHX6UcH6O79xkLwbUpq1W8N9lf1e+NyGqE=",
"owner": "NicolasGB",
"repo": "jj.nvim",
"rev": "3d78c28f7e26d5c87f53e66e05a1393e6ca9fec2",
"rev": "bbba4051c862473637e98277f284d12b050588ca",
"type": "github"
},
"original": {
@ -219,11 +219,11 @@
]
},
"locked": {
"lastModified": 1771027491,
"narHash": "sha256-T53LDMjB9CmtBC4FJNAgcmJowiR8cbn6WVhIzYtfoVk=",
"lastModified": 1772323514,
"narHash": "sha256-aWy20stlI6cl+UM1Ds8j4NSEfWTCp/VWW+SqQy+DOM8=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "0774707cd1c97e3cf721f40dd3eaa5a5a2c1872e",
"rev": "744c005b53bd588a82b3662f82c791eecf4710ad",
"type": "github"
},
"original": {
@ -235,11 +235,11 @@
"neovim-src": {
"flake": false,
"locked": {
"lastModified": 1771027191,
"narHash": "sha256-dIVrDC/L5LQC13FzJv1ezacGj5QwrWA3nIFUTRzS/FY=",
"lastModified": 1772319592,
"narHash": "sha256-Bp+pAkfjSdUWV/giJFT9Gbp0wecQ+H4Kbh4+XfyOj5s=",
"owner": "neovim",
"repo": "neovim",
"rev": "289695c14efcb2cb61ea70a0dbaf0025f869b21c",
"rev": "8a79e3398a347248f067abe0c09097416fbf9cae",
"type": "github"
},
"original": {
@ -293,11 +293,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1771064210,
"narHash": "sha256-Aah0oc1R4dvgrJvyuXuPv3bGaTWxysSqwNi9T/7V5zA=",
"lastModified": 1772360274,
"narHash": "sha256-QYgww8vJTSl9SWxYP9ivFDP0WEwy1LsWieiJaaa2OXA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5ee33c746a149c70e706c8254306eafc93f16f4b",
"rev": "96b187c6984f705ef930fa6d575f7e7f5dafddff",
"type": "github"
},
"original": {

View file

@ -1,5 +1,4 @@
-- Made with 'mini.colors' module of https://github.com/echasnovski/mini.nvim
if vim.g.colors_name ~= nil then
vim.cmd('highlight clear')
end
@ -188,10 +187,10 @@ hi(0, 'DiagnosticVirtualTextInfo', { bg = '#1f353c', fg = '#5a93aa' })
hi(0, 'DiagnosticVirtualTextOk', { bg = '#24383a', fg = '#7aa4a1' })
hi(0, 'DiagnosticVirtualTextWarn', { bg = '#383835', fg = '#fda47f' })
hi(0, 'DiagnosticWarn', { fg = '#fda47f' })
hi(0, 'DiffAdd', { bg = '#24383a', fg = '#7aa4a1' })
hi(0, 'DiffChange', { bg = '#31474b', fg = '#73daca' })
hi(0, 'DiffDelete', { bg = '#31474b', fg = '#e85c51' })
hi(0, 'DiffText', { bg = '#466066' })
hi(0, 'DiffAdd', { bg = '#002800' })
hi(0, 'DiffChange', { bg = '#284b55' })
hi(0, 'DiffDelete', { bg = '#300000' })
hi(0, 'DiffText', { bg = '#366066' })
hi(0, 'Directory', { fg = '#73a3b7' })
hi(0, 'EndOfBuffer', { fg = '#152528' })
hi(0, 'Error', { fg = '#e85c51' })
@ -244,8 +243,6 @@ hi(0, 'MiniClueTitle', { link = 'FloatTitle' })
hi(0, 'MiniCompletionActiveParameter', { underline = true })
hi(0, 'MiniCursorword', { link = 'LspReferenceText' })
hi(0, 'MiniCursorwordCurrent', { link = 'LspReferenceText' })
hi(0, 'MiniDepsChangeAdded', { link = 'diffAdded' })
hi(0, 'MiniDepsChangeRemoved', { link = 'diffRemoved' })
hi(0, 'MiniDepsHint', { link = 'DiagnosticHint' })
hi(0, 'MiniDepsInfo', { link = 'DiagnosticInfo' })
hi(0, 'MiniDepsMsgBreaking', { link = 'DiagnosticWarn' })
@ -254,13 +251,13 @@ hi(0, 'MiniDepsTitle', { link = 'Title' })
hi(0, 'MiniDepsTitleError', { bg = '#e85c51', fg = '#0f1c1e' })
hi(0, 'MiniDepsTitleSame', { link = 'DiffText' })
hi(0, 'MiniDepsTitleUpdate', { bg = '#7aa4a1', fg = '#0f1c1e' })
hi(0, 'MiniDiffOverAdd', { link = 'diffAdded' })
hi(0, 'MiniDiffOverChange', { link = 'diffChanged' })
hi(0, 'MiniDiffOverChangeBuf', { link = 'diffChanged' })
hi(0, 'MiniDiffOverContext', { link = 'diffAdded' })
hi(0, 'MiniDiffOverDelete', { link = 'diffRemoved' })
hi(0, 'MiniDiffOverAdd', { link = 'DiffAdd' })
hi(0, 'MiniDiffOverChange', { link = 'DiffChange' })
hi(0, 'MiniDiffOverChangeBuf', { link = 'DiffChange' })
hi(0, 'MiniDiffOverContext', { link = 'DiffAdd' })
hi(0, 'MiniDiffOverDelete', { link = 'DiffDelete' })
hi(0, 'MiniDiffSignAdd', { fg = 'green', bold = true })
hi(0, 'MiniDiffSignChange', { fg = 'green', bold = true })
hi(0, 'MiniDiffSignChange', { fg = '#284b55', bold = true })
hi(0, 'MiniDiffSignDelete', { fg = 'red', bold = true })
hi(0, 'MiniFilesBorder', { link = 'FloatBorder' })
hi(0, 'MiniFilesBorderModified', { link = 'DiagnosticFloatingWarn' })

View file

@ -1,17 +1,22 @@
local M = {}
M.is_jj_diffedit_open = function()
local qf = vim.fn.getqflist()
local entry = qf[1]
local entry = vim.fn.getqflist[1]
if not entry or not entry.user_data or not entry.user_data.diff then
for _, buf in ipairs(vim.api.nvim_list_bufs()) do -- close all /tmp buffers
if vim.fn.fnamemodify(vim.api.nvim_buf_get_name(buf), ':p'):match('/tmp/jj%-diff.*') then
vim.api.nvim_buf_delete(buf, { force = true })
end
end
return 0
else
return 1
end
end
M.diffedit = function()
vim.fn.jobstart('jj diffedit --tool diffview-new')
M.diffedit = function(opts)
opts = opts or { args = '' }
vim.fn.jobstart('jj diffedit --tool difftool ' .. opts.args)
end
vim.api.nvim_create_user_command('Diffedit', M.diffedit, { nargs = '*' })
return M

View file

@ -151,15 +151,8 @@ cmd('LspAttach', {
vim.keymap.set('n', 'gre', vim.diagnostic.setloclist, { buffer = ev.buf })
vim.keymap.set('n', 'grE', vim.diagnostic.setqflist, { buffer = ev.buf })
-- Auto-refresh code lenses
if client:supports_method('textDocument/codeLens') or client.server_capabilities.codeLensProvider then
vim.lsp.codelens.refresh { bufnr = ev.buf }
cmd({ 'InsertLeave', 'TextChanged' }, {
callback = function()
vim.lsp.codelens.refresh { bufnr = ev.buf }
end,
buffer = ev.buf,
})
vim.lsp.codelens.enable(true, { bufnr = ev.buf })
end
end,
})

View file

@ -43,6 +43,7 @@ vim.lsp.enable {
'lua_ls',
'basedpyright',
'csharp_ls',
'ts_ls',
}
local map = vim.keymap.set

View file

@ -59,6 +59,9 @@ map('n', '<leader>fq', Snacks.picker.qflist)
vim.schedule(function()
require('nvim-treesitter').setup()
require('nvim-treesitter-textobjects').setup()
require('treesitter-context').setup {
max_lines = 2,
}
vim.keymap.set('n', '[c', function()
require('treesitter-context').go_to_context(vim.v.count1)
end, { silent = true })
@ -129,12 +132,19 @@ vim.schedule(function()
default = { 'lsp', 'path', 'snippets', 'ripgrep', 'buffer' },
providers = {
lsp = { fallbacks = {} }, -- include buffer even when LSP is active
path = { opts = { get_cwd = vim.fn.getcwd } }, -- use nvim pwd instead of current file pwd
path = { async = true, opts = { get_cwd = vim.fn.getcwd } }, -- use nvim pwd instead of current file pwd
ripgrep = {
enabled = false,
module = 'blink-ripgrep',
name = 'rg',
score_offset = -10,
async = true,
opts = {
project_root_marker = { '.git', '.jj' },
backend = {
use = 'gitgrep-or-ripgrep',
},
},
},
},
},