diff --git a/nixos/modules/system/boot/unl0kr.nix b/nixos/modules/system/boot/unl0kr.nix
index 35dbaa030cb99..b18f9f064ec46 100644
--- a/nixos/modules/system/boot/unl0kr.nix
+++ b/nixos/modules/system/boot/unl0kr.nix
@@ -15,7 +15,7 @@ in
       description = ''Whether to enable the unl0kr on-screen keyboard in initrd to unlock LUKS.'';
     };
 
-    package = lib.mkPackageOption pkgs "unl0kr" { };
+    package = lib.mkPackageOption pkgs "buffybox" { };
 
     allowVendorDrivers = lib.mkEnableOption "load optional drivers" // {
       description = ''Whether to load additional drivers for certain vendors (I.E: Wacom, Intel, etc.)'';
@@ -27,7 +27,7 @@ in
 
         See `unl0kr.conf(5)` for supported values.
 
-        Alternatively, visit `https://gitlab.com/postmarketOS/buffybox/-/blob/unl0kr-2.0.0/unl0kr.conf`
+        Alternatively, visit `https://gitlab.postmarketos.org/postmarketOS/buffybox/-/blob/3.2.0/unl0kr/unl0kr.conf`
       '';
 
       example = lib.literalExpression ''
@@ -55,12 +55,14 @@ in
         assertion = !config.boot.plymouth.enable;
         message = "unl0kr will not work if plymouth is enabled.";
       }
-      {
-        assertion = !config.hardware.amdgpu.initrd.enable;
-        message = "unl0kr has issues with video drivers that are loaded on stage 1.";
-      }
     ];
 
+    warnings =
+      if config.hardware.amdgpu.initrd.enable then
+        [ ''Use early video loading at your risk. It's not guaranteed to work with unl0kr.'' ]
+      else
+        [ ];
+
     boot.initrd.availableKernelModules =
       lib.optionals cfg.enable [
         "hid-multitouch"
diff --git a/pkgs/by-name/un/unl0kr/package.nix b/pkgs/by-name/un/unl0kr/package.nix
deleted file mode 100644
index 8bedd9fc689fd..0000000000000
--- a/pkgs/by-name/un/unl0kr/package.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{ lib
-, nixosTests
-, stdenv
-, fetchFromGitLab
-, inih
-, libdrm
-, libinput
-, libxkbcommon
-, meson
-, ninja
-, pkg-config
-, scdoc
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "unl0kr";
-  version = "2.0.0";
-
-  src = fetchFromGitLab {
-    domain = "gitlab.com";
-    owner = "cherrypicker";
-    repo = "unl0kr";
-    rev = finalAttrs.version;
-    fetchSubmodules = true;
-    hash = "sha256-KPP4Ol1GCAWqdQYlNtKQD/jx8A/xuHdvKjcocPMqWa0=";
-  };
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    scdoc
-  ];
-
-  buildInputs = [
-    inih
-    libdrm
-    libinput
-    libxkbcommon
-  ];
-
-  propagatedBuildInputs = [
-    libxkbcommon
-  ];
-
-  passthru = {
-    tests.unl0kr = nixosTests.systemd-initrd-luks-unl0kr;
-  };
-
-  meta = with lib; {
-    description = "Framebuffer-based disk unlocker for the initramfs based on LVGL";
-    mainProgram = "unl0kr";
-    homepage = "https://gitlab.com/cherrypicker/unl0kr";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ hustlerone ];
-    platforms = platforms.linux;
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 026bbad72d20e..2728a38069efe 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -124,7 +124,7 @@ mapAliases {
   audaciousQt5 = throw "'audaciousQt5' has been removed, since audacious is built with Qt 6 now"; # Added 2024-07-06
   auditBlasHook = throw "'auditBlasHook' has been removed since it never worked"; # Added 2024-04-02
   aumix = throw "'aumix' has been removed due to lack of maintenance upstream. Consider using 'pamixer' for CLI or 'pavucontrol' for GUI"; # Added 2024-09-14
-  authy = throw "'authy' has been removed since it reached end of life"; # Added 2024-04-19
+  authy = throw "'authy' has been removed since it reached end of life"; # Added 2024-04-190kr
   avldrums-lv2 = throw "'avldrums-lv2' has been renamed to/replaced by 'x42-avldrums'"; # Converted to throw 2024-10-17
   avrlibcCross = avrlibc; # Added 2024-09-06
   awesome-4-0 = awesome; # Added 2022-05-05
@@ -1307,6 +1307,7 @@ mapAliases {
   unifi8 = unifi; # Added 2024-11-15
   unifiLTS = throw "'unifiLTS' has been removed since UniFi no longer has LTS and stable releases. Use `pkgs.unifi` instead."; # Added 2024-04-11
   unifiStable = throw "'unifiStable' has been removed since UniFi no longer has LTS and stable releases. Use `pkgs.unifi` instead."; # Converted to throw 2024-04-11
+  unl0kr = throw "'unl0kr' is now included with buffybox. Use `pkgs.buffybox` instead.";
   untrunc = throw "'untrunc' has been renamed to/replaced by 'untrunc-anthwlock'"; # Converted to throw 2024-10-17
   urxvt_autocomplete_all_the_things = throw "'urxvt_autocomplete_all_the_things' has been renamed to/replaced by 'rxvt-unicode-plugins.autocomplete-all-the-things'"; # Converted to throw 2024-10-17
   urxvt_bidi = throw "'urxvt_bidi' has been renamed to/replaced by 'rxvt-unicode-plugins.bidi'"; # Converted to throw 2024-10-17