diff --git a/README.md b/README.md index 2ca2e0b..e787ebe 100644 --- a/README.md +++ b/README.md @@ -123,3 +123,61 @@ 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, but is symlinked to `AGENTS.md`. Skills are defined once in agents/skills/ and symlinked by make dotfiles to both ~/.agents/skills (pi) and ~/.claude/skills (Claude Code). +<<<<<<< HEAD +||||||| 5f1ddca + + + + + Label + setenv.XDG_CONFIG_HOME + ProgramArguments + + sh + -c + launchctl setenv XDG_CONFIG_HOME $HOME/dotfiles + + RunAtLoad + + + + +$ launchctl load ~/Library/LaunchAgents/setenv.XDG_CONFIG_HOME.plist +``` + +## Agent Configuration + +PI_CODING_AGENT_DIR in dotfiles/common/env.sh points pi's config to ~/dotfiles/config/pi/, which contains agent/AGENTS.md (agent instructions), settings.json, themes, and sessions. + +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` (for Pi) and `~/.claude/skills` (for Claude Code). +||||||| 25036fb +||||||| 5f1ddca + + + + + Label + setenv.XDG_CONFIG_HOME + ProgramArguments + + sh + -c + launchctl setenv XDG_CONFIG_HOME $HOME/dotfiles + + RunAtLoad + + + + +$ launchctl load ~/Library/LaunchAgents/setenv.XDG_CONFIG_HOME.plist +``` + +## Agent Configuration + +PI_CODING_AGENT_DIR in dotfiles/common/env.sh points pi's config to ~/dotfiles/config/pi/, which contains agent/AGENTS.md (agent instructions), settings.json, themes, and sessions. + +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` (for Pi) and `~/.claude/skills` (for Claude Code). diff --git a/config/brew/Brewfile b/config/brew/Brewfile index 89cc7f5..936b183 100644 --- a/config/brew/Brewfile +++ b/config/brew/Brewfile @@ -127,5 +127,4 @@ tap "databricks/tap" brew "databricks" brew "marp-cli" brew "btop" - -brew "gum" +brew "gum" \ No newline at end of file diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index b390292..ed5e857 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -1,49 +1,51 @@ { "CopilotChat.nvim": { "branch": "main", "commit": "f0c2a23ab79dc295f5e0eef0d8b587a39020c852" }, "Vim-Jinja2-Syntax": { "branch": "master", "commit": "2c17843b074b06a835f88587e1023ceff7e2c7d1" }, - "barbar.nvim": { "branch": "master", "commit": "a4bef5b4fc1f064f2f673172252028eae18191c9" }, + "barbar.nvim": { "branch": "master", "commit": "539d73def39c9172b4d4d769f14090e08f37b29d" }, "blink-cmp-copilot": { "branch": "main", "commit": "439cff78780c033aa23cf061d7315314b347e3c1" }, - "blink-cmp-dictionary": { "branch": "master", "commit": "17ea03ba5c296310b9f74587b52fde1b04d84c1a" }, - "blink-cmp-env": { "branch": "main", "commit": "6b147eca6fa5975d29f5508aff24e9a9acb6a1f5" }, + "blink-cmp-dictionary": { "branch": "master", "commit": "35142bba869b869715e91a99d2f46bcf93fca4ae" }, + "blink-cmp-env": { "branch": "main", "commit": "99af62c1f9aa46005e8f50ad4ccee581946546ca" }, "blink-emoji.nvim": { "branch": "master", "commit": "dff709139ad5389fb55ebab026e75278a12b325a" }, - "blink-ripgrep.nvim": { "branch": "main", "commit": "851610e1689a9b3bbba99fbe9242b098e7b5f40f" }, + "blink-ripgrep.nvim": { "branch": "main", "commit": "d84a20e765fdc9cc8c0775708e083e7185654527" }, "blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" }, "blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" }, "bullets.vim": { "branch": "master", "commit": "28c22791153a90bb61a86fbeeae0f812e048ade7" }, - "conform.nvim": { "branch": "master", "commit": "24c70347f6b2128679f47d2eb765156ef34bf9e0" }, - "copilot.lua": { "branch": "master", "commit": "7b89909d0647c89298de880255b287b01b7e5d34" }, + "codecompanion.nvim": { "branch": "main", "commit": "680c445eb357c72129d175ea5d481aa9e92ae6a5" }, + "conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" }, + "copilot.lua": { "branch": "master", "commit": "adff470bca742b7658228ed144589250ecb3dc0a" }, "dbtpal": { "branch": "main", "commit": "981eab51609362712c64e3cf3fb773fe11f859b9" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "emmet-vim": { "branch": "master", "commit": "92ef2f74f4093edc99db5e9e4cf7e40116a85bd6" }, - "gitsigns.nvim": { "branch": "main", "commit": "dd3f588bacbeb041be6facf1742e42097f62165d" }, + "gitsigns.nvim": { "branch": "main", "commit": "6d808f99bd63303646794406e270bd553ad7792e" }, "indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" }, - "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, - "lualine.nvim": { "branch": "master", "commit": "131a558e13f9f28b15cd235557150ccb23f89286" }, + "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, + "lualine.nvim": { "branch": "master", "commit": "a905eeebc4e63fdc48b5135d3bf8aea5618fb21c" }, "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" }, + "mini.icons": { "branch": "main", "commit": "bac6317300e205335df425296570d84322730067" }, + "mini.nvim": { "branch": "main", "commit": "5849ef04c32a6a8e55957b946c0a275801d87530" }, + "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" }, "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-lint": { "branch": "master", "commit": "eab58b48eb11d7745c11c505e0f3057165902461" }, + "nvim-lspconfig": { "branch": "master", "commit": "e146efacbafed3789ac568abcc5a981c5decaa58" }, + "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" }, + "nvim-treesitter-context": { "branch": "master", "commit": "b0c45cefe2c8f7b55fc46f34e563bc428ef99636" }, + "nvim-treesitter-textobjects": { "branch": "main", "commit": "851e865342e5a4cb1ae23d31caf6e991e1c99f1e" }, "nvim-ts-autotag": { "branch": "main", "commit": "88c1453db4ba7dd24131086fe51fdf74e587d275" }, - "nvim-web-devicons": { "branch": "master", "commit": "0d7d35fa946837b8738b17c18d1faa1ac351e7f9" }, + "nvim-web-devicons": { "branch": "master", "commit": "c72328a5494b4502947a022fe69c0c47e53b6aa6" }, "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" }, - "oil.nvim": { "branch": "master", "commit": "21c669e7bfeb1546ae988b52813138e4d674bbf5" }, + "oil.nvim": { "branch": "master", "commit": "0fcc83805ad11cf714a949c98c605ed717e0b83e" }, "peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" }, "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "b25b749b9db64d375d782094e2b9dce53ad53a40" }, + "render-markdown.nvim": { "branch": "main", "commit": "d67113f11384c0dad96fced2f7b91f1fc811e97f" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" }, "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" }, + "telescope.nvim": { "branch": "master", "commit": "506338434fec5ad19cb1f8d45bf92d66c4917393" }, "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" }, "undotree": { "branch": "master", "commit": "6fa6b57cda8459e1e4b2ca34df702f55242f4e4d" }, - "vim": { "branch": "master", "commit": "e7b91facff94bdf3a248df9b683119b84672256a" }, + "vim": { "branch": "master", "commit": "07b144414730cc4cf4405ab840bf46c5fa12704b" }, "vim-argwrap": { "branch": "master", "commit": "03615d1eed248408567bc8fa6a5a8c94ef3cd170" }, "vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" }, "vim-markdown": { "branch": "master", "commit": "1bc9d0cd8e1cc3e901b0a49c2b50a843f1c89397" }, diff --git a/config/nvim/lua/config/keymap.lua b/config/nvim/lua/config/keymap.lua index 559bb98..89aaf9b 100644 --- a/config/nvim/lua/config/keymap.lua +++ b/config/nvim/lua/config/keymap.lua @@ -99,6 +99,11 @@ km("n", "'", ":lua require'telescope.builtin'.oldfiles(require('telescop km("n", "ro", ":lua require'telescope.builtin'.oldfiles(require('telescope.themes').get_ivy({}))", opts) km("n", "rr", ":lua require'telescope.builtin'.oldfiles(require('telescope.themes').get_ivy({}))", opts) +-- Search for a string +-- km("n", "rc", ":lua require'telescope.builtin'.live_grep(require('telescope.themes').get_ivy({}))", opts) +-- Search for a string under cursor +km("n", "rc", ":lua require'telescope.builtin'.grep_string(require('telescope.themes').get_ivy({}))", opts) +km("n", "rg", ":lua require'telescope.builtin'.grep_string(require('telescope.themes').get_ivy({}))", opts) -- Search for a string under cursor - mapped twice km("n", "g", ":lua require'telescope.builtin'.grep_string(require('telescope.themes').get_ivy({}))", opts) vim.keymap.set("n", ".", function() 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" }), }, })