1 files changed, 21 insertions, 10 deletions

diff --git a/overlays/worktime/default.nix b/overlays/worktime/default.nix
index 1d8433af..06695c55 100644
--- a/overlays/worktime/default.nix
+++ b/overlays/worktime/default.nix
@@ -1,13 +1,24 @@
-{ prev, ... }:
+{ prev, final, flake, flakeInputs, ... }:
 
-with prev.poetry2nix;
-
-{
-  worktime = mkPoetryApplication {
-    python = prev.python312;
-
-    projectDir = cleanPythonSources { src = ./.; };
-
-    meta.mainProgram = "worktime";
+let
+  workspace = flakeInputs.uv2nix.lib.workspace.loadWorkspace { workspaceRoot = ./.; };
+  pythonSet = flake.lib.pythonSet {
+    pkgs = final;
+    python = final.python312;
+    overlay = workspace.mkPyprojectOverlay {
+      sourcePreference = "wheel";
+    };
   };
+  package = "worktime";
+  venv = pythonSet.mkVirtualEnv package workspace.deps.default;
+  inherit (final.callPackages flakeInputs.pyproject-nix.build.util {}) mkApplication;
+in {
+  worktime = (mkApplication {
+    inherit venv;
+    package = pythonSet.${package};
+  }).overrideAttrs (oldAttrs: {
+    meta = (oldAttrs.meta or {}) // {
+      mainProgram = "worktime";
+    };
+  });
 }