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

lua/autocmd.lua

@@ -50,32 +50,6 @@ vim.api.nvim_create_autocmd('User', {
     end,
 })
 
-local fidget_group = vim.api.nvim_create_augroup('CodeCompanionFidgetHooks', { clear = true })
-
-vim.api.nvim_create_autocmd({ 'User' }, {
-    pattern = 'CodeCompanionRequestStarted',
-    group = fidget_group,
-    callback = function(event)
-        local FidgetHelper = require 'utils.fidget_helper'
-        -- Pass event instead of request if the callback receives the full event object
-        local handle = FidgetHelper:create_progress_handle(event)
-        FidgetHelper:store_progress_handle(event.data.id, handle)
-    end,
-})
-
-vim.api.nvim_create_autocmd({ 'User' }, {
-    pattern = 'CodeCompanionRequestFinished',
-    group = fidget_group,
-    callback = function(event)
-        local FidgetHelper = require 'utils.fidget_helper'
-        local handle = FidgetHelper:pop_progress_handle(event.data.id)
-        if handle then
-            FidgetHelper:report_exit_status(handle, event)
-            handle:finish()
-        end
-    end,
-})
-
 -- vim.api.nvim_create_autocmd('BufEnter', {
 --     callback = function(event)
 --         local windows = vim.api.nvim_list_wins()
@@ -124,6 +98,19 @@ vim.api.nvim_create_autocmd('BufWritePost', {
     end,
 })
 
+-- Run shortcuts script when saving shortcut files
+vim.api.nvim_create_autocmd('BufWritePost', {
+    pattern = {
+        (os.getenv 'XDG_CONFIG_HOME' or (os.getenv 'HOME' .. '/.config')) .. '/shell/bm-files',
+        (os.getenv 'XDG_CONFIG_HOME' or (os.getenv 'HOME' .. '/.config')) .. '/shell/bm-dirs',
+    },
+    desc = 'Run shortcuts script',
+    callback = function()
+        os.execute 'station-shortcuts'
+        vim.notify('Shortcuts updated!', vim.log.levels.INFO)
+    end,
+})
+
 local configs = {
     {
         path = os.getenv 'HOME' .. '/.config/nixos',
@@ -139,6 +126,13 @@ local configs = {
         track_untracked = false,
         force_add = false,
     },
+    {
+        path = os.getenv 'HOME' .. '/Notes',
+        worktree = nil,
+        git_dir = nil,
+        track_untracked = true,
+        force_add = false,
+    },
     {
         path = os.getenv 'HOME',
         worktree = os.getenv 'HOME',

lua/keymap.lua

@@ -57,7 +57,15 @@ vim.keymap.set('v', '<C-S-D>', function()
     vim.cmd.normal 'v`x'
 end, { desc = 'Select surrounding treesitter node' })
 
-local swappable_nodes = { 'argument', 'array_element_initializer', 'simple_parameter', 'string', 'integer', 'member_call_expression', 'method_declaration' }
+local swappable_nodes = {
+    'argument',
+    'array_element_initializer',
+    'simple_parameter',
+    'string',
+    'integer',
+    'member_call_expression',
+    'method_declaration',
+}
 
 local function closest_swappable_node(node)
     while node and not vim.list_contains(swappable_nodes, node:type()) and (not node:next_named_sibling() or not node:prev_named_sibling()) do
@@ -373,7 +381,6 @@ local test_maps = {
             local neotest = require 'neotest'
             local bufnr = vim.api.nvim_get_current_buf()
             local row = vim.api.nvim_win_get_cursor(0)[1] - 1
-
             local adapters = neotest.state.adapter_ids()
             local found = false
 
@@ -414,6 +421,7 @@ vim.keymap.set('n', '<Leader>tc', function()
 end, { desc = 'Close test panels' })
 
 vim.keymap.set('i', '<Tab>', function()
+    local ls = require 'luasnip'
     if ls.jumpable(1) then
         vim.api.nvim_echo({ { 'Jumping in snippet' } }, false, {})
         ls.jump()