From 73d2aaee2d6fc9aa2bb9c0e34b0a50784449364d Mon Sep 17 00:00:00 2001
From: Michael Smith <m@michaelsmith.be>
Date: Wed, 11 Sep 2024 16:09:46 +0200
Subject: [PATCH] Add deskOS Plymouth theme package

---
 assets/blank-plymouth-logo.png                 | Bin 127 -> 0 bytes
 modules/desk-os/default.nix                    |   3 ++-
 modules/installer/default.nix                  |   7 +++++--
 packages/desk-os-plymouth/default.nix          |  16 ++++++++++++++++
 packages/desk-os-plymouth/src/desk-os.plymouth |   8 ++++++++
 packages/desk-os-plymouth/src/desk-os.png      | Bin 0 -> 5883 bytes
 packages/desk-os-plymouth/src/desk-os.script   |   8 ++++++++
 7 files changed, 39 insertions(+), 3 deletions(-)
 delete mode 100644 assets/blank-plymouth-logo.png
 create mode 100644 packages/desk-os-plymouth/default.nix
 create mode 100644 packages/desk-os-plymouth/src/desk-os.plymouth
 create mode 100644 packages/desk-os-plymouth/src/desk-os.png
 create mode 100644 packages/desk-os-plymouth/src/desk-os.script

diff --git a/assets/blank-plymouth-logo.png b/assets/blank-plymouth-logo.png
deleted file mode 100644
index 30dddc76891c5305471acf42e61e7a1b1eceadce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 127
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCwj^(N7l!{JxM1({$v_d#0*}aI
z1_nK45N51cYF`Evl=pOT49U3n_8=o8kk_Q}e|?^Z1BeL*`fMr&42;>6_KJeIp00i_
I>zopr0McU|!T<mO

diff --git a/modules/desk-os/default.nix b/modules/desk-os/default.nix
index 0cf4967..716e9b4 100644
--- a/modules/desk-os/default.nix
+++ b/modules/desk-os/default.nix
@@ -20,7 +20,8 @@
     loader.efi.canTouchEfiVariables = true;
     plymouth = {
       enable = true;
-      logo = ../../assets/blank-plymouth-logo.png;
+      theme = "desk-os";
+      themePackages = [ (pkgs.callPackage ../../packages/desk-os-plymouth {}) ];
     };
   };
 
diff --git a/modules/installer/default.nix b/modules/installer/default.nix
index 7a20f86..5af9b30 100644
--- a/modules/installer/default.nix
+++ b/modules/installer/default.nix
@@ -47,8 +47,11 @@ in {
     initrd.verbose = false;
     loader.systemd-boot.enable = true;
     loader.timeout = lib.mkForce 0;
-    plymouth.enable = true;
-
+    plymouth = {
+      enable = true;
+      theme = "desk-os";
+      themePackages = [ (pkgs.callPackage ../../packages/desk-os-plymouth {}) ];
+    };
     # NOTE(m): Enable kernel modules that improve wifi support on
     # Macbooks during installation.
     # See https://nixos.org/manual/nixos/stable/#sec-building-image-drivers
diff --git a/packages/desk-os-plymouth/default.nix b/packages/desk-os-plymouth/default.nix
new file mode 100644
index 0000000..f48adb1
--- /dev/null
+++ b/packages/desk-os-plymouth/default.nix
@@ -0,0 +1,16 @@
+{stdenv}:
+stdenv.mkDerivation {
+  pname = "desk-os-plymouth";
+  version = "0.0.1";
+
+  src = ./src;
+
+  installPhase = ''
+    runHook preInstall
+    sed -i 's:\(^ImageDir=\)/usr:\1'"$out"':' desk-os.plymouth
+    sed -i 's:\(^ScriptFile=\)/usr:\1'"$out"':' desk-os.plymouth
+    mkdir -p $out/share/plymouth/themes/desk-os
+    cp * $out/share/plymouth/themes/desk-os
+    runHook postInstall
+  '';
+}
diff --git a/packages/desk-os-plymouth/src/desk-os.plymouth b/packages/desk-os-plymouth/src/desk-os.plymouth
new file mode 100644
index 0000000..8249775
--- /dev/null
+++ b/packages/desk-os-plymouth/src/desk-os.plymouth
@@ -0,0 +1,8 @@
+[Plymouth Theme]
+Name=deskOS
+Description=A theme that displays the deskOS logo
+ModuleName=script
+
+[script]
+ImageDir=/usr/share/plymouth/themes/desk-os
+ScriptFile=/usr/share/plymouth/themes/desk-os/desk-os.script
diff --git a/packages/desk-os-plymouth/src/desk-os.png b/packages/desk-os-plymouth/src/desk-os.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c8d8dd8a30d95f06c05913fd30998a8898d3f36
GIT binary patch
literal 5883
zcmeHLcT^MYnjeaU5`=&tq7*}uA}CdQ5$Q#0C;}oKM0yKVRGI}55lBQtrHKTQE={^f
z?<ER^ssxA$1j0w#;rs60y=TwvIlKGE{o|f}C(q=W=PmR6o;EXY@^uqkW=3vC005Zv
z^|Z~w|F~nKrvuMzYR)~N{F0lEzPrA@7(fro0N^A@48S2k3s8aFF#%M6@y8cb|G-mI
z(Ev1HcN|DGAb&jecwM@G;5q)rACIG={%f5Ckf;6|{~iinfQ|mo<7o0|4q!FV(boZQ
zbbNF0bc6-20`zor5V{le5D0{Ufu0e1iW$np1U<vX&T@)}n~#@=``kHxK}ivQxP-vD
za~BjuB`#f-m6hcaQB=Jmts*HSD}B5O6$1kUlnKhk%*-Wy{@i)#|8+b10>J2xb)uny
z1Jp1o8W`14JHQ9(d4lTC_7{|6pft26=pghAj7;EwDpmlr6b&^k&50AVv|w*E*bmUc
zPOzQ7tVzdi<_v)coRYqqmPaq3Ro=p3KJ;5q=2l=l10&~Yt~1<1!Xg($#bo8=6|N{M
zUDdv(qpPQHU}0%xjj*w`b8&TZ_we-c4hjwl4GWJz-n;)GAu%aA<yrdkj2D?%*{C;f
z-{lt+78Sq$R8d(~T~k~4xwWmmqqFO4_qXAZ(XsJ~$*F1F{KDeW^2*O&t3=Y~7I}Mz
zvirv|u49~kZ+{{CPq<(pE^1m@8d}IPE-LD<W8g5_6X!3}v1yt?oCDb5(s$`kX{F_r
zw=f9EnE&Ru6*$DmDJY8*A|6Bg6WRX^Sp5G9*}nt(4_wm#l!gj)9t{jo2X+rrF1)7x
zfBKiO0gD~wG_Fs)T?v!VTkNy_Aobg%N~e*V>%b3zK}0d$&abtM#SyJ)E>+R5RDdsB
zW3dtphS%~<bsb(+syQe>0tVeal%*a4B;_L@cXx#YKw3JnG;xP_QctVc#th%7TgcUM
zJ{WQ2A=2R1ckcQvJn>T5^9ouru0n)TuPi~^11Fd3`cB)_4~FQ4Fo{g5*iQSiScxIy
zmDrtZqOOg+B_i7F3pxdr<@ro!g(Fip1|eNrh>uZX6f>XsNS5^+*X5Sxv95uEp5mn&
zu=uxCp`6oUEqyNL+#Hq481%;D2^SSVRXrX^DG)V#4QcwM>9jG9z&Y(zZSEJp7n}Bl
zYl^!fBoLWCnzDr-px&3K#1^!PBrW`qs4thq->ruXohjcLy$<Q)Aiv}`PNrNJBB{kX
ztRDfYM7*OJ@w7H2rs=GMeH+`_E7LmOss4Q>(dDam@77mE3i6TkGWU;w9wb0HOxc#Y
z-^}=$C@6xMIRB#%lnQ>=%?5Qo2TL#;MTihDP~0#2+fuv-x)WHMMbH8f=nQ(?E|+o<
zO>&tH#p!qQzCEM&=k#4<K!1B@)NE5>hQH1k-8()#r58~fzxYiXrn=^2oE*b<EY%<s
z-=K?e?N8T9yX5SkQ9c4U(EFkbmw4~8mw&T+5LQ9z)j`DpVZ3COk8vNia8{&lXr%l3
z0{gOi7k~74z?5Fu3)i%zr}Zz(SAFUzhVy4jS-Ln&pjq+Jhk-YvurARJPxThJUqe|q
z!X5Wok-ex8(tgh)dBpO!l3>~e0^>FTh=LDE1k;nt*gKXDf=C+yOZ&Y!E-^tF>()nr
zr!U*tTo$bN<iUEuVPM2}qEy)yrsJY4A!+txO!p~DP2HjD<IbsyktJ30xXaEDabb^=
zKi2Sh1`NdxTg*18*E^~1YYfTGvQRz~OomrB`5(H|b)F64t|79S3Qic#OU3hw3_-HJ
z_^^3AuDt;+g)Zk+_4iBq1g&+&7NAOlG@fr#fD8WxZ65*uZCKk<sNPR`A*+if(jzqY
zOAEbj<J`6&qln`0RBcMce5uCF>TGlF-s~@?NfsP`u$cy**e{fCe_7Er7kBhZrZR%x
z14!@Y52kCXA(HoFI4K?>%`c46x)^t-vYirMtQE!M_p-pn^j$WEsveJXVax}cjv_>n
zdE<d6Qf4p}G*?Br^jSrQSE2XDJZXOBGRAsb`~7+F`K+tLQec~U)13q4M3!dRK6iDt
zTgre>+0|u7K0kwdI7kPNvfgl4VpS)pbmYJ&%e~)D_YRC<Rbz1iq2A_~@X5sQWz5_W
z!19M_fzrl+9kAFWxQ`ejqjTVRZ9k<*b!Cy0wKJ@-Y*d5Xgo_QnbEe7iOwR9lhBx;f
znOyFVA-z8W{JBYG=e!-MM^)?#@>3Q}Qv3F9Waqx@tiK|l9?qNlILz-i9*1c<v5i*9
zU|5y^UL6_BPBY34EH#Nno&WTEJmrs>RAH=5`SR7ORBLTM8AVl_R~c)lv$i5_HfOIJ
zZ@&#Ccb_>Rc9|gO8wTbHsg<UbYp%bm(-dA39<TUddQ}2h8X8t!k;mHRjRm75I6DbD
z%|A%9hmk87)eAHh9YZ(pPRxsHY_*e*QzdRgLWOS}0UtV*6m~nJ?hZGi=Q7*%whYtr
zyn}ozG7t2zIazGV(PM&(X`|x`ovQ2xl@k^g!@`^A>-)DR+uX+<>q<m)4|oHcCE{;A
zB6wQKMu)Fc@lH4P^@bOTiETc$YieGCQ%l?Z!bW6)y@DpSGB=7nF<y$<wjixEw(FTk
zPiAhq(B$tT{qCDegOJCpnk^VC&N?xqG<@}|Ms~`@Ll@Vmx@2ODfT}X0afT9xD|_^g
z`+j+J9+t9mqaZf1KzGM8w^NOl5>Ob8Ht~HFvv%d>#)^7GMst%f;2JZCYL}nkx@UB8
z58F7&rT&GeP)IJL9&E6}P^@}UR<lzL{mu2d{W1r0u?^k>DN$}g^8^@=sd-`)7!S3~
z&G6#g44sJUNW|ca7&s-G$fV1u;G(S5a+pS1s@RFUaqz{HMjhwZft}^_5q-M~=5uq@
z8ajN1aV^}E=FQ#lTE5h2)q<S)TFLd1+nJFK{rY>wtURWT$oywfDik;9M0Md>KQ@eS
zE3yBi^2Xs2fOk>}-|N^6?`f~_hRU~w?wb7$-A^gZdHo8}2n3FrT?0=2KmAMCAogg=
z&AyBXz7*5lGSt-uj*gGljfLr;gu!3WHV6Qi*pG<{K)vJwg^*x<<7<$g3`{2>T%VoE
z@4#V3`r4Y7;nV9VTfOH_d|k1rCKmerP6m%tTDiKvK9aD1Cunec2)_E}+Vtrn$@|~X
z^7M9|1o)>ns@SijH$@Mh8GU*%{E$=Eu=q^jkaSR3=gU_sdyWm^o`IF>1Vc9R!55nT
zUPX_7l41|x5h_XJtCJy6A4ko~sBr<v1MdH`nHZr0%pY&e-s<Sv*x1zXpwa03PoK=!
zLhFBiKJ39?jy;UBt@6(BL<u7>H_}E5O^=+GY$Z68Q&Tf3l<>>wK67((I18`JQxb_}
zvU!4z&Ol2m-sqKzt&woLO60Z?D1L{*V0wf!5GrAWnFknr3||fQ@v~=a=M)2Jot>SV
zD|ylKzVXgnKwM+w&f&n))~^wWh{;QhhzP}C2i>y?&aW|;lZuLpS@OQ9*#;T+UJXr6
zDm#07D>a7+T(DBW&%yJ-_;F?jIY|d$4HJ_mrY_B~({!{z%EO0g&!2DEGhGT?)N2SQ
zwieDDPMh1?Kit|1&TVK*Wa&y|;j`ohmFeu%$tcUuKarfA9E$-GoNu-zFeg2Eq7xh}
zJ3l}F(HAS<fFv7)wAP0aSkIi<wPzeGK}elCb*hM}61zUx9IHORumEFczZZfZ$F<yp
zP`2040<W8zcsG~(EOupNWUSO*Du<oCngG?*)}|dE88Nf8yssR#p)pdaZXX9us@hW#
z6r`=It9$QK@#)k43mN}8jrPt?xR@BDaC)~N>dO}mZ5<uBygVli22<mi&ITHhWUbkz
zXc#Z=432+oszP^3N>o(S($cbC7W^)}61n}s0AXX31Wrt%f29`92v8_Q0WB@9C{lKx
zdsg2v=G^|QE&yvuf(cwlARs^y2BULycrfN6<I%4j6Qj0@$LHadnqm$Z(R~TbXXPo+
z%WqFfH$?5S@uosPW8M}QGYsUa>w0^87gG1;s`G``^Nfv+)rJvxky}4;VK*P9qyPY@
zVB2uMq4I4%fB#DchK5vtW7%o&2KSTZy3<7fAhqjWhBzXWeDi3AI*FcFJ?6u3sa+K#
zJYF$qd2VxM0Ehz}(-5&qmywZi2};A8s;mF>>C-qAiW|^yaNwC~jxBRsSzZpk@a1co
z0M7pk07zysfjbE?c+N9t7;3Q0fd7?q>N%yEk`CtL(`f>_{O~J5%Z~;QV~-A_Z-1|a
z;c&Q98rn~Da!QpvLG<)csJ63no}GN5Y3@mwrl)7ow6uYN!A*H|T3TA3QuR8mn&%+@
z+V?tkb`g^;aSc5^`d6xv1>5**4>?0@YTmsQ44IE5Eq0q?8~kR~#$KQm{Is-LVK6Gt
zhJ?#dnq0N$)_lXvOE<s7Npj59)YFrYjjMjfBd*_T1K8Nv1>kTnK{6ElX1>m~+!MNT
z#il=3T?%OTt}+M?t^`BeSX;Z-y`mQ-XGjO-;$K=?`V@k<?j9KMi)FYa-Cb-^C@3ju
z0w%`Nm%B89#QBbs_;Kr|q$Fo9b>E&HFK}v7(&T!mzKO|;ho_~!fx+K?2|6Te+}hSA
zBqwKe=f`KE;{@E?pgLS<9F#9%Zqq;_mE`?q*4W{43JN8KzKY`^JffnaS;}FOC=|-_
zP|B%^Uql2VZvEkU;%5RPj?h*uj==0!GK0y5DBr`@_`z6N2fh9P%~fO@16n3D*It5C
z!m)vCYHG^!_H9e@OkI#iW+_lG>$RQu;DNrS<@2PZ+8=l7Lhvto(F&%r#_TW{x=&b6
zPHvr4RbBlJKT+0!^Vb8N<<^IiW8>gBR{2GHySBcb-qWlsF5BjqM$@L@VRHs%<_xvy
zKfXQ}wQ$|15J_NBIf+MDTMJ8O8p7dl*SRlurM-p)yZidcv0c2Z{4Sl3b_r0L#of)7
z^<i*>O3&TBz}4N|0Ezs(hOGe=Ne3(BL9}>Wf!A>iq0%BEB3NNYxoQsU^<cOhhFPPH
z^h``TmwGbIoSawyf2ACHMn>;2I-5qMoSmH=0I=|>tzD|T9VvOE_O*M+ojaIW&ph9J
zA{YXWZMVuP_fhHve9EC8yjRHhiKG3iuM4~eWtrV8&IAMm)CMdh*g5+6_@q61_NKLX
zhcH``zVp$!Eoy$bvQjoAsKAT+gLR21G?u(-6%x0<k{i3PLp6bMu&{3(kWBnwE&kG^
z(A&__kr%AhgB2d8Sw_M(rPi*lu0^F^@#I@QFD{BbY5;RrOkBL&XF@WB<z~6f(~OLz
z3i81aqJ@Kl1I(l2pHj~6a22(QLiNsV<<Pb33O*)<?4T#Ve*2~s5O6uzA+gW>UdOGL
zjUV;6(E7B@%)}q{VGCd^7Znu&fC_S}sO{26r{<Uo;^G#w>LIJ6CfH{vRLcAJVpc2T
z<JPq|B%fzyzRk<iY$TA80UO^Hg<JyzKiT<0+cezVgi=yc<^t<1a~zwZlIP~;z{<%7
z=9ICqvA6s#mKWSH9M$|4>FwhaK>6+LiAq@LN_`7fREH_TOru4!RB$k?GHN$a=oa|w
zh>wp~@-;O#XCrNH63KW(^Lja0#;bkN1K#hvxU2nUPZo~++C*z&S1oL8idx4o$Vz#p
z7&)H_Oh(?-#Og?=iICl`U+Lc)A}qjXjPgYRH8n?0$r~4}ORPXoFRo*2o@Hl?%A<|*
zvoATvOW1tWfC~t8ED*nfX}368?qY6bB?O0C6d0vVRd|$qByF!_#r*8-P@qpPL$5yJ
zRTXn{bITdm9g)>HGJ0-X;oc3}Fh6o<V?MC%-N%pDC7qfis;a7DHXkG;e0wHj=(_cD
zh>ep|*viU^^m9l+5v=}|m6gH2s6O`4^6#heYf;gk;6D|29r!0PumAoMv&*#0Qtp>k
U@pdra&%I>*YbM$lt()=x2KITsnE(I)

literal 0
HcmV?d00001

diff --git a/packages/desk-os-plymouth/src/desk-os.script b/packages/desk-os-plymouth/src/desk-os.script
new file mode 100644
index 0000000..b4a093e
--- /dev/null
+++ b/packages/desk-os-plymouth/src/desk-os.script
@@ -0,0 +1,8 @@
+image = Image("desk-os.png");
+
+pos_x = Window.GetWidth()/2 - image.GetWidth()/2;
+pos_y = Window.GetHeight()/2 - image.GetHeight()/2;
+
+sprite = Sprite(image);
+sprite.SetX(pos_x);
+sprite.SetY(pos_y);