refactor: update dream2nix

flake.nix

@@ -26,7 +26,7 @@
       # All packages defined in ./packages/<name> are automatically added to the flake outputs
       # e.g., 'packages/hello/default.nix' becomes '.#packages.hello'
       devShells = eachSystem (system: {
-        default = self.packages.${system}.default.devShell;
+        default = self.packages.${system}.default.devShellNew;
         std = std.devShells.${system}.default;
       });
       packages = eachSystem (system: {

nix/my-project.nix

@@ -16,27 +16,19 @@ in
     inherit src;
     buildInputs = [ config.deps.python.pkgs.pdm-backend ];
   };
+  buildPythonPackage.catchConflicts = false;
   deps =
     { nixpkgs, ... }:
     {
       python = nixpkgs.python310;
-      mkShell =
-        let
-          pythonEnv = (
-            config.deps.python.withPackages (ps: config.mkDerivation.propagatedBuildInputs)
-          );
-        in
-        nixpkgs.mkShell {
-          buildInputs = [
-            nixpkgs.pdm
-            pythonEnv
-          ];
-          passthru = {
-            inherit pythonEnv;
-          };
-        };
     };
   public = {
-    devShell = config.deps.mkShell;
+    # devShell = config.deps.mkShell;
+    devShellNew = config.public.devShell.overrideAttrs (old: {
+      buildInputs = old.buildInputs ++ [ packageSets.nixpkgs.pdm ];
+    });
+    env = config.deps.python.withPackages (
+      ps: config.mkDerivation.propagatedBuildInputs
+    );
   };
 }

nix/std/cells/repo/jupyenv/example.nix

@@ -24,7 +24,7 @@ in
     #   pkgs.bashInteractive
     #   pkgs.d2
     # ];
-    env = inputs.main.devShells.default.passthru.pythonEnv;
+    env = inputs.main.packages.default.env;
   };
   kernel.bash.data-science = {
     enable = true;

nix/std/cells/repo/shells/default.nix

@@ -37,7 +37,14 @@ l.mapAttrs (_: std.lib.dev.mkShell) {
           {
             name = "jupyenv";
             category = "data-science";
-            command = cell.jupyenv.example.config.build + ''/bin/jupyter "$@"'';
+            command = ''
+              if [[ "$HOME" == "/home/user" ]]; then
+              # Running in a container
+              (cd $HOME && ${cell.jupyenv.example.config.build + /bin/jupyter} "$@")
+              else
+              ${cell.jupyenv.example.config.build + /bin/jupyter} "$@"
+              fi
+            '';
             help = "Run Jupyter env";
           }
         ];

nix/std/flake.nix

@@ -21,7 +21,16 @@
     { omnibus, ... }@inputs:
     let
       inherit (omnibus.flake.inputs) std;
-      stdLib =
+      inputsSource =
+        inputs
+        // (omnibus.call-flake ../lock).inputs
+        // rec {
+          inherit std;
+          main = omnibus.call-flake ../..;
+          nixpkgs = main.inputs.nixpkgs;
+        };
+
+      omnibusStd =
         (omnibus.pops.std {
           inputs.inputs = {
             inherit std;
@@ -30,16 +39,7 @@
     in
     std.growOn
       {
-        inputs =
-          inputs
-          // {
-            inherit std;
-          }
-          // ((omnibus.call-flake ../lock).inputs)
-          // rec {
-            main = omnibus.call-flake ../..;
-            nixpkgs = main.inputs.nixpkgs;
-          };
+        inputs = inputsSource;
         cellsFrom = ./cells;
 
         cellBlocks = with std.blockTypes; [
@@ -58,7 +58,7 @@
 
           (functions "pops")
 
-          (stdLib.blockTypes.jupyenv "jupyenv")
+          (omnibusStd.blockTypes.jupyenv "jupyenv")
           (containers "containers")
 
           (data "config")