chris/nvim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of labs.scarif.space:chris/nvim

Browse Source
This commit is contained in:
Chris
2026-03-31 14:15:49 +01:00
parent b4fd6c1988 8d1278b84a
commit bd2349c1ba
4 changed files with 181 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

237
lua/autocmd.lua
View File

@@ -35,85 +35,176 @@ vim.api.nvim_create_autocmd('SwapExists', {
}) })
-- vim.api.nvim_create_autocmd('TextChanged', { -- vim.api.nvim_create_autocmd('TextChanged', {
-- group = autosave_group, -- group = autosave_group,
-- pattern = '*', -- pattern = '*',
-- command = 'silent! wa', -- Save all files when text is changed -- command = 'silent! wa', -- Save all files when text is changed
-- }) -- })
vim.api.nvim_create_autocmd('User', { vim.api.nvim_create_autocmd('User', {
pattern = 'OilActionsPost', pattern = 'OilActionsPost',
callback = function(event) callback = function(event)
if event.data.actions.type == 'move' then if event.data.actions.type == 'move' then
Snacks.rename.on_rename_file(event.data.actions.src_url, event.data.actions.dest_url) Snacks.rename.on_rename_file(event.data.actions.src_url, event.data.actions.dest_url)
end end
end, end,
}) })
local fidget_group = vim.api.nvim_create_augroup('CodeCompanionFidgetHooks', { clear = true }) local fidget_group = vim.api.nvim_create_augroup('CodeCompanionFidgetHooks', { clear = true })
vim.api.nvim_create_autocmd({ 'User' }, { vim.api.nvim_create_autocmd({ 'User' }, {
pattern = 'CodeCompanionRequestStarted', pattern = 'CodeCompanionRequestStarted',
group = fidget_group, group = fidget_group,
callback = function(event) callback = function(event)
local FidgetHelper = require 'utils.fidget_helper' local FidgetHelper = require 'utils.fidget_helper'
-- Pass event instead of request if the callback receives the full event object -- Pass event instead of request if the callback receives the full event object
local handle = FidgetHelper:create_progress_handle(event) local handle = FidgetHelper:create_progress_handle(event)
FidgetHelper:store_progress_handle(event.data.id, handle) FidgetHelper:store_progress_handle(event.data.id, handle)
end, end,
}) })
vim.api.nvim_create_autocmd({ 'User' }, { vim.api.nvim_create_autocmd({ 'User' }, {
pattern = 'CodeCompanionRequestFinished', pattern = 'CodeCompanionRequestFinished',
group = fidget_group, group = fidget_group,
callback = function(event) callback = function(event)
local FidgetHelper = require 'utils.fidget_helper' local FidgetHelper = require 'utils.fidget_helper'
local handle = FidgetHelper:pop_progress_handle(event.data.id) local handle = FidgetHelper:pop_progress_handle(event.data.id)
if handle then if handle then
FidgetHelper:report_exit_status(handle, event) FidgetHelper:report_exit_status(handle, event)
handle:finish() handle:finish()
end end
end, end,
}) })
-- vim.api.nvim_create_autocmd('BufEnter', { -- vim.api.nvim_create_autocmd('BufEnter', {
-- callback = function(event) -- callback = function(event)
-- local windows = vim.api.nvim_list_wins() -- local windows = vim.api.nvim_list_wins()
-- --
-- for _, window in ipairs(windows) do -- for _, window in ipairs(windows) do
-- local bufnr = vim.api.nvim_win_get_buf(window) -- local bufnr = vim.api.nvim_win_get_buf(window)
-- local ft = vim.api.nvim_get_option_value('filetype', { buf = bufnr }) -- local ft = vim.api.nvim_get_option_value('filetype', { buf = bufnr })
-- if vim.api.nvim_get_option_value('buflisted', { buf = bufnr }) -- if vim.api.nvim_get_option_value('buflisted', { buf = bufnr })
-- or ft == 'oil' -- or ft == 'oil'
-- or ft == 'snacks_dashboard' then -- or ft == 'snacks_dashboard' then
-- return -- return
-- end -- end
-- end -- end
-- vim.cmd 'qa' -- vim.cmd 'qa'
-- end, -- end,
-- }) -- })
local modes_group = vim.api.nvim_create_augroup('modes', { clear = true }) local modes_group = vim.api.nvim_create_augroup('modes', { clear = true })
vim.api.nvim_create_autocmd('FocusLost', { vim.api.nvim_create_autocmd('FocusLost', {
group = modes_group, group = modes_group,
pattern = '*', pattern = '*',
command = 'call feedkeys("\\<Esc>")', command = 'call feedkeys("\\<Esc>")',
}) })
vim.api.nvim_create_autocmd('BufNewFile', { vim.api.nvim_create_autocmd('BufNewFile', {
group = modes_group, group = modes_group,
pattern = '*', pattern = '*',
command = 'call feedkeys("i")', command = 'call feedkeys("i")',
}) })
-- Reload LuaSnip snippets when saving files in the snippets directory -- Reload LuaSnip snippets when saving files in the snippets directory
local snippets_dir = vim.fn.stdpath 'config' .. '/lua/snippets' local snippets_dir = vim.fn.stdpath 'config' .. '/lua/snippets'
vim.api.nvim_create_autocmd('BufWritePost', { vim.api.nvim_create_autocmd('BufWritePost', {
pattern = snippets_dir .. '/*.json', -- Adjust the path to match your snippets directory pattern = snippets_dir .. '/*.json', -- Adjust the path to match your snippets directory
desc = 'Reload LuaSnip snippets on save', desc = 'Reload LuaSnip snippets on save',
callback = function() callback = function()
require('luasnip.loaders.from_vscode').lazy_load { paths = { snippets_dir } } require('luasnip.loaders.from_vscode').lazy_load { paths = { snippets_dir } }
vim.notify('Snippets reloaded!', vim.log.levels.INFO) vim.notify('Snippets reloaded!', vim.log.levels.INFO)
end, end,
}) })
require('helpers').edit_cf('a', '/lua/autocmd.lua') local configs = {
{
path = os.getenv("HOME") .. "/.config/nixos",
worktree = nil,
git_dir = nil,
track_untracked = false,
force_add = false
},
{
path = os.getenv("HOME") .. "/.config/nvim",
worktree = nil,
git_dir = nil,
track_untracked = false,
force_add = false
},
{
path = os.getenv("HOME"),
worktree = os.getenv("HOME"),
git_dir = os.getenv("HOME") .. "/.config/dotfiles/.git",
track_untracked = true,
force_add = true, -- Handles ignored files in dotfiles
include_dirs = { ".config", ".local/bin", ".local/share" }
}
}
local function get_git_status(config)
local base = "git"
if config.git_dir and config.worktree then
base = string.format("git --git-dir=%s --worktree=%s", config.git_dir, config.worktree)
end
-- Check modified and untracked (including ignored if force_add is true)
local cmd = base .. " status --porcelain"
if config.force_add then cmd = cmd .. " --ignored" end
local handle = io.popen(cmd)
local result = handle:read("*a")
handle:close()
local has_changes = false
for line in result:gmatch("[^\r\n]+") do
local status = line:sub(1, 2)
local file = line:sub(4)
if status:match("[MAR]") then
has_changes = true
elseif (status == "??" or status == "!!") and config.track_untracked then
if config.include_dirs then
for _, dir in ipairs(config.include_dirs) do
if file:sub(1, #dir) == dir then
has_changes = true
break
end
end
else
has_changes = true
end
end
end
return has_changes, base
end
vim.api.nvim_create_autocmd("VimLeavePre", {
callback = function()
local cwd = vim.fn.getcwd()
for _, config in ipairs(configs) do
if cwd:sub(1, #config.path) == config.path then
local has_changes, git_base = get_git_status(config)
if has_changes then
local confirm = vim.fn.confirm("Uncommitted changes in managed path. Commit?", "&Yes\n&No", 2)
if confirm == 1 then
local msg = vim.fn.input("Commit message: ", "chore: update files")
if msg ~= "" then
msg = "Update files"
end
local add_cmd = " add -A"
os.execute(git_base .. add_cmd)
os.execute(git_base .. " commit -m " .. vim.fn.shellescape(msg))
os.execute(git_base .. " push")
print("\nChanges committed.")
end
end
break
end
end
end,
})
require('helpers').edit_cf('a', '/lua/autocmd.lua')

23
lua/plugins/color.lua
View File

@@ -4,19 +4,24 @@ return {
-- change the command in the config to whatever the name of that colorscheme is. -- change the command in the config to whatever the name of that colorscheme is.
-- --
-- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`.
'folke/tokyonight.nvim', 'AlphaTechnolog/pywal.nvim',
dependencies = {
'folke/tokyonight.nvim',
},
priority = 1000, -- Make sure to load this before all the other start plugins. priority = 1000, -- Make sure to load this before all the other start plugins.
config = function() config = function()
---@diagnostic disable-next-line: missing-fields ---@diagnostic disable-next-line: missing-fields
require('tokyonight').setup { require('tokyonight').setup()
styles = {
comments = { italic = false }, -- Disable italics in comments
},
}
-- Load the colorscheme here.
-- Like many other themes, this one has different styles, and you could load
-- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
vim.cmd.colorscheme 'tokyonight-night' vim.cmd.colorscheme 'tokyonight-night'
-- Check if wal directory exists otherwise use tokyo
local handle = io.popen 'ls -d $HOME/.cache/wal 2>/dev/null'
local result = handle:read '*a'
handle:close()
if result ~= '' then
require('pywal').setup()
end
end, end,
} }

3
lua/plugins/pywal.lua Normal file
View File

@@ -0,0 +1,3 @@
return {
'AlphaTechnolog/pywal.nvim',
}

1
lua/plugins/treesitter.lua
View File

@@ -3,7 +3,6 @@ return {
'nvim-treesitter/nvim-treesitter', 'nvim-treesitter/nvim-treesitter',
branch = 'main', branch = 'main',
build = ':TSUpdate', build = ':TSUpdate',
lazy = false,
-- [[ Configure Treesitter ]] See `:help nvim-treesitter` -- [[ Configure Treesitter ]] See `:help nvim-treesitter`
config = function() config = function()
local langs = { local langs = {