From 8a2f1efe3711909817a9ffa41cbe64fc29f20a07 Mon Sep 17 00:00:00 2001 From: Jakob Ankarhem Date: Tue, 1 Sep 2026 08:34:04 +0200 Subject: [PATCH] remove omp --- flake.lock | 306 +++-------------------------------------- flake.nix | 1 - modules/ai/default.nix | 1 - modules/ai/omp.nix | 94 ------------- 4 files changed, 21 insertions(+), 381 deletions(-) delete mode 100644 modules/ai/omp.nix diff --git a/flake.lock b/flake.lock index a7bbbc7..fe402f7 100644 --- a/flake.lock +++ b/flake.lock @@ -144,54 +144,6 @@ "type": "github" } }, - "bun2nix-darwin-x64": { - "inputs": { - "flake-parts": "flake-parts_10", - "nixpkgs": [ - "omp", - "nixpkgs-darwin-x64" - ], - "systems": "systems_6", - "treefmt-nix": "treefmt-nix_6" - }, - "locked": { - "lastModified": 1784665499, - "narHash": "sha256-9BMxlTxCCDAeoNLtb1a/st7udtTIJep+wpUzquA29VU=", - "owner": "nix-community", - "repo": "bun2nix", - "rev": "0f2a1f0b6f42cebe3b149bf62d38754c5e0e9729", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "bun2nix", - "type": "github" - } - }, - "bun2nix_2": { - "inputs": { - "flake-parts": "flake-parts_9", - "nixpkgs": [ - "omp", - "nixpkgs" - ], - "systems": "systems_5", - "treefmt-nix": "treefmt-nix_5" - }, - "locked": { - "lastModified": 1784665499, - "narHash": "sha256-9BMxlTxCCDAeoNLtb1a/st7udtTIJep+wpUzquA29VU=", - "owner": "nix-community", - "repo": "bun2nix", - "rev": "0f2a1f0b6f42cebe3b149bf62d38754c5e0e9729", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "bun2nix", - "type": "github" - } - }, "ci": { "inputs": { "blueprint": "blueprint", @@ -566,46 +518,6 @@ "type": "github" } }, - "flake-parts_10": { - "inputs": { - "nixpkgs-lib": [ - "omp", - "bun2nix-darwin-x64", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1782949081, - "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_11": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_6" - }, - "locked": { - "lastModified": 1772408722, - "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-parts_2": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" @@ -743,18 +655,14 @@ }, "flake-parts_9": { "inputs": { - "nixpkgs-lib": [ - "omp", - "bun2nix", - "nixpkgs" - ] + "nixpkgs-lib": "nixpkgs-lib_6" }, "locked": { - "lastModified": 1782949081, - "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", "type": "github" }, "original": { @@ -783,7 +691,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_7" + "systems": "systems_5" }, "locked": { "lastModified": 1731533236, @@ -891,7 +799,7 @@ "inputs": { "flake-compat": "flake-compat_7", "gitignore": "gitignore_4", - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1760663237, @@ -1429,7 +1337,7 @@ "naersk": { "inputs": { "fenix": "fenix_2", - "nixpkgs": "nixpkgs_14" + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1752689277, @@ -1445,27 +1353,6 @@ "type": "github" } }, - "nix-bun": { - "inputs": { - "nixpkgs": [ - "omp", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1787372347, - "narHash": "sha256-Foo41OtooHMiBITAFKdOhitmjrMZqcGy1epJNz7sNQ4=", - "owner": "ryoppippi", - "repo": "nix-bun", - "rev": "fee8f233ad9409be44259b4f428f83ecb2812e37", - "type": "github" - }, - "original": { - "owner": "ryoppippi", - "repo": "nix-bun", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -1557,22 +1444,6 @@ "type": "github" } }, - "nixpkgs-darwin-x64": { - "locked": { - "lastModified": 1786527240, - "narHash": "sha256-OLtJPnSXcRy79Rf7BhYaMeXAVF625FpLcd3+Svq641Y=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e0c84f9d0ad137f076dc957494f5b39885597d4f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-26.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-lib": { "locked": { "lastModified": 1777168982, @@ -1728,22 +1599,6 @@ } }, "nixpkgs_12": { - "locked": { - "lastModified": 1786384358, - "narHash": "sha256-RzPPiWeUtuvymnpuEWsdtzli5w4kjZs49FqEs3/1u+I=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2fcb964de67fcf60b43471c55d5d99e61a9ccb5a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_13": { "locked": { "lastModified": 1759070547, "narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=", @@ -1759,7 +1614,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { "lastModified": 1752077645, "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", @@ -1775,7 +1630,7 @@ "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_14": { "locked": { "lastModified": 1761373498, "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", @@ -1789,7 +1644,7 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1" } }, - "nixpkgs_16": { + "nixpkgs_15": { "locked": { "lastModified": 1770107345, "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", @@ -1805,7 +1660,7 @@ "type": "github" } }, - "nixpkgs_17": { + "nixpkgs_16": { "locked": { "lastModified": 1778869304, "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", @@ -2019,29 +1874,6 @@ "url": "https://devimages-cdn.apple.com/design/resources/download/NY.dmg" } }, - "omp": { - "inputs": { - "bun2nix": "bun2nix_2", - "bun2nix-darwin-x64": "bun2nix-darwin-x64", - "nix-bun": "nix-bun", - "nixpkgs": "nixpkgs_12", - "nixpkgs-darwin-x64": "nixpkgs-darwin-x64", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1787942691, - "narHash": "sha256-jkfb+ObXbhX/FOBRqIWeh9j81Svi7s1sJVjQhIZkkKk=", - "owner": "can1357", - "repo": "oh-my-pi", - "rev": "33cc6b9a043a74e00a157e72ca909272796d8461", - "type": "github" - }, - "original": { - "owner": "can1357", - "repo": "oh-my-pi", - "type": "github" - } - }, "plasma-manager": { "inputs": { "home-manager": [ @@ -2158,7 +1990,6 @@ "nixpkgs-unstable": "nixpkgs-unstable", "norce-agent-instructions": "norce-agent-instructions", "nur": "nur", - "omp": "omp", "plasma-manager": "plasma-manager", "ponytail": "ponytail", "rust-skill": "rust-skill", @@ -2240,27 +2071,6 @@ } }, "rust-overlay": { - "inputs": { - "nixpkgs": [ - "omp", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1786507911, - "narHash": "sha256-w5aZRLbiu7H6TqsYXVMdRKg0S4DRaJpxyqxx86AwxVk=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "39db48099ad16834af7e27485a4babf9c28b3897", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { "inputs": { "nixpkgs": [ "scripts", @@ -2301,8 +2111,8 @@ "inputs": { "git-hooks": "git-hooks_5", "naersk": "naersk", - "nixpkgs": "nixpkgs_15", - "rust-overlay": "rust-overlay_2" + "nixpkgs": "nixpkgs_14", + "rust-overlay": "rust-overlay" }, "locked": { "lastModified": 1777377530, @@ -2424,7 +2234,7 @@ }, "soulver-cpp": { "inputs": { - "nixpkgs": "nixpkgs_17", + "nixpkgs": "nixpkgs_16", "nixpkgs-libxml2": "nixpkgs-libxml2" }, "locked": { @@ -2531,36 +2341,6 @@ } }, "systems_5": { - "locked": { - "lastModified": 1776166891, - "narHash": "sha256-bI8yrEGjrohR5hkQox7UrxDH7XqrYMwI8SL/LrJ1+S8=", - "owner": "nix-systems", - "repo": "triplet", - "rev": "6de7bc09397911ce03636afbcf6118745ab2cda0", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "triplet", - "type": "github" - } - }, - "systems_6": { - "locked": { - "lastModified": 1680978224, - "narHash": "sha256-+xT9B1ZbhMg/zpJqd00S06UCZb/A2URW9bqqrZ/JTOg=", - "owner": "nix-systems", - "repo": "x86_64-darwin", - "rev": "db0463cce4cd60fb791f33a83d29a1ed53edab9b", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "x86_64-darwin", - "type": "github" - } - }, - "systems_7": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -2575,7 +2355,7 @@ "type": "github" } }, - "systems_8": { + "systems_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -2590,7 +2370,7 @@ "type": "github" } }, - "systems_9": { + "systems_7": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -2748,51 +2528,7 @@ }, "treefmt-nix_5": { "inputs": { - "nixpkgs": [ - "omp", - "bun2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1784369104, - "narHash": "sha256-47cxbcZODibHv3rELFQ9vZly0vUNkND/atn/U7HLeb0=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "df3c0640565d04a0261253cdd89fce78ec50168a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_6": { - "inputs": { - "nixpkgs": [ - "omp", - "bun2nix-darwin-x64", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1784369104, - "narHash": "sha256-47cxbcZODibHv3rELFQ9vZly0vUNkND/atn/U7HLeb0=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "df3c0640565d04a0261253cdd89fce78ec50168a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_7": { - "inputs": { - "nixpkgs": "nixpkgs_16" + "nixpkgs": "nixpkgs_15" }, "locked": { "lastModified": 1773297127, @@ -2811,12 +2547,12 @@ "truesight": { "inputs": { "fenix": "fenix_4", - "flake-parts": "flake-parts_11", + "flake-parts": "flake-parts_9", "git-hooks": "git-hooks_6", "nixpkgs": [ "nixpkgs" ], - "treefmt-nix": "treefmt-nix_7" + "treefmt-nix": "treefmt-nix_5" }, "locked": { "lastModified": 1774384158, @@ -2899,7 +2635,7 @@ "nixpkgs" ], "soulver-cpp": "soulver-cpp", - "systems": "systems_8" + "systems": "systems_6" }, "locked": { "lastModified": 1786690986, @@ -2921,7 +2657,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_9", + "systems": "systems_7", "vicinae": "vicinae_2" }, "locked": { diff --git a/flake.nix b/flake.nix index b58deb6..15cbc9a 100644 --- a/flake.nix +++ b/flake.nix @@ -40,7 +40,6 @@ norce-agent-instructions.url = "github:NorceTech/agent-instructions"; nur.inputs.nixpkgs.follows = "nixpkgs"; nur.url = "github:nix-community/NUR"; - omp.url = "github:can1357/oh-my-pi"; plasma-manager.inputs.home-manager.follows = "home-manager"; plasma-manager.inputs.nixpkgs.follows = "nixpkgs"; plasma-manager.url = "github:nix-community/plasma-manager"; diff --git a/modules/ai/default.nix b/modules/ai/default.nix index 36c0b6a..ada40b4 100644 --- a/modules/ai/default.nix +++ b/modules/ai/default.nix @@ -6,7 +6,6 @@ let home-manager.sharedModules = with inputs.self.modules.homeManager; [ claude mcp - omp opencode skills ]; diff --git a/modules/ai/omp.nix b/modules/ai/omp.nix deleted file mode 100644 index e276abb..0000000 --- a/modules/ai/omp.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ - inputs, - ... -}: -let - glm = "zai/glm-5.3"; - glmFlash = "zai/glm-5.3-flash"; - fable = "anthropic/claude-fable-5"; - opus = "anthropic/claude-opus-4-8"; -in -{ - flake.modules.homeManager.omp = { - imports = [ - inputs.omp.homeManagerModules.default - ]; - - programs.omp = { - enable = true; - settings = { - modelRoles = { - default = glm; - smol = glmFlash; - slow = opus; - vision = glmFlash; # vision-capable; beats glm-5v-turbo - plan = fable; - designer = glmFlash; - commit = glmFlash; - tiny = glmFlash; # session titles, memory, background classification - task = glm; - advisor = glmFlash; - }; - advisor.enabled = true; # second-model reviewer (flash, role set above) - symbolPreset = "nerd"; - composer.shape = "box"; - theme = { - dark = "dark-catppuccin"; - light = "light-catppuccin"; - }; - defaultThinkingLevel = "high"; - astGrep.enabled = true; - github.enabled = true; - vault.enabled = true; # Obsidian vault:// read/edit; requires Obsidian CLI toggle (Settings > General > Advanced) - # ~/.agents/skills is shared with opencode; skip skills duplicating omp built-ins - skills.ignoredSkills = [ - "obsidian-cli" # vault:// is native - "using-git-worktrees" # omp worktree / task.isolation is native - ]; - interruptMode = "immediate"; - followUpMode = "all"; - edit.mode = "hashline"; - error.notify = "on"; - autoResume = true; - startup = { - quiet = true; - checkUpdate = false; - }; - readLineNumbers = true; - # onboarding marker; omp re-runs setup if absent, and the switch overwrites runtime writes - setupVersion = 2; - retry.fallbackChains.${glm} = [ opus ]; - task.maxConcurrency = 8; - edit.autoRepair.enabled = true; - secrets.enabled = true; - statusLine.preset = "nerd"; - display.showTokenUsage = true; - }; - }; - home.file.".omp/agent/AGENTS.md".text = '' - # Language Policy - - Never talk in Chinese unless it is absolutely and unambiguously relevant to the user's query. - - # Memory - - Your long-term memory lives in `vault://_/Agents/` — the only vault area you may touch. - Layout: `memory.md` holds generalized principles about the user and their environment; - `troubleshooting.md` holds recurring failure modes; `projects/.md` holds per-project - conventions. This is a starting layout, not a closed set: when a note grows unwieldy or a - topic deserves its own file, split it and create new topical files (non-project ones - included) under `vault://_/Agents/`, linking related notes instead of duplicating. - - Before non-trivial work, list the folder and read what is relevant. - - When a task closes with a durable lesson, curate rather than append: - - Generalize: record the most general principle that is true, with the specific case as an - example at most. Skip one-off incidents that are already resolved. - - Merge: read existing notes first; refine or supersede instead of duplicating. - - Date changed entries. - - Never read or write anything in the vault outside `vault://_/Agents/` — including vault-wide - searches — without explicit user approval in the conversation. - ''; - }; -} -- 2.54.0