2 files changed, 16 insertions, 40 deletions

diff --git a/overlays/abs-podcast-autoplaylist/default.nix b/overlays/abs-podcast-autoplaylist/default.nix
index 075e0ba0..843f1b65 100644
--- a/overlays/abs-podcast-autoplaylist/default.nix
+++ b/overlays/abs-podcast-autoplaylist/default.nix
@@ -1,23 +1,14 @@
-{ prev, final, flakeInputs, ... }:
-
-with flakeInputs;
+{ prev, final, flake, flakeInputs, ... }:
 
 let
-  workspace = uv2nix.lib.workspace.loadWorkspace { workspaceRoot = ./.; };
-  overlay = workspace.mkPyprojectOverlay {
-    sourcePreference = "wheel";
+  workspace = flakeInputs.uv2nix.lib.workspace.loadWorkspace { workspaceRoot = ./.; };
+  pythonSet = flake.lib.pythonSet {
+    pkgs = final;
+    python = final.python312;
+    overlay = workspace.mkPyprojectOverlay {
+      sourcePreference = "wheel";
+    };
   };
-  python = final.python312;
-  pythonSet =
-    (final.callPackage pyproject-nix.build.packages {
-      inherit python;
-    }).overrideScope
-      (
-        prev.lib.composeManyExtensions [
-          pyproject-build-systems.overlays.default
-          overlay
-        ]
-      );
   virtualEnv = pythonSet.mkVirtualEnv "abs-podcast-autoplaylist-env" workspace.deps.default;
 in {
   abs-podcast-autoplaylist = virtualEnv.overrideAttrs (oldAttrs: {
diff --git a/overlays/waybar-systemd-inhibit/default.nix b/overlays/waybar-systemd-inhibit/default.nix
index 88322ef5..ae6b8c75 100644
--- a/overlays/waybar-systemd-inhibit/default.nix
+++ b/overlays/waybar-systemd-inhibit/default.nix
@@ -1,29 +1,14 @@
-{ prev, final, flakeInputs, ... }:
-
-with flakeInputs;
+{ prev, final, flake, flakeInputs, ... }:
 
 let
-  workspace = uv2nix.lib.workspace.loadWorkspace { workspaceRoot = ./.; };
-  overlay = workspace.mkPyprojectOverlay {
-    sourcePreference = "wheel";
+  workspace = flakeInputs.uv2nix.lib.workspace.loadWorkspace { workspaceRoot = ./.; };
+  pythonSet = flake.lib.pythonSet {
+    pkgs = final;
+    python = final.python312;
+    overlay = workspace.mkPyprojectOverlay {
+      sourcePreference = "wheel";
+    };
   };
-  python = final.python312;
-  # hacks = final.callPackage pyproject-nix.build.hacks { };
-  pythonSet =
-    (final.callPackage pyproject-nix.build.packages {
-      inherit python;
-    }).overrideScope
-      (
-        prev.lib.composeManyExtensions [
-          pyproject-build-systems.overlays.default
-          overlay
-          # (final: prev: {
-          #   pygobject = hacks.nixpkgsPrebuilt {
-          #     from = python.pkgs.pygobject3;
-          #   };
-          # })
-        ]
-      );
   virtualEnv = pythonSet.mkVirtualEnv "waybar-systemd-inhibit-env" workspace.deps.default;
 in {
   waybar-systemd-inhibit = virtualEnv.overrideAttrs (oldAttrs: {