modules/llm/default.nix

@@ -1,10 +1,25 @@
 {
+  pkgs,
   config,
-  flake,
   mkOizysModule,
+  flake,
   ...
 }:
 
+let
+  selfPackages = (flake.pkgs "self");
+  pyWithLlm = (
+    pkgs.python3.withPackages (_: [
+      selfPackages.llm
+      selfPackages.llm-claude-3
+    ])
+  );
+  llm-with-plugins = (
+    pkgs.writeShellScriptBin "llm" ''
+      exec ${pyWithLlm}/bin/llm "$@"
+    ''
+  );
+in
 mkOizysModule config "llm" {
-  environment.systemPackages = [ (flake.pkgs "self").llm-with-plugins ];
+  environment.systemPackages = [ llm-with-plugins ];
 }

pkgs/default.nix

@@ -1,4 +1,7 @@
 { pkgs, ... }:
+let
+  inherit (pkgs) python3Packages;
+in
 {
   nimlangserver = pkgs.callPackage ./nim/nimlangserver { };
   procs = pkgs.callPackage ./nim/procs { };
@@ -6,5 +9,6 @@
 
   distrobox = pkgs.callPackage ./distrobox { };
 
-  llm-with-plugins = pkgs.callPackage ./llm/llm-with-plugins { };
+  llm = python3Packages.callPackage ./llm { };
+  llm-claude-3 = python3Packages.callPackage ./llm-plugins/llm-claude-3 { };
 }

pkgs/llm/llm-with-plugins/default.nix

@@ -1,19 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-let
-  inherit (pkgs) python3Packages;
-  llm = python3Packages.callPackage ../llm { };
-  llm-claude-3 = python3Packages.callPackage ../llm-claude-3 { };
-
-  pyWithLlm = (
-    pkgs.python3.withPackages (_: [
-      llm
-      llm-claude-3
-    ])
-  );
-in
-pkgs.writeShellScriptBin "llm" ''
-  exec ${pyWithLlm}/bin/llm "$@"
-''