From c210d0e76ffd0a2b6d8046560d651ddf20e43e1b Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <3998+srid@users.noreply.github.com>
Date: Mon, 10 Nov 2025 13:25:38 -0500
Subject: [PATCH] refactor

---
 flake.nix                            |  7 -------
 modules/home/claude-code/default.nix | 10 +++++-----
 overlays/default.nix                 |  6 +++---
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/flake.nix b/flake.nix
index a8543b3..0d1a5b7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -62,12 +62,5 @@
           config.allowUnfree = true;
         };
       };
-
-      # https://omnix.page/om/ci.html
-      flake.om.ci.default.ROOT = {
-        dir = ".";
-        steps.flake-check.enable = false; # Doesn't make sense to check nixos config on darwin!
-        steps.custom = { };
-      };
     };
 }
diff --git a/modules/home/claude-code/default.nix b/modules/home/claude-code/default.nix
index 509667b..feb296c 100644
--- a/modules/home/claude-code/default.nix
+++ b/modules/home/claude-code/default.nix
@@ -36,16 +36,16 @@ in
   home.packages = [
     pkgs.tree
     pkgs.python313Packages.markitdown
-    # Use sandboxed version on Linux, plain version on macOS
-    (if lib.hasInfix "linux" pkgs.system
-    then flake.inputs.self.packages.${pkgs.system}.claude
-    else pkgs.claude-code)
     # Other agents for trying out
     pkgs.copilot-cli
   ];
   programs.claude-code = {
     enable = true;
-    package = null; # See above
+
+    # Use sandboxed version on Linux, plain version on macOS
+    package = (if lib.hasInfix "linux" pkgs.system
+    then flake.inputs.self.packages.${pkgs.system}.claude
+    else pkgs.claude-code);
 
     # Basic settings for Claude Code
     settings = {
diff --git a/overlays/default.nix b/overlays/default.nix
index 42cd095..6bd34a8 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -4,6 +4,7 @@ let
   inherit (flake) inputs;
   inherit (inputs) self;
   packages = self + /packages;
+  nix-ai-tools = system: inputs.nix-ai-tools.packages.${system};
 
 in
 self: super:
@@ -34,9 +35,8 @@ in
 packageOverlays // {
   # External overlays
   nuenv = (inputs.nuenv.overlays.nuenv self super).nuenv;
-  # omnix = inputs.omnix.packages.${self.system}.default;
 
   # Use claude-code from nix-ai-tools instead of nixpkgs
-  claude-code = inputs.nix-ai-tools.packages.${self.system}.claude-code;
-  copilot-cli = inputs.nix-ai-tools.packages.${self.system}.copilot-cli;
+  claude-code = (nix-ai-tools self.system).claude-code;
+  copilot-cli = (nix-ai-tools self.system).copilot-cli;
 }