added bloocky and dooing

plugin/20_startup.lua

@@ -191,7 +191,7 @@ end)
 -- Treesitter
 
 now_if_args(function()
-  vim.treesitter.language.register("markdown", { "markdown", "codecompanion", "rmd", "quarto" })
+  vim.treesitter.language.register("markdown", { "markdown", "rmd", "quarto" })
 
   require 'treesitter-context'.setup {
     enable = true,
@@ -216,7 +216,7 @@ now_if_args(function()
     "julia", "rnoweb", "latex", "gitcommit", "gitignore",
     "git_config", "git_rebase", "diff", "dockerfile",
     "make", "xml", "zig", "regex", "csv", "bash",
-    "markdown_inline", "quarto", "rmd", "codecompanion",
+    "markdown_inline", "quarto", "rmd",
   }
   local function start_treesitter(buf, filetype)
     local lang = vim.treesitter.language.get_lang(filetype) or filetype

plugin/22_languages.lua

@@ -102,7 +102,7 @@ now_if_args(function()
   add("render-markdown.nvim")
   require('render-markdown').setup({
     --    completions = { blink = { enabled = true } },
-    file_types = { 'markdown', 'codecompanion', },
+    file_types = { 'markdown', },
     link = {
       wiki = {
         body = function(ctx)

plugin/23_editor.lua

@@ -37,7 +37,6 @@ later(function()
 end)
 
 later(function()
-  -- Keep `ga` free for CodeCompanion's "accept change" mapping.
   require("mini.align").setup({
     mappings = {
       start = "gA",
@@ -219,6 +218,8 @@ later(function()
   local minikeymap = require("mini.keymap")
   minikeymap.setup()
   local map_multistep = minikeymap.map_multistep
+  -- blink_next/blink_prev/blink_accept are blink.cmp actions.
+  -- Direct blink keymaps (C-space/C-l) are set in 24_completion.lua.
   local tab_steps = {
     "blink_next",
     "pmenu_next",

plugin/24_completion.lua

@@ -4,9 +4,6 @@ local later = MiniDeps.later
 local now = MiniDeps.now
 local now_if_args = Config.now_if_args
 
--- Constants
-local BLINK_VERSION = "v1.10.2"
-
 -- Plugin sources configuration
 local PLUGIN_SOURCES = {
   "hrsh7th/cmp-cmdline",
@@ -14,7 +11,7 @@ local PLUGIN_SOURCES = {
   "zbirenbaum/copilot.lua",
   "jmbuhr/cmp-pandoc-references",
   "fang2hou/blink-copilot",
-  "olimorris/codecompanion.nvim"
+  "nickjvandyke/opencode.nvim",
 }
 
 local PLUGIN_ADDS = {
@@ -24,34 +21,17 @@ local PLUGIN_ADDS = {
   "cmp-pandoc-references",
 }
 
--- Helper functions
-local function create_system_prompt(role_description)
-  return function(context)
-    local lang = context.filetype or "programmer"
-    return "I want you to act as a senior " .. lang .. " developer. " .. role_description
-  end
-end
-
-local function get_code_block(context)
-  local text = require("codecompanion.helpers.code").get_code(context.start_line, context.end_line)
-  return "```" .. context.filetype .. "\n" .. text .. "\n```"
-end
-
 local function get_mini_icons_highlight(ctx)
   local _, hl, _ = require("mini.icons").get("lsp", ctx.kind)
   return hl
 end
 
 local function get_blink_fuzzy_setting()
-  local setting = {
-    sorts = { "exact", "score", "sort_text" }
+  return {
+    sorts = { "exact", "score", "sort_text" },
+    use_frecency = true,
+    use_proximity = true,
   }
-
-  if not Config.isNixCats then
-    setting.prebuilt_binaries = { force_version = BLINK_VERSION }
-  end
-
-  return setting
 end
 
 -- Plugin loading
@@ -62,7 +42,6 @@ if not Config.isNixCats then
     add({
       source = "saghen/blink.cmp",
       depends = { "rafamadriz/friendly-snippets" },
-      checkout = BLINK_VERSION,
     })
   end)
 
@@ -73,241 +52,6 @@ if not Config.isNixCats then
   end)
 end
 
-local function get_codecompanion_config()
-  return {
-    adapters = {
-      acp = {
-        -- Codex = heavy agent lane (ChatGPT Edu login via `codex login`; ~/.codex/auth.json).
-        -- Requires `codex-acp` on PATH (~/.nix-profile/bin). ACP-only slash commands in the
-        -- chat buffer: /resume (restore a past session, fresh chat only), /mode (switch agent
-        -- mode), /command, /acp_session_options (e.g. model per session); `\` triggers ACP
-        -- command completion (1-5s delay after chat open).
-        codex = function()
-          return require("codecompanion.adapters").extend("codex", {
-            defaults = {
-              auth_method = "chatgpt",
-            },
-          })
-        end,
-      },
-    },
-    interactions = {
-      chat = {
-        adapter = {
-          name = "copilot",
-          model = "claude-sonnet-5",
-        },
-        slash_commands = {
-          ["share"] = {
-            opts = {
-              token = os.getenv("GITHUB_GIST_TOKEN"),
-            },
-          },
-        },
-        opts = {
-          completion_provider = "blink",
-          context_management = {
-            editing = {
-              trigger = 0.65,
-              keep_cycles = 3,
-              exclude_tools = { "memory" },
-            },
-            compaction = {
-              trigger = 0.85,
-              min_token_savings = 10000,
-            },
-          },
-        },
-      },
-      inline = {
-        adapter = {
-          name = "copilot",
-          model = "gpt-5-mini",
-        },
-      },
-      shared = {
-        keymaps = {
-          accept_change = {
-            modes = { n = "ga" },
-            description = "Accept the suggested change",
-          },
-          reject_change = {
-            modes = { n = "gr" },
-            opts = { nowait = true },
-            description = "Reject the suggested change",
-          },
-        },
-      },
-      background = {
-        adapter = {
-          name = "copilot",
-          model = "gpt-5-mini",
-        },
-        chat = {
-          callbacks = {
-            ["on_ready"] = {
-              actions = { "interactions.background.builtin.chat_make_title" },
-              enabled = true,
-            },
-          },
-          opts = {
-            enabled = true,
-          },
-        },
-      },
-    },
-    display = {
-      chat = {
-        show_settings = false,
-        window = {
-          layout = "horizontal",
-          position = "bottom",
-          height = 0.33,
-        },
-      },
-      diff = {
-        enabled = true,
-        threshold_for_chat = 6,
-      },
-    },
-    rules = {
-      default = {
-        description = "Collection of common files for all projects",
-        files = {
-          ".clinerules",
-          ".cursorrules",
-          ".rules",
-          ".github/copilot-instructions.md",
-          "AGENT.md",
-          "AGENTS.md",
-          { path = "CLAUDE.md", parser = "claude" },
-          { path = "CLAUDE.local.md", parser = "claude" },
-          { path = "~/.claude/CLAUDE.md", parser = "claude" },
-        },
-      },
-      opts = {
-        chat = {
-          autoload = "default",
-          enabled = true,
-        },
-      },
-    },
-    prompt_library = {
-      ["expert"] = {
-        interaction = "chat",
-        description = "Get expert advice from an LLM",
-        opts = { alias = "expert" },
-        prompts = {
-          {
-            role = "system",
-            content = create_system_prompt(
-              "I will ask you specific questions and I want you to return concise explanations and codeblock examples."
-            ),
-          },
-          {
-            role = "user",
-            content = function(context)
-              return "I have the following code:\n\n" .. get_code_block(context) .. "\n\n"
-            end,
-            opts = { contains_code = true },
-          },
-        },
-      },
-      ["fixer"] = {
-        interaction = "chat",
-        description = "Fix code errors with expert guidance",
-        opts = { alias = "fixer" },
-        prompts = {
-          {
-            role = "system",
-            content = create_system_prompt(
-              "I have a block of code that is not working and will give you a hint about the error. I want you to return the corrected code and a concise explanation of the corrections."
-            ),
-          },
-          {
-            role = "user",
-            content = function(context)
-              return "The following code has an error:\n\n" .. get_code_block(context) .. "\n\nThe error is:"
-            end,
-            opts = { contains_code = true },
-          },
-        },
-      },
-      ["suggest"] = {
-        interaction = "chat",
-        description = "Suggest improvements to the buffer",
-        opts = { alias = "suggest" },
-        prompts = {
-          {
-            role = "system",
-            content = create_system_prompt(
-              "When asked to improve code, follow these steps:\n" ..
-              "1. Identify the programming language.\n" ..
-              "2. Think separately for each function or significant block of code and think about possible improvements (e.g., for better readability or speed) in the context of the language.\n" ..
-              "3. Think about the whole document and think about possible improvements.\n" ..
-              "4. Provide the improved code.\n" ..
-              "5. Provide a concise explanation of the improvements."
-            ),
-          },
-          {
-            role = "user",
-            content = function(context)
-              return "Please improve the following code:\n\n" .. get_code_block(context)
-            end,
-            opts = { contains_code = true },
-          },
-        },
-      },
-      ["agent"] = {
-        interaction = "chat",
-        description = "Agentic coding with the @{agent} tool group (read/edit/grep/run)",
-        opts = { alias = "agent" },
-        prompts = {
-          {
-            role = "user",
-            content = function(context)
-              return "@{agent} Work on the following code:\n\n" .. get_code_block(context) .. "\n\n"
-            end,
-            opts = { contains_code = true },
-          },
-        },
-      },
-      ["tdd"] = {
-        interaction = "chat",
-        description = "Workflow: plan the buffer change, implement it, run the tests",
-        opts = { alias = "tdd", is_workflow = true },
-        prompts = {
-          {
-            {
-              role = "user",
-              content = function(context)
-                return "Let's work test-driven. First, study #buffer and the relevant parts of the codebase, then propose a concise implementation plan (no code yet).\n\nThe code under discussion:\n\n"
-                  .. get_code_block(context)
-                  .. "\n\nThe task: "
-              end,
-              opts = { contains_code = true },
-            },
-          },
-          {
-            {
-              role = "user",
-              content = "Implement the plan now, writing or updating tests alongside the code. @{agent}",
-              opts = { auto_submit = true },
-            },
-          },
-          {
-            {
-              role = "user",
-              content = "Run the project's test suite with @{run_command} and fix any failures until it passes.",
-              opts = { auto_submit = true },
-            },
-          },
-        },
-      },
-    },
-  }
-end
-
 -- Batch add simple plugins
 later(function()
   for _, plugin in ipairs(PLUGIN_ADDS) do
@@ -359,26 +103,33 @@ later(function()
   })
 end)
 
-
--- CodeCompanion habit notes (chat buffer unless stated):
---   /compact  compact history, keep summary        /fork    fork the conversation
---   /symbols  insert symbols for a file            /share   export chat to a GitHub gist
---   gm        toggle "btw" ephemeral message       gty      YOLO: approve all tool calls
---   gba/gbd   buffer sync add/drop                 gd       debug window (adapter/tools info)
---   Codex (ACP) lane: /resume (fresh chat only), /mode, /command, /acp_session_options,
---   `\` ACP command completion. Prompt library: /expert /fixer /suggest /agent /tdd (workflow).
 later(function()
-  add("codecompanion.nvim")
-
-  -- now use function
-  require("codecompanion").setup(get_codecompanion_config())
-  vim.cmd([[cab cc CodeCompanion]])
+  vim.g.opencode_opts = {
+    events = {
+      reload = true,
+      permissions = {
+        enabled = true,
+        edits = { enabled = true },
+      },
+    },
+    server = {
+      start = function()
+        vim.cmd("vsplit term://opencode --port")
+        vim.cmd("vertical resize " .. math.floor(vim.o.columns * 0.4))
+        vim.cmd("wincmd p")
+      end
+    },
+  }
+  add("opencode.nvim")
 end)
 
 now_if_args(function()
   add("blink.cmp")
 
   require("blink.cmp").setup({
+    -- Direct blink keymaps (C-space/C-l).
+    -- Tab/Enter/Up/Down are handled via multistep chains in 23_editor.lua,
+    -- which chain blink_next/blink_prev/blink_accept with other editor actions.
     keymap = {
       preset = "default",
       ["<C-space>"] = { "show", "select_next" },
@@ -415,6 +166,7 @@ now_if_args(function()
     },
     completion = {
       menu = {
+        border = "rounded",
         draw = {
           treesitter = { "lsp" },
           components = {
@@ -434,14 +186,12 @@ now_if_args(function()
       list = {
         selection = { preselect = false, auto_insert = true }
       },
-      documentation = { auto_show = true },
+      ghost_text = { enabled = true, show_with_menu = true },
+      documentation = { auto_show = true, window = { border = "rounded" } },
       trigger = { show_in_snippet = false },
     },
     snippets = { preset = "mini_snippets" },
     sources = {
-      per_filetype = {
-        codecompanion = { "codecompanion" },
-      },
       default = { "references", "lsp", "path", "snippets", "buffer", "omni", "copilot" },
       providers = {
         path = {
@@ -467,12 +217,6 @@ now_if_args(function()
           score_offset = 45,
           async = true,
         },
-        codecompanion = {
-          name = "CodeCompanion",
-          module = "codecompanion.providers.completion.blink",
-          score_offset = 45,
-          async = true,
-        },
         references = {
           name = "pandoc_references",
           module = "cmp-pandoc-references.blink",

plugin/25_lsp.lua

@@ -15,7 +15,7 @@ now_if_args(function()
     basedpyright = {},
     ruff = {},
     marksman = {
-      filetypes = { "markdown", "markdown_inline", "codecompanion" },
+      filetypes = { "markdown", "markdown_inline" },
     },
     harper_ls = {
       cmd = { "harper-ls", "--stdio" },

plugin/29_bloocky.lua

@@ -0,0 +1,26 @@
+-- Bloocky: timeblocking calendar (day/week/month views), persisted to JSON.
+-- Loaded via the `general` cat spec (nix mode) or MiniDeps (non-nix).
+-- Default global toggle is <leader>tb, which collides with the terminal map
+-- (toggle bracketed paste), so it is moved to the calendar/tasks group <leader>c.
+local Config = require('config')
+
+if not Config.isNixCats then
+  local later = MiniDeps.later
+  later(function()
+    MiniDeps.add({ source = 'atiladefreitas/bloocky' })
+  end)
+end
+
+local nix = require('config.nix')
+local later = MiniDeps.later
+
+later(function()
+  if not nix.get_cat('general', false) then
+    return
+  end
+  require('bloocky').setup({
+    keymaps = {
+      toggle = '<leader>cb',
+    },
+  })
+end)

plugin/30_dooing.lua

@@ -0,0 +1,28 @@
+-- Dooing: minimalist todo list manager with a floating window, persisted to JSON.
+-- Loaded via the `general` cat spec (nix mode) or MiniDeps (non-nix).
+-- Default globals <leader>td / <leader>tN occupy the terminal group, so the
+-- todo toggles are moved to the calendar/tasks group <leader>c.
+local Config = require('config')
+
+if not Config.isNixCats then
+  local later = MiniDeps.later
+  later(function()
+    MiniDeps.add({ source = 'atiladefreitas/dooing' })
+  end)
+end
+
+local nix = require('config.nix')
+local later = MiniDeps.later
+
+later(function()
+  if not nix.get_cat('general', false) then
+    return
+  end
+  require('dooing').setup({
+    keymaps = {
+      toggle_window = '<leader>cd',
+      open_project_todo = '<leader>cD',
+      show_due_notification = '<leader>cN',
+    },
+  })
+end)