From 115adc466a67265e2352e4dc3431e25f4c59bc29 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Wed, 22 Oct 2025 00:20:51 +0300
Subject: [PATCH] nixos/plymouth: replace `with lib;` with `inherit`

---
 nixos/modules/system/boot/plymouth.nix | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix
index 395632466f27..1023fa8ce42d 100644
--- a/nixos/modules/system/boot/plymouth.nix
+++ b/nixos/modules/system/boot/plymouth.nix
@@ -6,9 +6,20 @@
   ...
 }:
 
-with lib;
-
 let
+  inherit (lib)
+    mkOption
+    mkEnableOption
+    optional
+    mkIf
+    mkBefore
+    mkAfter
+    literalExpression
+    types
+    literalMD
+    getBin
+    escapeShellArg
+    ;
 
   plymouth = pkgs.plymouth.override {
     systemd = config.boot.initrd.systemd.package;
@@ -109,7 +120,7 @@ in
       };
 
       themePackages = mkOption {
-        default = lib.optional (cfg.theme == "breeze") nixosBreezePlymouth;
+        default = optional (cfg.theme == "breeze") nixosBreezePlymouth;
         defaultText = literalMD ''
           A NixOS branded variant of the breeze theme when
           `config.${opt.theme} == "breeze"`, otherwise
@@ -202,7 +213,7 @@ in
     boot.initrd.systemd = {
       extraBin.plymouth = "${plymouth}/bin/plymouth"; # for the recovery shell
       storePaths = [
-        "${lib.getBin config.boot.initrd.systemd.package}/bin/systemd-tty-ask-password-agent"
+        "${getBin config.boot.initrd.systemd.package}/bin/systemd-tty-ask-password-agent"
         "${plymouth}/bin/plymouthd"
         "${plymouth}/sbin/plymouthd"
       ];
@@ -306,7 +317,7 @@ in
       '')
     ];
 
-    boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) (
+    boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) (
       ''
         copy_bin_and_libs ${plymouth}/bin/plymouth
         copy_bin_and_libs ${plymouth}/bin/plymouthd