mirror of
https://github.com/iofq/nvim.nix.git
synced 2026-03-24 10:50:50 -05:00
Compare commits
4 commits
5c2077ba94
...
bd21447db6
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bd21447db6 | ||
| e5a176d5b7 | |||
| e9d4373ddc | |||
| 7000c3a405 |
6 changed files with 46 additions and 40 deletions
24
flake.lock
generated
24
flake.lock
generated
|
|
@ -181,11 +181,11 @@
|
||||||
"jj-nvim": {
|
"jj-nvim": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1771004667,
|
"lastModified": 1771953539,
|
||||||
"narHash": "sha256-G7ksxOJJmQeTbsdAYddSFWUs9kyW/nIL4mv0F3FiXAI=",
|
"narHash": "sha256-nokftWcAmmHX6UcH6O79xkLwbUpq1W8N9lf1e+NyGqE=",
|
||||||
"owner": "NicolasGB",
|
"owner": "NicolasGB",
|
||||||
"repo": "jj.nvim",
|
"repo": "jj.nvim",
|
||||||
"rev": "3d78c28f7e26d5c87f53e66e05a1393e6ca9fec2",
|
"rev": "bbba4051c862473637e98277f284d12b050588ca",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -219,11 +219,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1771027491,
|
"lastModified": 1772323514,
|
||||||
"narHash": "sha256-T53LDMjB9CmtBC4FJNAgcmJowiR8cbn6WVhIzYtfoVk=",
|
"narHash": "sha256-aWy20stlI6cl+UM1Ds8j4NSEfWTCp/VWW+SqQy+DOM8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "neovim-nightly-overlay",
|
"repo": "neovim-nightly-overlay",
|
||||||
"rev": "0774707cd1c97e3cf721f40dd3eaa5a5a2c1872e",
|
"rev": "744c005b53bd588a82b3662f82c791eecf4710ad",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -235,11 +235,11 @@
|
||||||
"neovim-src": {
|
"neovim-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1771027191,
|
"lastModified": 1772319592,
|
||||||
"narHash": "sha256-dIVrDC/L5LQC13FzJv1ezacGj5QwrWA3nIFUTRzS/FY=",
|
"narHash": "sha256-Bp+pAkfjSdUWV/giJFT9Gbp0wecQ+H4Kbh4+XfyOj5s=",
|
||||||
"owner": "neovim",
|
"owner": "neovim",
|
||||||
"repo": "neovim",
|
"repo": "neovim",
|
||||||
"rev": "289695c14efcb2cb61ea70a0dbaf0025f869b21c",
|
"rev": "8a79e3398a347248f067abe0c09097416fbf9cae",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -293,11 +293,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1771064210,
|
"lastModified": 1772360274,
|
||||||
"narHash": "sha256-Aah0oc1R4dvgrJvyuXuPv3bGaTWxysSqwNi9T/7V5zA=",
|
"narHash": "sha256-QYgww8vJTSl9SWxYP9ivFDP0WEwy1LsWieiJaaa2OXA=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5ee33c746a149c70e706c8254306eafc93f16f4b",
|
"rev": "96b187c6984f705ef930fa6d575f7e7f5dafddff",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
-- 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
|
||||||
|
|
@ -188,10 +187,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 = '#24383a', fg = '#7aa4a1' })
|
hi(0, 'DiffAdd', { bg = '#002800' })
|
||||||
hi(0, 'DiffChange', { bg = '#31474b', fg = '#73daca' })
|
hi(0, 'DiffChange', { bg = '#284b55' })
|
||||||
hi(0, 'DiffDelete', { bg = '#31474b', fg = '#e85c51' })
|
hi(0, 'DiffDelete', { bg = '#300000' })
|
||||||
hi(0, 'DiffText', { bg = '#466066' })
|
hi(0, 'DiffText', { bg = '#366066' })
|
||||||
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' })
|
||||||
|
|
@ -244,8 +243,6 @@ 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' })
|
||||||
|
|
@ -254,13 +251,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 = 'diffAdded' })
|
hi(0, 'MiniDiffOverAdd', { link = 'DiffAdd' })
|
||||||
hi(0, 'MiniDiffOverChange', { link = 'diffChanged' })
|
hi(0, 'MiniDiffOverChange', { link = 'DiffChange' })
|
||||||
hi(0, 'MiniDiffOverChangeBuf', { link = 'diffChanged' })
|
hi(0, 'MiniDiffOverChangeBuf', { link = 'DiffChange' })
|
||||||
hi(0, 'MiniDiffOverContext', { link = 'diffAdded' })
|
hi(0, 'MiniDiffOverContext', { link = 'DiffAdd' })
|
||||||
hi(0, 'MiniDiffOverDelete', { link = 'diffRemoved' })
|
hi(0, 'MiniDiffOverDelete', { link = 'DiffDelete' })
|
||||||
hi(0, 'MiniDiffSignAdd', { fg = 'green', bold = true })
|
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, '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' })
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,22 @@
|
||||||
local M = {}
|
local M = {}
|
||||||
|
|
||||||
M.is_jj_diffedit_open = function()
|
M.is_jj_diffedit_open = function()
|
||||||
local qf = vim.fn.getqflist()
|
local entry = vim.fn.getqflist[1]
|
||||||
|
|
||||||
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()
|
M.diffedit = function(opts)
|
||||||
vim.fn.jobstart('jj diffedit --tool diffview-new')
|
opts = opts or { args = '' }
|
||||||
|
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
|
||||||
|
|
|
||||||
|
|
@ -151,15 +151,8 @@ 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.refresh { bufnr = ev.buf }
|
vim.lsp.codelens.enable(true, { bufnr = ev.buf })
|
||||||
cmd({ 'InsertLeave', 'TextChanged' }, {
|
|
||||||
callback = function()
|
|
||||||
vim.lsp.codelens.refresh { bufnr = ev.buf }
|
|
||||||
end,
|
|
||||||
buffer = ev.buf,
|
|
||||||
})
|
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -43,6 +43,7 @@ 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
|
||||||
|
|
|
||||||
|
|
@ -59,6 +59,9 @@ 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 })
|
||||||
|
|
@ -129,12 +132,19 @@ 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 = { 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 = {
|
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',
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue