Compare commits

..

1 commit

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

• Updated input 'dart':
    'github:iofq/dart.nvim/205f809fbb27d56aff22756a97b5ba6f0c7243c3?narHash=sha256-lLY34wnbyzi21zE8i%2BVM0AoEt67r4aPn/EoaZ8o4NgU%3D' (2025-12-07)
  → 'github:iofq/dart.nvim/af7256291c8f692647004b9a9fc0e92b6084a691?narHash=sha256-o1UvUGjq3kiiyv/jrVxIEsl3y3wFnBvgSJpyjXTOsMw%3D' (2026-02-14)
• Updated input 'jj-nvim':
    'github:NicolasGB/jj.nvim/d13a5c9aec08318323f19fcdc1a1d2c469e00739?narHash=sha256-8POSGuNYdAR2peyzN92vWR87GqWf%2BY6I1arOwNxwd6U%3D' (2026-01-11)
  → 'github:NicolasGB/jj.nvim/3d78c28f7e26d5c87f53e66e05a1393e6ca9fec2?narHash=sha256-G7ksxOJJmQeTbsdAYddSFWUs9kyW/nIL4mv0F3FiXAI%3D' (2026-02-13)
• Updated input 'neovim-nightly-overlay':
    'github:nix-community/neovim-nightly-overlay/d31b28318affe5d58ef12e7f72a7adfa66930a7a?narHash=sha256-pxxUR3VRDcDpMgF1qb9FnlHAEOGi24bk6pdB1QzL1II%3D' (2026-01-10)
  → 'github:nix-community/neovim-nightly-overlay/0774707cd1c97e3cf721f40dd3eaa5a5a2c1872e?narHash=sha256-T53LDMjB9CmtBC4FJNAgcmJowiR8cbn6WVhIzYtfoVk%3D' (2026-02-14)
• Updated input 'neovim-nightly-overlay/flake-parts':
    'github:hercules-ci/flake-parts/250481aafeb741edfe23d29195671c19b36b6dca?narHash=sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY%3D' (2026-01-05)
  → 'github:hercules-ci/flake-parts/57928607ea566b5db3ad13af0e57e921e6b12381?narHash=sha256-AnYjnFWgS49RlqX7LrC4uA%2BsCCDBj0Ry/WOJ5XWAsa0%3D' (2026-02-02)
• Updated input 'neovim-nightly-overlay/neovim-src':
    'github:neovim/neovim/930817f1009d9d392103b5440e2503cb47fdacc0?narHash=sha256-hcdQHR8l8oZDIl0vXKNtbrN%2B32dTs9EYvlqppoHgG2k%3D' (2026-01-09)
  → 'github:neovim/neovim/289695c14efcb2cb61ea70a0dbaf0025f869b21c?narHash=sha256-dIVrDC/L5LQC13FzJv1ezacGj5QwrWA3nIFUTRzS/FY%3D' (2026-02-13)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/299d331f770cdf7c466a4faa08b3070a767d681d?narHash=sha256-V7El1ktdJ0/WWEr6wGBKFYu433vitrWvxmvPk79FsSc%3D' (2026-01-10)
  → 'github:NixOS/nixpkgs/5ee33c746a149c70e706c8254306eafc93f16f4b?narHash=sha256-Aah0oc1R4dvgrJvyuXuPv3bGaTWxysSqwNi9T/7V5zA%3D' (2026-02-14)
2026-02-14 10:25:42 +00:00
6 changed files with 40 additions and 46 deletions

24
flake.lock generated
View file

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

View file

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

View file

@ -1,22 +1,17 @@
local M = {} local M = {}
M.is_jj_diffedit_open = function() M.is_jj_diffedit_open = function()
local entry = vim.fn.getqflist[1] local qf = vim.fn.getqflist()
local entry = qf[1]
if not entry or not entry.user_data or not entry.user_data.diff then 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 return 0
else else
return 1 return 1
end end
end end
M.diffedit = function(opts) M.diffedit = function()
opts = opts or { args = '' } vim.fn.jobstart('jj diffedit --tool diffview-new')
vim.fn.jobstart('jj diffedit --tool difftool ' .. opts.args)
end end
vim.api.nvim_create_user_command('Diffedit', M.diffedit, { nargs = '*' })
return M return M

View file

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

View file

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

View file

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