From 7bfd9cd155d4dcb786aa3f04e86516c6ce906f3f Mon Sep 17 00:00:00 2001 From: Adam Green Date: Tue, 16 Jun 2026 23:26:18 +1200 Subject: [PATCH 1/3] fix --- README.md | 3 --- config/brew/Brewfile | 4 --- config/nvim/lazy-lock.json | 52 -------------------------------------- config/pi/AGENTS.md | 47 ---------------------------------- config/pi/settings.json | 19 +------------- 5 files changed, 1 insertion(+), 124 deletions(-) diff --git a/README.md b/README.md index c7f7670..b50a50c 100644 --- a/README.md +++ b/README.md @@ -177,7 +177,4 @@ PI_CODING_AGENT_DIR in dotfiles/common/env.sh points pi's config to ~/dotfiles/c CLAUDE.md at the repo root serves the same purpose for Claude Code. -Skills are defined once in agents/skills/ and symlinked by make dotfiles to both ~/.agents/skills (pi) and ~/.claude/skills (Claude Code). -======= Skills are defined once in `.agents/skills/` and symlinked by `make dotfiles` to both `~/.agents/skills` (for Pi) and `~/.claude/skills` (for Claude Code). ->>>>>>> dacbf2ff02af0435dad113fec6089182f393df64 diff --git a/config/brew/Brewfile b/config/brew/Brewfile index 73128d7..bf480fa 100644 --- a/config/brew/Brewfile +++ b/config/brew/Brewfile @@ -122,12 +122,8 @@ cask "copilot-cli" brew "azure-cli" brew "git-delta" cask "keycastr" -<<<<<<< HEAD:brew/Brewfile tap "databricks/tap" brew "databricks" -||||||| 5f1ddca:brew/Brewfile -======= brew "marp-cli" brew "btop" ->>>>>>> dacbf2ff02af0435dad113fec6089182f393df64:config/brew/Brewfile diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index a3ce1a1..6d1e40b 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -1,6 +1,5 @@ { "Vim-Jinja2-Syntax": { "branch": "master", "commit": "2c17843b074b06a835f88587e1023ceff7e2c7d1" }, -<<<<<<< HEAD:nvim/lazy-lock.json "barbar.nvim": { "branch": "master", "commit": "539d73def39c9172b4d4d769f14090e08f37b29d" }, "blink-cmp-copilot": { "branch": "main", "commit": "439cff78780c033aa23cf061d7315314b347e3c1" }, "blink-cmp-dictionary": { "branch": "master", "commit": "35142bba869b869715e91a99d2f46bcf93fca4ae" }, @@ -48,58 +47,7 @@ "vim": { "branch": "master", "commit": "07b144414730cc4cf4405ab840bf46c5fa12704b" }, "vim-argwrap": { "branch": "master", "commit": "03615d1eed248408567bc8fa6a5a8c94ef3cd170" }, "vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" }, -||||||| 5f1ddca:config/nvim/lazy-lock.json -======= - "barbar.nvim": { "branch": "master", "commit": "a4bef5b4fc1f064f2f673172252028eae18191c9" }, - "blink-cmp-copilot": { "branch": "main", "commit": "439cff78780c033aa23cf061d7315314b347e3c1" }, - "blink-cmp-dictionary": { "branch": "master", "commit": "17ea03ba5c296310b9f74587b52fde1b04d84c1a" }, - "blink-cmp-env": { "branch": "main", "commit": "6b147eca6fa5975d29f5508aff24e9a9acb6a1f5" }, - "blink-emoji.nvim": { "branch": "master", "commit": "dff709139ad5389fb55ebab026e75278a12b325a" }, - "blink-ripgrep.nvim": { "branch": "main", "commit": "851610e1689a9b3bbba99fbe9242b098e7b5f40f" }, - "blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" }, - "blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" }, - "bullets.vim": { "branch": "master", "commit": "28c22791153a90bb61a86fbeeae0f812e048ade7" }, - "codecompanion.nvim": { "branch": "main", "commit": "60d031862715a77b3655eac724e8926965e47b86" }, - "conform.nvim": { "branch": "master", "commit": "24c70347f6b2128679f47d2eb765156ef34bf9e0" }, - "copilot-lsp": { "branch": "main", "commit": "1b6d8273594643f51bb4c0c1d819bdb21b42159d" }, - "copilot.lua": { "branch": "master", "commit": "7b89909d0647c89298de880255b287b01b7e5d34" }, - "dbtpal": { "branch": "main", "commit": "981eab51609362712c64e3cf3fb773fe11f859b9" }, - "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "emmet-vim": { "branch": "master", "commit": "92ef2f74f4093edc99db5e9e4cf7e40116a85bd6" }, - "gitsigns.nvim": { "branch": "main", "commit": "dd3f588bacbeb041be6facf1742e42097f62165d" }, - "indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" }, - "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, - "lualine.nvim": { "branch": "master", "commit": "131a558e13f9f28b15cd235557150ccb23f89286" }, - "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mini.icons": { "branch": "main", "commit": "520995f1d75da0e4cc901ee95080b1ff2bc46b94" }, - "mini.nvim": { "branch": "main", "commit": "44657837c7338e52727facc85c1d95bec1f6bd7c" }, - "nvim-autopairs": { "branch": "master", "commit": "7b9923abad60b903ece7c52940e1321d39eccc79" }, - "nvim-bqf": { "branch": "main", "commit": "c282a62bec6c0621a1ef5132aa3f4c9fc4dcc2c7" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "5cfe7fffbd01e17b3c1e14af85d5febdef88bd8c" }, - "nvim-lint": { "branch": "master", "commit": "d48f3a76189d03b2239f6df1b2f7e3fa8353743b" }, - "nvim-lspconfig": { "branch": "master", "commit": "a4ed4e761c400849e8c9f8bda33e5083f890268c" }, - "nvim-treesitter": { "branch": "master", "commit": "cf12346a3414fa1b06af75c79faebe7f76df080a" }, - "nvim-treesitter-context": { "branch": "master", "commit": "b311b30818951d01f7b4bf650521b868b3fece16" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" }, - "nvim-ts-autotag": { "branch": "main", "commit": "88c1453db4ba7dd24131086fe51fdf74e587d275" }, - "nvim-web-devicons": { "branch": "master", "commit": "0d7d35fa946837b8738b17c18d1faa1ac351e7f9" }, - "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" }, - "oil.nvim": { "branch": "master", "commit": "21c669e7bfeb1546ae988b52813138e4d674bbf5" }, - "peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" }, - "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" }, - "render-markdown.nvim": { "branch": "main", "commit": "629eb9533ec989d9d5c6cab8f3ad5372422c24e0" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "b25b749b9db64d375d782094e2b9dce53ad53a40" }, - "telescope-git-file-history.nvim": { "branch": "master", "commit": "4442114f9257e682e60a8cb6de14cf988e26055c" }, - "telescope-makefile": { "branch": "master", "commit": "f35425d7d53d92a04215c3714a5819811d2842c3" }, - "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "7d324792b7943e4aa16ad007212e6acc6f9fe335" }, - "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" }, - "undotree": { "branch": "master", "commit": "6fa6b57cda8459e1e4b2ca34df702f55242f4e4d" }, - "vim": { "branch": "master", "commit": "e7b91facff94bdf3a248df9b683119b84672256a" }, - "vim-argwrap": { "branch": "master", "commit": "03615d1eed248408567bc8fa6a5a8c94ef3cd170" }, - "vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" }, "vim-markdown": { "branch": "master", "commit": "1bc9d0cd8e1cc3e901b0a49c2b50a843f1c89397" }, ->>>>>>> dacbf2ff02af0435dad113fec6089182f393df64:config/nvim/lazy-lock.json "vim-markdown-toc": { "branch": "master", "commit": "66026b323379c9a712c6169cd43153216acef090" }, "vim-one": { "branch": "master", "commit": "187f5c85b682c1933f8780d4d419c55d26a82e24" }, "vim-python-pep8-indent": { "branch": "master", "commit": "60ba5e11a61618c0344e2db190210145083c91f8" }, diff --git a/config/pi/AGENTS.md b/config/pi/AGENTS.md index 563084a..895297e 100644 --- a/config/pi/AGENTS.md +++ b/config/pi/AGENTS.md @@ -1,4 +1,3 @@ -<<<<<<< HEAD You are an expert software engineer and data scientist, writing excellent code: - Responses and code should be concise - favour a less verbose implementation where appropriate @@ -43,49 +42,3 @@ Plans should include a section on `## Steps` which lists in order the work neede - Favour flat unnested code - try to minimize levels of indentation - Fail at the source of the error rather than checking and failing - Never start changing code unless you have explicit approval to start making changes -||||||| 5f1ddca -======= -## How to Respond - -Responses should be concise. - -List tradeoffs explicitly if appropriate. List assumptions explicitly if appropriate. List what you are uncertain about. - -Do not include summaries at the end of responses unless specifically asked. - -Try to push back if you can and offer different ideas or approaches. Try to explore a range of ideas, perspectives. - -Always create a plan and then ask to execute. You should rarely go off and implement without some back and forth conversation with me. - -## Searching & Reading - -Read deeply in great detail. Note intricacies. Go through everything. - -Search the internet if you need it - I always want you to check documentation. - -## How to Act - -Simplest possible solution that could work - -Delete dead code immediately - -When the edit tool doesn't wor, favour `grep -n` with small targeted replacements over rewriting the entire file. Rewriting the entire file can introduce bugs and noisy diffs. - -## Programming - -When you write Python code, make it type safe, so that it would pass strict type checking with a tool like basedpyright. - -Modern type hints for all function signatures (Python 3.13+). - -Docstrings for all public functions - -Use dataclasses or pydantic for data objects - -Use context managers for resource management - -Only include comments when they explain something that is not obvious from the code. - -Always respect existing conventions in each file and across the code base when making changes. - -Always ask for permissions before starting work. Never edit files until you have presented a plat to the user. ->>>>>>> dacbf2ff02af0435dad113fec6089182f393df64 diff --git a/config/pi/settings.json b/config/pi/settings.json index b0d70ac..69424d8 100644 --- a/config/pi/settings.json +++ b/config/pi/settings.json @@ -1,17 +1,7 @@ { -<<<<<<< HEAD - "lastChangelogVersion": "0.69.0", - "defaultProvider": "databricks", - "defaultModel": "databricks-claude-sonnet-4-6", -||||||| 5f1ddca - "lastChangelogVersion": "0.66.1", - "defaultProvider": "openrouter", - "defaultModel": "moonshotai/kimi-k2.5", -======= "lastChangelogVersion": "0.78.0", "defaultProvider": "openrouter", "defaultModel": "moonshotai/kimi-k2.5", ->>>>>>> dacbf2ff02af0435dad113fec6089182f393df64 "theme": "dracula", "packages": [ "npm:@aliou/pi-guardrails", @@ -21,13 +11,6 @@ "npm:pi-mono-status-line", "npm:@guwidoe/pi-prompt-suggester" ], - "defaultThinkingLevel": "off", -<<<<<<< HEAD - "quietStartup": false -||||||| 5f1ddca "defaultThinkingLevel": "medium", - "quietStartup": false -======= "quietStartup": true ->>>>>>> dacbf2ff02af0435dad113fec6089182f393df64 -} \ No newline at end of file +} From 9270a985d3a15526b9d2302c20c9812cb6be8fc6 Mon Sep 17 00:00:00 2001 From: Adam Green Date: Sat, 4 Jul 2026 01:10:53 +1200 Subject: [PATCH 2/3] feat --- config/nvim/lua/plugins/mini.lua | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/config/nvim/lua/plugins/mini.lua b/config/nvim/lua/plugins/mini.lua index f38d218..8a3aa95 100644 --- a/config/nvim/lua/plugins/mini.lua +++ b/config/nvim/lua/plugins/mini.lua @@ -7,12 +7,12 @@ return { require("mini.comment").setup() require("mini.surround").setup({ mappings = { - add = "sa", -- sa{motion}{char} - add surround (normal), sa{char} - visual - delete = "ds", -- ds{char} - delete surround - replace = "cs", -- cs{old}{new} - replace surround - find = "sf", -- find surround to the right - find_left = "sF", -- find surround to the left - highlight = "sh", -- highlight surround + add = "sa", -- sa{motion}{char} - add surround (normal), sa{char} - visual + delete = "ds", -- ds{char} - delete surround + replace = "cs", -- cs{old}{new} - replace surround + find = "sf", -- find surround to the right + find_left = "sF", -- find surround to the left + highlight = "sh", -- highlight surround update_n_lines = "sn", -- update n lines }, }) @@ -22,7 +22,9 @@ return { require("mini.misc").setup() require("mini.misc").setup_restore_cursor() require("mini.bufremove").setup() - vim.api.nvim_create_user_command("BD", function() require("mini.bufremove").delete() end, {}) + vim.api.nvim_create_user_command("BD", function() + require("mini.bufremove").delete() + end, {}) require("mini.operators").setup() -- keymap for zoom @@ -37,12 +39,7 @@ return { -- Markdown text objects h = require("mini.ai").gen_spec.treesitter({ a = "@markup.heading", i = "@markup.heading" }), -- Code blocks in markdown - b = function(ai_type) - local pattern = "```.-```" - return require("mini.ai").gen_spec.pair(pattern, pattern, { - type = "non-balanced", - })(ai_type) - end, + b = require("mini.ai").gen_spec.pair("```", "```", { type = "non-balanced" }), }, }) From 1a2967a52857715efd445b6361d364734615e1fb Mon Sep 17 00:00:00 2001 From: Adam Green Date: Sat, 1 Aug 2026 18:40:22 +1200 Subject: [PATCH 3/3] feat --- config/nvim/lua/plugins/copilot.lua | 113 ++++++++++++---------------- 1 file changed, 48 insertions(+), 65 deletions(-) diff --git a/config/nvim/lua/plugins/copilot.lua b/config/nvim/lua/plugins/copilot.lua index ca8c577..ec8ca58 100644 --- a/config/nvim/lua/plugins/copilot.lua +++ b/config/nvim/lua/plugins/copilot.lua @@ -31,71 +31,54 @@ return { }, }, }, - { - "olimorris/codecompanion.nvim", - version = "^19.0.0", - opts = { - rules = { - default = { - description = "AGENTS.md files", - files = { - "AGENTS.md", - "~/dotfiles/config/pi/AGENTS.md", - }, - }, - opts = { - chat = { - enabled = true, - autoload = "default", - }, - }, - }, - interactions = { - chat = { - adapter = { - name = "copilot", - model = "claude-sonnet-4.6", - }, - tools = { - opts = { - default_tools = { - "files", - "run_command", - "get_diagnostics", - }, - }, - }, - keymaps = { - send = { - callback = function(chat) - vim.cmd("stopinsert") - chat:add_buf_message({ role = "llm", content = "" }) - chat:submit() - end, - index = 1, - description = "Send", - }, - }, - inline = { - adapter = "copilot", - model = "claude-sonnet-4.6", - }, - cmd = { - adapter = "copilot", - model = "claude-sonnet-4.6", - }, - }, - }, - }, - config = function(_, opts) - require("config.codecompanion_spinner"):init() - require("codecompanion").setup(opts) - end, - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-treesitter/nvim-treesitter", - }, - }, + + -- }, + -- interactions = { + -- chat = { + -- adapter = { + -- name = "copilot", + -- model = "claude-sonnet-4.6", + -- }, + -- tools = { + -- opts = { + -- default_tools = { + -- "files", + -- "run_command", + -- "get_diagnostics", + -- }, + -- }, + -- }, + -- keymaps = { + -- send = { + -- callback = function(chat) + -- vim.cmd("stopinsert") + -- chat:add_buf_message({ role = "llm", content = "" }) + -- chat:submit() + -- end, + -- index = 1, + -- description = "Send", + -- }, + -- }, + -- inline = { + -- adapter = "copilot", + -- model = "claude-sonnet-4.6", + -- }, + -- cmd = { + -- adapter = "copilot", + -- model = "claude-sonnet-4.6", + -- }, + -- }, + -- }, + -- }, + -- config = function(_, opts) + -- require("config.codecompanion_spinner"):init() + -- require("codecompanion").setup(opts) + -- end, + -- dependencies = { + -- "nvim-lua/plenary.nvim", + -- "nvim-treesitter/nvim-treesitter", + -- }, + -- }, { "MeanderingProgrammer/render-markdown.nvim", ft = { "codecompanion" },