diff --git a/flake/perSystem.nix b/flake/perSystem.nix
index e46b620..5341411 100644
--- a/flake/perSystem.nix
+++ b/flake/perSystem.nix
@@ -47,14 +47,16 @@
             inherit inputs rootPath;
             srcs = self.callPackage (rootPath + "/_sources/generated.nix") { };
             inherit (inputs'.nixvim.legacyPackages) makeNixvim makeNixvimWithModule;
-            inherit (self'.legacyPackages) nixvimPlugins editor-runtime;
             neovim_git = inputs'.neovim-nightly.packages.default;
           });
         in
-        lib.packagesFromDirectoryRecursive {
-          inherit (inputsScope) callPackage;
-          directory = rootPath + "/pkgs";
-        };
+        inputsScope.overrideScope (
+          final: _prev:
+          lib.packagesFromDirectoryRecursive {
+            inherit (final) callPackage;
+            directory = rootPath + "/pkgs";
+          }
+        );
       packages =
         let
           flattenPkgs =
@@ -68,7 +70,23 @@
             else
               { };
         in
-        flattenPkgs [ ] self'.legacyPackages;
+        flattenPkgs [ ] (
+          lib.removeAttrs self'.legacyPackages [
+            "inputs"
+
+            "srcs"
+
+            "rootPath"
+
+            "makeNixvim"
+            "makeNixvimWithModule"
+
+            "newScope"
+            "overrideScope"
+            "packages"
+            "callPackage"
+          ]
+        );
       checks = lib.concatMapAttrs (name: value: {
         "package-${name}" = value;
       }) self'.packages;
diff --git a/overlays/modifications/cliphist.nix b/overlays/modifications/cliphist.nix
index 6ad9740..2aa546a 100644
--- a/overlays/modifications/cliphist.nix
+++ b/overlays/modifications/cliphist.nix
@@ -4,5 +4,5 @@ let
   inherit (prev.stdenv.hostPlatform) system;
 in
 {
-  inherit (outputs.packages."${system}") cliphist;
+  inherit (outputs.packages."${system}") cliphist';
 }
diff --git a/overlays/modifications/radicle-explorer.nix b/overlays/modifications/radicle-explorer.nix
index a001fde..316b7a6 100644
--- a/overlays/modifications/radicle-explorer.nix
+++ b/overlays/modifications/radicle-explorer.nix
@@ -4,5 +4,5 @@ let
   inherit (prev.stdenv.hostPlatform) system;
 in
 {
-  radicle-explorer = outputs.packages."${system}".radicle-explorer;
+  radicle-explorer = outputs.packages."${system}".radicle-explorer';
 }
diff --git a/overlays/modifications/spotifyd.nix b/overlays/modifications/spotifyd.nix
index 2d19fce..2689a30 100644
--- a/overlays/modifications/spotifyd.nix
+++ b/overlays/modifications/spotifyd.nix
@@ -4,5 +4,5 @@ let
   inherit (prev.stdenv.hostPlatform) system;
 in
 {
-  spotifyd = outputs.packages."${system}".spotifyd;
+  spotifyd = outputs.packages.${system}.spotifyd';
 }
diff --git a/pkgs/cliphist.nix b/pkgs/cliphist'.nix
similarity index 100%
rename from pkgs/cliphist.nix
rename to pkgs/cliphist'.nix
diff --git a/pkgs/radicle-explorer.nix b/pkgs/radicle-explorer'.nix
similarity index 100%
rename from pkgs/radicle-explorer.nix
rename to pkgs/radicle-explorer'.nix
diff --git a/pkgs/spotifyd.nix b/pkgs/spotifyd'.nix
similarity index 92%
rename from pkgs/spotifyd.nix
rename to pkgs/spotifyd'.nix
index 211ff3f..f7f61f4 100644
--- a/pkgs/spotifyd.nix
+++ b/pkgs/spotifyd'.nix
@@ -8,7 +8,7 @@ let
   inherit (srcs.spotifyd) src date version;
 in
 spotifyd.overrideAttrs (
-  final: prev: {
+  _final: prev: {
     inherit src;
     version =
       if prev.version != "0.4.1" then
@@ -18,7 +18,7 @@ spotifyd.overrideAttrs (
       else
         "0-unstable-${date}-git${version}";
     cargoDeps = rustPlatform.fetchCargoVendor {
-      inherit (final)
+      inherit (prev)
         src
         ;
       hash = "sha256-WwShp1ebk89cBqRXqKDgbwGZraCDjQAOxoL4uEIq2aw=";