From f48e803830ca2e81e3b84f85b973681e11690b02 Mon Sep 17 00:00:00 2001 From: Izzy Date: Sun, 12 Jul 2026 20:50:09 +0100 Subject: [PATCH] chore: merge assets system_files into extra --- .gitmodules | 3 --- mkosi.conf.d/subprojects.conf | 1 - .../usr/share/apollo/assets/watermark.svg | 11 +++++++++++ .../usr/share/pixmaps/apollo-logo-dark.svg | 5 +++++ mkosi.extra/usr/share/pixmaps/apollo-logo.svg | 5 +++++ .../share/plymouth/themes/spinner/watermark.png | Bin 0 -> 4002 bytes subprojects/assets | 1 - 7 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 mkosi.extra/usr/share/apollo/assets/watermark.svg create mode 100644 mkosi.extra/usr/share/pixmaps/apollo-logo-dark.svg create mode 100644 mkosi.extra/usr/share/pixmaps/apollo-logo.svg create mode 100644 mkosi.extra/usr/share/plymouth/themes/spinner/watermark.png delete mode 160000 subprojects/assets diff --git a/.gitmodules b/.gitmodules index c9ba367..04415a5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "assets"] - path = subprojects/assets - url = https://github.com/apollo-linux/assets [submodule "subprojects/arch-bootc-pkgs"] path = subprojects/arch-bootc-pkgs url = https://github.com/hecknt/arch-bootc-pkgs diff --git a/mkosi.conf.d/subprojects.conf b/mkosi.conf.d/subprojects.conf index 0562141..75a4f20 100644 --- a/mkosi.conf.d/subprojects.conf +++ b/mkosi.conf.d/subprojects.conf @@ -2,7 +2,6 @@ Distribution=arch [Content] -ExtraTrees=subprojects/assets/system_files/:/ Packages= homebrew brew-proxy diff --git a/mkosi.extra/usr/share/apollo/assets/watermark.svg b/mkosi.extra/usr/share/apollo/assets/watermark.svg new file mode 100644 index 0000000..c0dd4fc --- /dev/null +++ b/mkosi.extra/usr/share/apollo/assets/watermark.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/mkosi.extra/usr/share/pixmaps/apollo-logo-dark.svg b/mkosi.extra/usr/share/pixmaps/apollo-logo-dark.svg new file mode 100644 index 0000000..5d8c78e --- /dev/null +++ b/mkosi.extra/usr/share/pixmaps/apollo-logo-dark.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/mkosi.extra/usr/share/pixmaps/apollo-logo.svg b/mkosi.extra/usr/share/pixmaps/apollo-logo.svg new file mode 100644 index 0000000..1fd1ee2 --- /dev/null +++ b/mkosi.extra/usr/share/pixmaps/apollo-logo.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/mkosi.extra/usr/share/plymouth/themes/spinner/watermark.png b/mkosi.extra/usr/share/plymouth/themes/spinner/watermark.png new file mode 100644 index 0000000000000000000000000000000000000000..e7ce1e3da5a0fbaa00d558726b19b08b00a11361 GIT binary patch literal 4002 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 IM6N<$f~}`;r2qf` literal 0 HcmV?d00001 diff --git a/subprojects/assets b/subprojects/assets deleted file mode 160000 index 72a68e6..0000000 --- a/subprojects/assets +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 72a68e6051c5db15ce14d07d66d6682a5f099074