diff --git a/scripts/default.nix b/scripts/default.nix
index 0152c68..534f1e9 100644
--- a/scripts/default.nix
+++ b/scripts/default.nix
@@ -30,19 +30,19 @@ let
   callRustPackage =
     pkgs: pname: nixSrc:
     pkgs.callPackage nixSrc { cleanRustSrc = cleanRustSrc pname; };
-  packages = pkgs: {
-    jpassmenu = pkgs.callPackage ./jpassmenu/package.nix { };
-    audiomenu = callRustPackage pkgs "audiomenu" ./audiomenu/package.nix;
+  packages = {
+    jpassmenu = ./jpassmenu/package.nix;
+    audiomenu = ./audiomenu/package.nix;
   };
 in
 {
   # Add scripts to overlay
-  flake.overlays.scripts = _final: packages;
+  flake.overlays.scripts = _final: prev: builtins.mapAttrs (callRustPackage prev) packages;
 
   # Add scripts to packages
   perSystem =
     { pkgs, ... }:
     {
-      packages = packages pkgs;
+      packages = builtins.mapAttrs (callRustPackage pkgs) packages;
     };
 }
diff --git a/scripts/jpassmenu/package.nix b/scripts/jpassmenu/package.nix
index b74c27e..b0efa5c 100644
--- a/scripts/jpassmenu/package.nix
+++ b/scripts/jpassmenu/package.nix
@@ -1,6 +1,2 @@
-{ writers, python3Packages }:
-writers.writePython3 "jpassmenu" {
-  libraries = [ python3Packages.click ];
-  # line too long, but I like my code well documented
-  flakeIgnore = [ "E501" ];
-} ./jpassmenu.py
+{ writePython3, python3Packages }:
+writePython3 "jpassmenu" { libraries = [ python3Packages.click ]; } ./jpassmenu.py