fix llm module

modules/llm/default.nix

@@ -1,25 +1,10 @@
 {
-  pkgs,
   config,
-  mkOizysModule,
   flake,
+  mkOizysModule,
   ...
 }:
 
-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 = [ llm-with-plugins ];
+  environment.systemPackages = [ (flake.pkgs "self").llm-with-plugins ];
 }

pkgs/default.nix

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

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

@@ -0,0 +1,19 @@
+{
+  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 "$@"
+''