snacks rice + new colorscheme

This commit is contained in:
iofq 2025-07-06 21:11:29 -05:00
parent 66d50e274e
commit d998429cb8
No known key found for this signature in database
GPG key ID: ECF3B2DA38BF7183
15 changed files with 1068 additions and 427 deletions

View file

@ -24,6 +24,7 @@ vim.opt.tabstop = 2 -- 2 space tabs are based
vim.opt.updatetime = 250 -- decrease update time
vim.opt.virtualedit = 'onemore'
vim.opt.winborder = 'single'
vim.cmd('colorscheme iofq')
-- Switch tab length on the fly
vim.keymap.set('n', '\\t', function()
@ -44,7 +45,7 @@ vim.api.nvim_create_autocmd('BufWinEnter', {
if vim.bo[event.buf].filetype == 'help' then
vim.cmd.only()
vim.keymap.set('n', 'q', vim.cmd.bdelete, { noremap = true, silent = true })
vim.bo.buflisted = true
vim.bo.buflisted = false
end
end,
})
@ -87,6 +88,10 @@ vim.keymap.set('n', '<S-h>', vim.cmd.bprev, { noremap = true, silent = true })
vim.keymap.set('v', '<', '<gv')
vim.keymap.set('v', '>', '>gv')
vim.keymap.set({ 'v', 'n' }, 'q:', '<nop>')
vim.keymap.set('n', 'gq', vim.cmd.bdelete, { noremap = true, silent = true, desc = 'close buffer' })
vim.keymap.set('n', 'gQ', function()
vim.cmd('bufdo bdelete')
end, { noremap = true, silent = true, desc = 'close all buffers' })
-- resize splits if window got resized
vim.api.nvim_create_autocmd({ 'VimResized' }, {

View file

@ -1,14 +1,14 @@
local diff = require('mini.diff')
local JJ = {
local M = {
cache = {},
jj_cache = {},
}
JJ.get_buf_realpath = function(buf_id)
M.get_buf_realpath = function(buf_id)
return vim.loop.fs_realpath(vim.api.nvim_buf_get_name(buf_id)) or ''
end
JJ.jj_start_watching_tree_state = function(buf_id, path)
M.jj_start_watching_tree_state = function(buf_id, path)
local stdout = vim.loop.new_pipe()
local args = { 'workspace', 'root', '--ignore-working-copy' }
local spawn_opts = {
@ -19,11 +19,11 @@ JJ.jj_start_watching_tree_state = function(buf_id, path)
local on_not_in_jj = vim.schedule_wrap(function()
if not vim.api.nvim_buf_is_valid(buf_id) then
JJ.cache[buf_id] = nil
M.cache[buf_id] = nil
return
end
diff.fail_attach(buf_id)
JJ.jj_cache[buf_id] = {}
M.jj_cache[buf_id] = {}
end)
local process, stdout_feed = nil, {}
@ -37,20 +37,20 @@ JJ.jj_start_watching_tree_state = function(buf_id, path)
-- Set up index watching
local jj_dir_path = table.concat(stdout_feed, ''):gsub('\n+$', '') .. '/.jj/working_copy'
JJ.jj_setup_tree_state_watch(buf_id, jj_dir_path)
M.jj_setup_tree_state_watch(buf_id, jj_dir_path)
-- Set reference text immediately
JJ.jj_set_ref_text(buf_id)
M.jj_set_ref_text(buf_id)
end
process = vim.loop.spawn('jj', spawn_opts, on_exit)
JJ.jj_read_stream(stdout, stdout_feed)
M.jj_read_stream(stdout, stdout_feed)
end
JJ.jj_setup_tree_state_watch = function(buf_id, jj_dir_path)
M.jj_setup_tree_state_watch = function(buf_id, jj_dir_path)
local buf_fs_event, timer = vim.loop.new_fs_event(), vim.loop.new_timer()
local buf_jj_set_ref_text = function()
JJ.jj_set_ref_text(buf_id)
M.jj_set_ref_text(buf_id)
end
local watch_tree_state = function(_, filename, _)
@ -63,11 +63,11 @@ JJ.jj_setup_tree_state_watch = function(buf_id, jj_dir_path)
end
buf_fs_event:start(jj_dir_path, { recursive = false }, watch_tree_state)
JJ.jj_invalidate_cache(JJ.jj_cache[buf_id])
JJ.jj_cache[buf_id] = { fs_event = buf_fs_event, timer = timer }
M.jj_invalidate_cache(M.jj_cache[buf_id])
M.jj_cache[buf_id] = { fs_event = buf_fs_event, timer = timer }
end
JJ.jj_set_ref_text = vim.schedule_wrap(function(buf_id)
M.jj_set_ref_text = vim.schedule_wrap(function(buf_id)
if not vim.api.nvim_buf_is_valid(buf_id) then
return
end
@ -77,7 +77,7 @@ JJ.jj_set_ref_text = vim.schedule_wrap(function(buf_id)
end)
-- NOTE: Do not cache buffer's name to react to its possible rename
local path = JJ.get_buf_realpath(buf_id)
local path = M.get_buf_realpath(buf_id)
if path == '' then
return buf_set_ref_text {}
end
@ -105,10 +105,10 @@ JJ.jj_set_ref_text = vim.schedule_wrap(function(buf_id)
end
process = vim.loop.spawn('jj', spawn_opts, on_exit)
JJ.jj_read_stream(stdout, stdout_feed)
M.jj_read_stream(stdout, stdout_feed)
end)
JJ.jj_read_stream = function(stream, feed)
M.jj_read_stream = function(stream, feed)
local callback = function(err, data)
if data ~= nil then
return table.insert(feed, data)
@ -121,7 +121,7 @@ JJ.jj_read_stream = function(stream, feed)
stream:read_start(callback)
end
JJ.jj_invalidate_cache = function(cache)
M.jj_invalidate_cache = function(cache)
if cache == nil then
return
end
@ -129,26 +129,26 @@ JJ.jj_invalidate_cache = function(cache)
pcall(vim.loop.timer_stop, cache.timer)
end
local jj = function()
M.gen_source = function()
local attach = function(buf_id)
-- Try attaching to a buffer only once
if JJ.jj_cache[buf_id] ~= nil then
if M.jj_cache[buf_id] ~= nil then
return false
end
-- - Possibly resolve symlinks to get data from the original repo
local path = JJ.get_buf_realpath(buf_id)
local path = M.get_buf_realpath(buf_id)
if path == '' then
return false
end
JJ.jj_cache[buf_id] = {}
JJ.jj_start_watching_tree_state(buf_id, path)
M.jj_cache[buf_id] = {}
M.jj_start_watching_tree_state(buf_id, path)
end
local detach = function(buf_id)
local cache = JJ.jj_cache[buf_id]
JJ.jj_cache[buf_id] = nil
JJ.jj_invalidate_cache(cache)
local cache = M.jj_cache[buf_id]
M.jj_cache[buf_id] = nil
M.jj_invalidate_cache(cache)
end
local apply_hunks = function(_, _)
@ -162,4 +162,4 @@ local jj = function()
apply_hunks = apply_hunks,
}
end
return jj
return M

View file

@ -1,7 +1,8 @@
local M = {}
M.load = function()
sessions = require('mini.sessions')
M.get_id = function()
local jj_root = vim.system({ 'jj', 'workspace', 'root' }):wait()
local sessions = require('mini.sessions')
if jj_root.code ~= 0 then
return
@ -19,29 +20,42 @@ M.load = function()
'--no-graph',
})
:wait()
local branch = vim.trim(string.gsub(result.stdout, '[\n*]', ''))
local branch = vim.trim(string.gsub(result.stdout, '[\n*]', '')) -- trim newlines and unpushed indicator
local root = vim.trim(string.gsub(jj_root.stdout, '\n', ''))
local jj_sesh = string.gsub(string.format('jj:%s:%s', root, branch), '[./]', '-')
if jj_sesh ~= '' then
vim.opt.shadafile = vim.fn.stdpath('data') .. '/myshada/' .. jj_sesh .. '.shada'
for name, _ in pairs(sessions.detected) do
if name == jj_sesh then
vim.ui.select({
'No',
'Yes',
}, { prompt = 'Session found at ' .. jj_sesh .. ', load it?' }, function(c)
if c == 'Yes' then
-- load session (buffers, etc) as well as shada (marks)
sessions.read(jj_sesh)
vim.cmd('rshada')
vim.notify('loaded jj session: ' .. jj_sesh)
end
end)
return
end
local id = string.gsub(string.format('jj:%s:%s', root, branch), '[./]', '-') -- slugify
return id
end
M.check_exists = function(id)
for name, _ in pairs(sessions.detected) do
if name == id then
return true
end
vim.cmd('wshada')
sessions.write(jj_sesh)
end
return false
end
M.load = function()
local id = M.get_id()
if id == '' then
return
end
vim.opt.shadafile = vim.fn.stdpath('data') .. '/myshada/' .. id .. '.shada'
if M.check_exists(id) then
vim.ui.select({
'Yes',
'No',
}, { prompt = 'Session found at ' .. id .. ', load it?' }, function(c)
if c == 'Yes' then
-- load session (buffers, etc) as well as shada (marks)
sessions.read(id)
vim.cmd('rshada')
vim.notify('loaded jj session: ' .. id)
end
end)
else
vim.cmd('wshada') -- create session if it did not exist
sessions.write(id)
end
end

View file

@ -0,0 +1,26 @@
M = {}
M.marks = function()
return {
finder = 'vim_marks',
format = 'file',
['local'] = false,
global = true,
actions = {
markdel = function(picker)
for _, item in ipairs(picker:selected()) do
vim.cmd.delmarks { args = { item.label } }
end
vim.cmd('wshada')
picker.list:set_selected()
picker.list:set_target()
picker:find()
end,
},
win = {
list = {
keys = { ['dd'] = 'markdel' },
},
},
}
end
return M

View file

@ -67,6 +67,7 @@ function M.revs()
Snacks.picker.util.cmd(cmd, function()
Snacks.notify('Checking out revision: ' .. item.rev, { title = 'Snacks Picker' })
vim.cmd.checktime()
require('plugins.lib.session_jj').load()
end, { cwd = item.cwd })
end
end

View file

@ -8,7 +8,7 @@ return {
follow = false,
auto_close = false,
win = {
size = 0.25,
size = 0.33,
position = 'right',
type = 'split',
},
@ -17,7 +17,6 @@ return {
{
'gre',
'<cmd>Trouble diagnostics toggle<CR>',
noremap = true,
desc = 'Trouble diagnostics',
},
},
@ -25,10 +24,6 @@ return {
{
'neovim/nvim-lspconfig',
event = 'VeryLazy',
dependencies = {
'folke/trouble.nvim',
'saghen/blink.cmp',
},
config = function()
vim.lsp.enable {
'nil_ls',
@ -40,53 +35,36 @@ return {
vim.api.nvim_create_autocmd('LspAttach', {
group = vim.api.nvim_create_augroup('UserLspConfig', {}),
callback = function(ev)
local bufnr = ev.buf
local client = vim.lsp.get_client_by_id(ev.data.client_id)
if not client then
return
end
vim.keymap.set('n', 'grg', '<cmd>Trouble lsp toggle<CR>', { buffer = ev.buf, desc = 'Trouble LSP' })
vim.keymap.set(
'n',
'grt',
'<cmd>Trouble lsp toggle focus=true <CR>',
{ buffer = ev.buf, noremap = true, silent = true, desc = 'Trouble LSP ' }
)
vim.keymap.set(
'n',
'grs',
'<cmd>Trouble lsp_document_symbols toggle win.position=left <CR>',
{ buffer = ev.buf, noremap = true, silent = true, desc = 'Trouble LSP symbols' }
)
vim.keymap.set(
'n',
'grd',
'<cmd>Trouble lsp_definitions toggle <CR>',
{ buffer = ev.buf, noremap = true, silent = true, desc = 'Trouble LSP definition' }
)
vim.keymap.set(
'n',
'grr',
'<cmd>Trouble lsp_references toggle <CR>',
{ buffer = ev.buf, noremap = true, silent = true, desc = 'Trouble LSP definition' }
)
vim.keymap.set(
'n',
'grl',
vim.lsp.codelens.run,
{ buffer = ev.buf, noremap = true, silent = true, desc = 'vim.lsp.codelens.run()' }
'gO',
'<cmd>Trouble lsp_document_symbols win.position=left<CR>',
{ buffer = ev.buf, desc = 'Trouble LSP symbols' }
)
vim.keymap.set('n', 'grd', function()
Snacks.picker.lsp_definitions { focus = 'list' }
end, { buffer = ev.buf, desc = 'LSP definition' })
vim.keymap.set('n', 'grr', function()
Snacks.picker.lsp_references { focus = 'list' }
end, { buffer = ev.buf, desc = 'LSP definition' })
vim.keymap.set('n', 'grh', function()
vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled())
end, { buffer = ev.buf, noremap = true, silent = true, desc = 'LSP hints toggle' })
end, { buffer = ev.buf, desc = 'LSP hints toggle' })
vim.keymap.set('n', 'grl', vim.lsp.codelens.run, { buffer = ev.buf, desc = 'vim.lsp.codelens.run()' })
-- Auto-refresh code lenses
if client.server_capabilities.codeLensProvider then
vim.api.nvim_create_autocmd({ 'InsertLeave', 'TextChanged' }, {
group = vim.api.nvim_create_augroup(string.format('lsp-%s-%s', bufnr, client.id), {}),
group = vim.api.nvim_create_augroup(string.format('lsp-%s-%s', ev.buf, client.id), {}),
callback = function()
vim.lsp.codelens.refresh { bufnr = bufnr }
vim.lsp.codelens.refresh { bufnr = ev.buf }
end,
buffer = bufnr,
buffer = ev.buf,
})
vim.lsp.codelens.refresh()
end

View file

@ -1,7 +1,6 @@
return {
{
'echasnovski/mini.nvim',
dependencies = 'nvim-treesitter/nvim-treesitter-textobjects',
lazy = false,
keys = {
{
@ -23,13 +22,11 @@ return {
{
'<leader>gb',
'<Cmd>Git blame -- %<CR>',
noremap = true,
desc = 'git blame',
},
{
'<leader>gg',
':Git ',
noremap = true,
desc = 'git command',
},
{
@ -40,6 +37,13 @@ return {
noremap = true,
desc = 'mini session select',
},
{
'\\z',
function()
require('mini.misc').zoom()
end,
desc = 'mini zoom',
},
},
config = function()
require('mini.basics').setup { mappings = { windows = true } }
@ -99,16 +103,17 @@ return {
require('mini.surround').setup()
require('mini.splitjoin').setup { detect = { separator = '[,;\n]' } }
local sessions = require('mini.sessions')
sessions.setup {
require('mini.sessions').setup {
file = '',
autowrite = true,
verbose = {
write = false,
},
}
if #vim.fn.argv() == 0 then
require('plugins.lib.session_jj').load()
local jj_sesh = require('plugins.lib.session_jj')
local jj_id = jj_sesh.get_id()
if jj_sesh.check_exists(jj_id) then
Snacks.notify('Existing session for ' .. jj_id)
end
local jump = require('mini.jump2d')
@ -130,7 +135,7 @@ return {
diff.setup {
options = { wrap_goto = true },
source = {
jj(),
jj.gen_source(),
diff.gen_source.git(),
},
}
@ -170,10 +175,14 @@ return {
width_preview = 50,
},
}
vim.keymap.set('n', '<leader>nc', files.open, { noremap = true, desc = 'minifiles open' })
vim.keymap.set('n', '<leader>nc', files.open, { desc = 'minifiles open' })
vim.api.nvim_create_autocmd('User', {
pattern = 'MiniFilesBufferCreate',
callback = function(args)
vim.keymap.set('n', '<leader>nc', function()
files.synchronize()
files.close()
end, { buffer = args.data.buf_id })
vim.keymap.set('n', '`', function()
local cur_entry_path = MiniFiles.get_fs_entry().path
local cur_directory = vim.fs.dirname(cur_entry_path)
@ -181,7 +190,12 @@ return {
end, { buffer = args.data.buf_id })
end,
})
vim.api.nvim_create_autocmd('User', {
pattern = 'MiniFilesActionRename',
callback = function(event)
Snacks.rename.on_rename_file(event.data.from, event.data.to)
end,
})
local multi = require('mini.keymap').map_multistep
multi({ 'i' }, '<BS>', { 'minipairs_bs' })
multi({ 'i', 's' }, '<Tab>', { 'blink_accept', 'vimsnippet_next', 'increase_indent' })

View file

@ -39,53 +39,21 @@ return {
},
},
keys = {
{ '<leader>nb', vim.cmd.DiffviewOpen, noremap = true, desc = 'diffview open' },
{ '<leader>nb', vim.cmd.DiffviewOpen, desc = 'diffview open' },
{
'<leader>nh',
'<cmd>DiffviewFileHistory %<cr>',
mode = { 'n', 'v' },
noremap = true,
desc = 'diffview history',
},
{
'<leader>nH',
'<cmd>DiffviewFileHistory<cr>',
mode = { 'n', 'v' },
noremap = true,
desc = 'diffview history',
},
},
},
{
'EdenEast/nightfox.nvim',
lazy = false,
priority = 1000,
opts = {
options = {
transparent = true,
terminal_colors = true,
modules = {
'mini',
'treesitter',
'neogit',
'native_lsp',
'diagnostic',
'modes',
},
},
},
config = function(_, opts)
require('nightfox').setup(opts)
vim.cmd('colorscheme terafox')
vim.api.nvim_set_hl(0, 'StatusLine', { bg = 'none' })
vim.api.nvim_set_hl(0, 'StatusLineNC', { bg = 'none' })
vim.api.nvim_set_hl(0, 'TablineFill', { bg = 'none' })
vim.api.nvim_set_hl(0, 'MiniDiffSignAdd', { fg = 'green', bold = true })
vim.api.nvim_set_hl(0, 'MiniDiffSignDelete', { fg = 'red', bold = true })
vim.api.nvim_set_hl(0, 'MiniDiffSignChange', { fg = 'green', bold = true })
vim.api.nvim_set_hl(0, 'BlinkCmpGhostText', { link = 'String' })
end,
},
{
'ThePrimeagen/refactoring.nvim',
event = 'VeryLazy',

View file

@ -1,47 +1,53 @@
return {
{
'folke/snacks.nvim',
dependencies = {
'folke/trouble.nvim',
},
lazy = false,
priority = 1000,
opts = {
bigfile = { enabled = true },
bufdelete = { enabled = true },
quickfile = { enabled = true },
notifier = { enabled = true },
notifier = {
enabled = true,
timeout = 5000,
},
styles = {
notification = {
wo = { wrap = true },
},
},
terminal = { enabled = true },
indent = { enabled = true },
input = { enabled = true },
words = { enabled = true },
picker = {
enabled = true,
matcher = { frecency = true },
layout = {
preset = function()
return vim.o.columns >= 120 and 'telescope' or 'vertical'
end,
matcher = {
frecency = true,
history_bonus = true,
},
layout = 'ivy_split',
sources = {
files = { hidden = true },
grep = { hidden = true },
explorer = { hidden = true },
git_files = { untracked = true },
smart = {
multi = { 'buffers', 'recent', 'files' },
lsp_symbols = {
filter = { default = true },
layout = 'left',
},
smart = {
multi = {
require('plugins.lib.snacks').marks(),
{ source = 'buffers', current = false },
'recent',
{ source = 'files', hidden = true },
},
},
},
actions = {
trouble_open = function(...)
return require('trouble.sources.snacks').actions.trouble_open.action(...)
end,
},
win = {
input = {
keys = {
['wq'] = { 'close', mode = 'i' },
['<c-t>'] = { 'trouble_open', mode = { 'n', 'i' } },
},
},
list = {
@ -52,10 +58,6 @@ return {
},
},
},
config = function(_, opts)
require('snacks').setup(opts)
vim.api.nvim_set_hl(0, 'SnacksPickerDir', { fg = '#cccccc' })
end,
keys = {
{
'<C-\\>',
@ -63,7 +65,6 @@ return {
Snacks.terminal.toggle()
end,
mode = { 'n', 't' },
noremap = true,
desc = 'terminal open',
},
{
@ -72,7 +73,6 @@ return {
Snacks.terminal.toggle('$SHELL')
end,
mode = { 'n', 't' },
noremap = true,
desc = 'terminal open',
},
{
@ -80,7 +80,6 @@ return {
function()
Snacks.words.jump(1, true)
end,
noremap = true,
desc = 'next reference',
},
{
@ -88,51 +87,21 @@ return {
function()
Snacks.words.jump(-1, true)
end,
noremap = true,
desc = 'next reference',
},
{
'\\z',
function()
if Snacks.dim.enabled then
Snacks.dim.disable()
else
Snacks.dim.enable()
end
end,
noremap = true,
desc = 'next reference',
},
{
'gq',
function()
Snacks.bufdelete()
end,
noremap = true,
silent = true,
},
{
'gQ',
function()
Snacks.bufdelete.other()
end,
noremap = true,
silent = true,
},
{
'<leader>ff',
'<leader><leader>',
function()
vim.cmd.delmarks { args = { '0-9' } }
Snacks.picker.smart()
end,
noremap = true,
desc = 'Fuzzy find files',
desc = 'Fuzzy find smart',
},
{
'<leader>fe',
function()
Snacks.explorer()
end,
noremap = true,
desc = 'snacks explorer',
},
{
@ -140,8 +109,13 @@ return {
function()
Snacks.picker.git_files()
end,
noremap = true,
silent = true,
desc = 'Fuzzy find git files',
},
{
'<leader>ff',
function()
Snacks.picker.files()
end,
desc = 'Fuzzy find files',
},
{
@ -149,8 +123,6 @@ return {
function()
Snacks.picker.grep()
end,
noremap = true,
silent = true,
desc = 'Fuzzy find grep',
},
{
@ -158,8 +130,6 @@ return {
function()
Snacks.picker.grep_word()
end,
noremap = true,
silent = true,
desc = 'Fuzzy find grep word',
},
{
@ -167,8 +137,6 @@ return {
function()
Snacks.picker.pickers()
end,
noremap = true,
silent = true,
desc = 'See all pickers',
},
{
@ -176,8 +144,6 @@ return {
function()
Snacks.picker.undo()
end,
noremap = true,
silent = true,
desc = 'Pick undotree',
},
{
@ -185,8 +151,6 @@ return {
function()
Snacks.picker.jumps()
end,
noremap = true,
silent = true,
desc = 'Pick jumps',
},
{
@ -194,17 +158,13 @@ return {
function()
Snacks.picker.resume()
end,
noremap = true,
silent = true,
desc = 'Fuzzy find resume',
},
{
'<leader><leader>',
'<leader>fb',
function()
Snacks.picker.buffers()
end,
noremap = true,
silent = true,
desc = 'Fuzzy find buffers',
},
{
@ -212,44 +172,14 @@ return {
function()
Snacks.picker.notifications()
end,
noremap = true,
silent = true,
desc = 'pick notifications',
},
{
'<leader>fm',
function()
vim.cmd.delmarks { args = { '0-9' } }
Snacks.picker.pick {
finder = 'vim_marks',
format = 'file',
['local'] = false,
global = true,
actions = {
markdel = function(picker)
for _, item in ipairs(picker:selected()) do
vim.cmd.delmarks { args = { item.label } }
end
vim.cmd('wshada')
picker.list:set_selected()
picker.list:set_target()
picker:find()
end,
},
win = {
input = {
keys = {
['<c-x>'] = { 'markdel', mode = { 'n', 'i' } },
},
},
list = {
keys = { ['dd'] = 'markdel' },
},
},
}
Snacks.picker.pick(require('plugins.lib.snacks').marks())
end,
noremap = true,
silent = true,
desc = 'pick global marks',
},
{
@ -257,8 +187,6 @@ return {
function()
require('plugins.lib.snacks_jj').status()
end,
noremap = true,
silent = true,
desc = 'pick notifications',
},
{
@ -266,8 +194,6 @@ return {
function()
require('plugins.lib.snacks_jj').revs()
end,
noremap = true,
silent = true,
desc = 'pick notifications',
},
},

View file

@ -11,6 +11,7 @@ return {
},
},
'nvim-treesitter/nvim-treesitter-textobjects',
'RRethy/nvim-treesitter-textsubjects',
},
config = function()
require('nvim-treesitter.configs').setup {
@ -49,13 +50,6 @@ return {
},
},
},
incremental_selection = {
enable = true,
keymaps = {
node_incremental = 'v',
node_decremental = '<S-TAB>',
},
},
}
end,
},