diff --git a/flake.lock b/flake.lock
index 80277ed5..a9c8ee6f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -169,11 +169,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709988192,
-        "narHash": "sha256-qxwIkl85P0I1/EyTT+NJwzbXdOv86vgZxcv4UKicjK8=",
+        "lastModified": 1710532761,
+        "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b0b0c3d94345050a7f86d1ebc6c56eea4389d030",
+        "rev": "206f457fffdb9a73596a4cb2211a471bd305243d",
         "type": "github"
       },
       "original": {
@@ -184,11 +184,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1709703039,
-        "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
+        "lastModified": 1710451336,
+        "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
+        "rev": "d691274a972b3165335d261cc4671335f5c67de9",
         "type": "github"
       },
       "original": {
diff --git a/home/gpg.nix b/home/gpg.nix
index 566a5947..7fb9c473 100644
--- a/home/gpg.nix
+++ b/home/gpg.nix
@@ -1,3 +1,5 @@
+{ pkgs, ... }:
+
 {
   programs.gpg = {
     enable = true;
@@ -16,7 +18,7 @@
 
   services.gpg-agent = {
     enable = true;
-    pinentryFlavor = "curses";
+    pinentryPackage = pkgs.pinentry-curses;
     defaultCacheTtl = 43200;
     maxCacheTtl = 43200;
   };
diff --git a/modules/packages.nix b/modules/packages.nix
index ba08ab69..785f15ba 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -120,10 +120,11 @@
     lutgen
     sudachi-rs
     mgitstatus
+    pnpm-shell-completion
   ];
 
   nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
-    "osu-lazer-bin-2024.302.1"
+    "osu-lazer-bin-2024.312.0"
   ];
 
   nixpkgs.config.permittedInsecurePackages = [
diff --git a/overlays/default.nix b/overlays/default.nix
index fe6989c5..aa2092f3 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -4,8 +4,6 @@
     ./base16-schemes.nix
     ./eza.nix
     ./hyprland.nix
-    ./hyprlang.nix
-    ./hyprlock.nix
     ./kitty.nix
     ./srb2.nix
     ./zola.nix
diff --git a/overlays/hyprlang.nix b/overlays/hyprlang.nix
deleted file mode 100644
index 76c4e2da..00000000
--- a/overlays/hyprlang.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  nixpkgs.overlays = [
-    (final: prev: {
-      hyprlang = prev.hyprlang.overrideAttrs (oldAttrs: rec {
-        version = "0.5.0";
-
-        src = prev.fetchFromGitHub {
-          owner = "hyprwm";
-          repo = "hyprlang";
-          rev = "v${version}";
-          hash = "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=";
-        };
-      });
-    })
-  ];
-}
diff --git a/overlays/hyprlock.nix b/overlays/hyprlock.nix
deleted file mode 100644
index 48110951..00000000
--- a/overlays/hyprlock.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  nixpkgs.overlays = [
-    (final: prev: {
-      hyprlock = prev.hyprlock.overrideAttrs (oldAttrs: rec {
-        version = "0.2.0";
-
-        src = prev.fetchFromGitHub {
-          owner = "hyprwm";
-          repo = "hyprlock";
-          rev = "v${version}";
-          hash = "sha256-1p6Y/8+ETaz7GQ8wsXLUTrk2dD0YN9ySOfwjRp2TSG4=";
-        };
-      });
-    })
-  ];
-}
diff --git a/packages/default.nix b/packages/default.nix
index 57a88bf4..a6c46466 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -12,7 +12,6 @@
     (callPackage ./aleo-fonts.nix { })
     (callPackage ./fluent-icons.nix { })
     (callPackage ./osu-backgrounds.nix { })
-    (callPackage ./pnpm-shell-completion.nix { })
     (callPackage ./webp-thumbnailer.nix { })
   ];
 }
diff --git a/packages/pnpm-shell-completion.nix b/packages/pnpm-shell-completion.nix
deleted file mode 100644
index a871ef3a..00000000
--- a/packages/pnpm-shell-completion.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ rustPlatform
-, fetchFromGitHub
-, lib
-, installShellFiles
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "pnpm-shell-completion";
-  version = "0.5.3";
-
-  src = fetchFromGitHub {
-    owner = "g-plane";
-    repo = "pnpm-shell-completion";
-    rev = "v${version}";
-    hash = "sha256-UKuAUN1uGNy/1Fm4vXaTWBClHgda+Vns9C4ugfHm+0s=";
-  };
-
-  cargoHash = "sha256-Kf28hQ5PUHeH5ZSRSRdfHljlqIYU8MN0zQsyT0Sa2+4=";
-
-  nativeBuildInputs = [
-    installShellFiles
-  ];
-
-  postInstall = /* bash */ ''
-    installShellCompletion --cmd pnpm \
-      --fish pnpm.fish \
-      --zsh pnpm-shell-completion.plugin.zsh
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/g-plane/pnpm-shell-completion";
-    description = "Complete your pnpm command fastly";
-    license = licenses.mit;
-    maintainers = with maintainers; [ donovanglover ];
-    mainProgram = "pnpm-shell-completion";
-  };
-}