From d9ae284378ee94cc125813839fdf12a449c4f1bd Mon Sep 17 00:00:00 2001
From: Matthew Bessette <matthew.bessette@hicleo.com>
Date: Thu, 24 Sep 2026 12:45:13 -0400
Subject: [PATCH] [cleo] pivot to nix-shell pattern for latest claude and other
 packages

---
 cleo.darwin.nix     | 22 +++++-----------------
 cleo.home.nix       | 12 +++++++++++-
 hydrogen.darwin.nix |  1 -
 hydrogen.home.nix   |  5 +++++
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/cleo.darwin.nix b/cleo.darwin.nix
index ceb7364..fdc06bd 100644
--- a/cleo.darwin.nix
+++ b/cleo.darwin.nix
@@ -7,9 +7,10 @@ let
     taps = [
       "fwdcloudsec/granted" # aws sso utility
       "felipeelias/tap" # claude-statusline
-      "f1bonacc1/tap" # process-compose
       "oven-sh/bun" # bun
-      "sst/tap" # opencode
+
+      ## Excluded intentionally
+      # "sst/tap" # opencode
     ];
     brews = [
       "allure"
@@ -17,20 +18,19 @@ let
       "awscli"
       "ccusage"
       "fd"
-      "f1bonacc1/tap/process-compose"
       "felipeelias/tap/claude-statusline"
       "oven-sh/bun/bun"
       "fwdcloudsec/granted/granted"
-      "gdal"
       "gh"
       "jq"
       "maven"
       "rg"
       "snyk-cli"
-      "sst/tap/opencode"
       "ldcli"
 
       ## Excluded intentionally
+      # "gdal"
+      # "sst/tap/opencode"
       # "libpq@17"
       # "node@22"
     ];
@@ -38,7 +38,6 @@ let
       "1password-cli"
       "aws-vpn-client"
       "chromedriver"
-      "claude-code" # stable channel; playbook can opt into claude-code@latest
       "copilot-cli"
       "docker-desktop"
       "expo-orbit"
@@ -124,7 +123,6 @@ in
       ++ [
         "biome"
         "jira-cli"
-        "treehouse"
       ]
     );
     # visual-studio-code is installed by Homebrew (in ansibleRequired.casks) so
@@ -136,9 +134,7 @@ in
         "android-commandlinetools"
         "android-platform-tools"
         "bruno"
-        "claude"
         "figma"
-        "super-productivity"
         "kopiaui"
         "libreoffice"
         "obsidian"
@@ -149,14 +145,6 @@ in
         "zoom"
       ]
     );
-
-    masApps = {
-      BetterSnapTool = 417375580;
-      HiddenBar = 1452453066;
-      # "Jamf Trust" = 1608041266;
-      MeetingBar = 1518425043;
-      Wireguard = 1451685025;
-    };
   };
 
   nix.settings.experimental-features = "nix-command flakes";
diff --git a/cleo.home.nix b/cleo.home.nix
index bb579cd..efeb4f9 100644
--- a/cleo.home.nix
+++ b/cleo.home.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, inputs, vars, ... }:
+{ config, pkgs, vars, ... }:
 {
   imports = [
     ./programs.vscode.nix
@@ -14,6 +14,12 @@
   programs.zsh.shellAliases = {
     laws = "aws --endpoint=http://localhost:4566";
     assume = "source $(brew --prefix)/bin/assume";
+    # Always runs the latest claude-code from the flake, no local install/update needed.
+    claude = "nix run github:sadjow/claude-code-nix";
+    # Same pattern for process-compose.
+    process-compose = "nix run github:F1bonacc1/process-compose --";
+    # Same pattern for treehouse.
+    treehouse = "nix run github:kunchenguid/treehouse --";
   };
 
   programs.zsh.initContent = ''
@@ -109,4 +115,8 @@
     tuiSidebarPanel.enabled = true;
     maintainerAnnouncements = { enabled = false; home = false; };
   };
+  xdg.configFile."treehouse/config.toml".text = ''
+    [hooks]
+    post_create = ["./conditional-package-manage.sh"]
+  '';
 }
diff --git a/hydrogen.darwin.nix b/hydrogen.darwin.nix
index 3396566..e6afc51 100644
--- a/hydrogen.darwin.nix
+++ b/hydrogen.darwin.nix
@@ -30,7 +30,6 @@
       "obsidian" 
       "signal" 
       "spotify"
-      "claude-code"
       "claude"
     ];
   };
diff --git a/hydrogen.home.nix b/hydrogen.home.nix
index 6fcdd17..785a9f0 100644
--- a/hydrogen.home.nix
+++ b/hydrogen.home.nix
@@ -3,6 +3,11 @@
     ./programs.vscode.nix
   ];
 
+  programs.zsh.shellAliases = {
+    # Always runs the latest claude-code from the flake, no local install/update needed.
+    claude = "nix run github:sadjow/claude-code-nix";
+  };
+
   home.sessionVariables = {
     # Points to the Homebrew location mentioned in your caveat
     NPM_CONFIG_PREFIX = "${config.home.homeDirectory}/.npm-global";