From 3548de8d33a2b1462d6e214790b15771065c5268 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Thu, 31 Aug 2023 16:22:55 -0300 Subject: [PATCH] boot: use upstream plymouth themes package --- pkgs/default.nix | 1 - pkgs/plymouth-theme-red.nix | 25 ------------------------- system/boot.nix | 6 ++++-- 3 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 pkgs/plymouth-theme-red.nix diff --git a/pkgs/default.nix b/pkgs/default.nix index 61035bc..ec52a1c 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -2,7 +2,6 @@ # You can build them using 'nix build .#example' or (legacy) 'nix-build -A example' { pkgs, inputs }: { - plymouth-theme-red = pkgs.callPackage ./plymouth-theme-red.nix { inherit inputs; }; cargo-checkmate = pkgs.callPackage ./cargo-checkmate.nix { }; lipsum = pkgs.callPackage ./lipsum.nix { inherit inputs; }; emmet-cli = pkgs.callPackage ./emmet-cli.nix { }; diff --git a/pkgs/plymouth-theme-red.nix b/pkgs/plymouth-theme-red.nix deleted file mode 100644 index 0002dce..0000000 --- a/pkgs/plymouth-theme-red.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ pkgs, inputs }: -pkgs.stdenv.mkDerivation rec { - pname = "red-loader-plymouth"; - version = "0.0.1"; - - src = inputs.plymouth-themes; - - buildInputs = [ - pkgs.git - ]; - - configurePhase = '' - mkdir -p $out/share/plymouth/themes/ - ''; - - buildPhase = '' - ''; - - installPhase = '' - cp -r pack_4/red_loader $out/share/plymouth/themes - cat pack_4/red_loader/red_loader.plymouth | sed "s@\/usr\/@$out\/@" > \ - $out/share/plymouth/themes/red_loader/red_loader.plymouth - ''; -} - diff --git a/system/boot.nix b/system/boot.nix index 0a83f8e..712a896 100644 --- a/system/boot.nix +++ b/system/boot.nix @@ -37,8 +37,10 @@ plymouth = { enable = true; theme = lib.mkIf (pkgs.uservars.desktop == "sway") "red_loader"; - themePackages = [ - pkgs.plymouth-theme-red + themePackages = with pkgs; [ + (adi1090x-plymouth-themes.override { + selected_themes = [ "red_loader" ]; + }) ]; }; };