diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 59579e5..84cca03 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,6 +27,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6 + with: + submodules: recursive - name: Generate tags id: generate-tags diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..2ffbd9c --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "branding"] + path = branding + url = https://github.com/get-aurora-dev/branding.git diff --git a/Containerfile b/Containerfile index ee7f11c..569f3a5 100644 --- a/Containerfile +++ b/Containerfile @@ -70,4 +70,5 @@ FROM scratch AS ctx COPY --from=ghcr.io/projectbluefin/common:latest /system_files/shared /system_files/shared COPY --from=builder /out/wallpapers /wallpapers COPY --from=builder /out/logos /logos +COPY /branding/system_files /system_files/shared COPY /system_files /system_files diff --git a/Justfile b/Justfile index ccff5b4..0ab767e 100644 --- a/Justfile +++ b/Justfile @@ -4,6 +4,8 @@ just := just_executable() # Build the aurora-common container locally build: + git submodule update --init --recursive + git submodule update --remote podman build -t localhost/aurora-common:latest -f ./Containerfile . # Check the syntax of all Justfiles in the repository diff --git a/README.md b/README.md index 1a9f945..424c691 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,13 @@ Shared OCI layer containing configuration files for Aurora and Aurora-DX variant ## Repository Structure -This layer builds on top of `ghcr.io/projectbluefin/common` and includes: +This layer builds on top of `ghcr.io/projectbluefin/common` and `https://github.com/get-aurora-dev/branding` which includes: - `system_files/shared/` - Configuration shared between Aurora and Aurora-DX - `system_files/dx/` - Aurora-DX specific configuration - `wallpapers/` - Aurora wallpapers from [artwork repo](https://github.com/ublue-os/artwork) - `flatpaks/` - Flatpak definitions used for including flatpaks for the ISOs and `ujust install-system-flatpaks` -- `logos/` - Aurora branding assets +- `logos/` - Aurora Logos used in SDDM/Plasma Kickoff etc. ## Usage in Downstream Projects diff --git a/branding b/branding new file mode 160000 index 0000000..34a702e --- /dev/null +++ b/branding @@ -0,0 +1 @@ +Subproject commit 34a702e4dfc6709ee714f0877d0a8eb7ee463153 diff --git a/system_files/shared/etc/bazaar/01-aurora-bazaar.jxl b/system_files/shared/etc/bazaar/01-aurora-bazaar.jxl deleted file mode 100644 index ad7c37c..0000000 Binary files a/system_files/shared/etc/bazaar/01-aurora-bazaar.jxl and /dev/null differ diff --git a/system_files/shared/etc/bazaar/02-aurora-bazaar.jxl b/system_files/shared/etc/bazaar/02-aurora-bazaar.jxl deleted file mode 100644 index 9a62f01..0000000 Binary files a/system_files/shared/etc/bazaar/02-aurora-bazaar.jxl and /dev/null differ diff --git a/system_files/shared/etc/bazaar/03-aurora-bazaar.jxl b/system_files/shared/etc/bazaar/03-aurora-bazaar.jxl deleted file mode 100644 index c8d0e92..0000000 Binary files a/system_files/shared/etc/bazaar/03-aurora-bazaar.jxl and /dev/null differ diff --git a/system_files/shared/etc/bazaar/04-aurora-bazaar.jxl b/system_files/shared/etc/bazaar/04-aurora-bazaar.jxl deleted file mode 100644 index cb25e47..0000000 Binary files a/system_files/shared/etc/bazaar/04-aurora-bazaar.jxl and /dev/null differ diff --git a/system_files/shared/etc/bazaar/05-aurora-bazaar.jxl b/system_files/shared/etc/bazaar/05-aurora-bazaar.jxl deleted file mode 100644 index ec65708..0000000 Binary files a/system_files/shared/etc/bazaar/05-aurora-bazaar.jxl and /dev/null differ diff --git a/system_files/shared/etc/bazaar/06-aurora-bazaar.jxl b/system_files/shared/etc/bazaar/06-aurora-bazaar.jxl deleted file mode 100644 index a5def6b..0000000 Binary files a/system_files/shared/etc/bazaar/06-aurora-bazaar.jxl and /dev/null differ diff --git a/system_files/shared/etc/bazaar/07-aurora-bazaar.jxl b/system_files/shared/etc/bazaar/07-aurora-bazaar.jxl deleted file mode 100644 index 1727dec..0000000 Binary files a/system_files/shared/etc/bazaar/07-aurora-bazaar.jxl and /dev/null differ diff --git a/system_files/shared/etc/bazaar/08-aurora-bazaar.jxl b/system_files/shared/etc/bazaar/08-aurora-bazaar.jxl deleted file mode 100644 index 3d6a2b8..0000000 Binary files a/system_files/shared/etc/bazaar/08-aurora-bazaar.jxl and /dev/null differ diff --git a/system_files/shared/etc/bazaar/browse.jxl b/system_files/shared/etc/bazaar/browse.jxl deleted file mode 100644 index c211ba0..0000000 Binary files a/system_files/shared/etc/bazaar/browse.jxl and /dev/null differ diff --git a/system_files/shared/etc/bazaar/favourites.jxl b/system_files/shared/etc/bazaar/favourites.jxl deleted file mode 100644 index 2db6fb4..0000000 Binary files a/system_files/shared/etc/bazaar/favourites.jxl and /dev/null differ diff --git a/system_files/shared/etc/bazaar/music.jxl b/system_files/shared/etc/bazaar/music.jxl deleted file mode 100644 index 8c5af45..0000000 Binary files a/system_files/shared/etc/bazaar/music.jxl and /dev/null differ diff --git a/system_files/shared/usr/share/plasma/avatars/echo.png b/system_files/shared/usr/share/plasma/avatars/echo.png deleted file mode 100644 index 3d9eaf2..0000000 Binary files a/system_files/shared/usr/share/plasma/avatars/echo.png and /dev/null differ diff --git a/system_files/shared/usr/share/plasma/avatars/lumina.png b/system_files/shared/usr/share/plasma/avatars/lumina.png deleted file mode 100644 index 34cc576..0000000 Binary files a/system_files/shared/usr/share/plasma/avatars/lumina.png and /dev/null differ diff --git a/system_files/shared/usr/share/plasma/avatars/phlip.png b/system_files/shared/usr/share/plasma/avatars/phlip.png deleted file mode 100644 index f991427..0000000 Binary files a/system_files/shared/usr/share/plasma/avatars/phlip.png and /dev/null differ diff --git a/system_files/shared/usr/share/plasma/avatars/scope.png b/system_files/shared/usr/share/plasma/avatars/scope.png deleted file mode 100644 index 62a019c..0000000 Binary files a/system_files/shared/usr/share/plasma/avatars/scope.png and /dev/null differ diff --git a/system_files/shared/usr/share/plasma/avatars/tina.png b/system_files/shared/usr/share/plasma/avatars/tina.png deleted file mode 100644 index 965ed05..0000000 Binary files a/system_files/shared/usr/share/plasma/avatars/tina.png and /dev/null differ diff --git a/system_files/shared/usr/share/plasma/avatars/vincent.png b/system_files/shared/usr/share/plasma/avatars/vincent.png deleted file mode 100644 index 9b03cf3..0000000 Binary files a/system_files/shared/usr/share/plasma/avatars/vincent.png and /dev/null differ diff --git a/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/defaults b/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/defaults index 3c81362..92edfce 100644 --- a/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/defaults +++ b/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/defaults @@ -23,4 +23,4 @@ LayoutName=org.kde.breeze.desktop library=org.kde.breeze [KSplash] -Theme=dev.getauorora.aurora +Theme=dev.getaurora.aurora diff --git a/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/previews/fullscreenpreview.jpg b/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/previews/fullscreenpreview.jpg deleted file mode 100644 index 1e76727..0000000 Binary files a/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/previews/fullscreenpreview.jpg and /dev/null differ diff --git a/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/previews/preview.png b/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/previews/preview.png deleted file mode 100644 index 875f22c..0000000 Binary files a/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/previews/preview.png and /dev/null differ diff --git a/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/previews/splash.png b/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/previews/splash.png deleted file mode 100644 index bcda2a2..0000000 Binary files a/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/previews/splash.png and /dev/null differ diff --git a/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/Splash.qml b/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/Splash.qml index 29ef25a..58a618e 100644 --- a/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/Splash.qml +++ b/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/Splash.qml @@ -5,7 +5,7 @@ */ import QtQuick -import org.kde.kirigami 2 as Kirigami +import org.kde.kirigami as Kirigami Rectangle { id: root @@ -66,6 +66,27 @@ Rectangle { running: Kirigami.Units.longDuration > 1 } } + Row { + spacing: Kirigami.Units.largeSpacing + anchors { + bottom: parent.bottom + right: parent.right + margins: Kirigami.Units.gridUnit + } + Text { + color: "#eff0f1" + anchors.verticalCenter: parent.verticalCenter + text: i18ndc("plasma_lookandfeel_org.kde.lookandfeel", "This is the first text the user sees while starting in the splash screen, should be translated as something short, is a form that can be seen on a product. Plasma is the project name so shouldn't be translated.", "Plasma made by KDE") + Accessible.name: text + Accessible.role: Accessible.StaticText + } + Image { + asynchronous: true + source: "images/kde.svgz" + sourceSize.height: Kirigami.Units.gridUnit * 2 + sourceSize.width: Kirigami.Units.gridUnit * 2 + } + } } OpacityAnimator { diff --git a/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/metadata.desktop b/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/metadata.desktop deleted file mode 100644 index 9e691e0..0000000 --- a/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/metadata.desktop +++ /dev/null @@ -1,16 +0,0 @@ -[Desktop Entry] -Comment=Aurora - Theme based on KDE BreezeDark -Name=Aurora -Type=Service - -X-KDE-ServiceTypes=Plasma/LookAndFeel -X-KDE-ParentApp= -X-KDE-PluginInfo-Author=Universal-Blue -X-KDE-PluginInfo-Category= -X-KDE-PluginInfo-Email= -X-KDE-PluginInfo-License=GPL-2.0+ -X-KDE-PluginInfo-Name=dev.getaurora.aurora.desktop -X-KDE-PluginInfo-Version=0.01 -X-KDE-PluginInfo-Website=https://getauorora.dev -X-Plasma-MainScript=defaults -X-KDE-PluginInfo-License=GPLv2+ diff --git a/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/metadata.json b/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/metadata.json index a31beeb..93898e8 100644 --- a/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/metadata.json +++ b/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/metadata.json @@ -4,7 +4,7 @@ "Authors": [ { "Email": "", - "Name": "Universal Blue" + "Name": "Aurora Contributors" } ], "Category": "", diff --git a/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents/defaults b/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents/defaults new file mode 100644 index 0000000..be05d1e --- /dev/null +++ b/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents/defaults @@ -0,0 +1,26 @@ +[kdeglobals][KDE] +widgetStyle=Breeze + +[kdeglobals][General] +ColorScheme=BreezeLight + +[kdeglobals][Icons] +Theme=breeze + +[plasmarc][Theme] +name=default + +[kcminputrc][Mouse] +cursorTheme=breeze_cursors + +[kwinrc][WindowSwitcher] +LayoutName=org.kde.breeze.desktop + +[kwinrc][DesktopSwitcher] +LayoutName=org.kde.breeze.desktop + +[kwinrc][org.kde.kdecoration2] +library=org.kde.breeze + +[KSplash] +Theme=dev.getaurora.aurora diff --git a/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents/plasmoidsetupscripts/org.kde.plasma.folder.js b/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents/plasmoidsetupscripts/org.kde.plasma.folder.js new file mode 120000 index 0000000..515f456 --- /dev/null +++ b/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents/plasmoidsetupscripts/org.kde.plasma.folder.js @@ -0,0 +1 @@ +../../../dev.getaurora.aurora.desktop/contents/plasmoidsetupscripts/org.kde.plasma.folder.js \ No newline at end of file diff --git a/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents/plasmoidsetupscripts/org.kde.plasma.kickoff.js b/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents/plasmoidsetupscripts/org.kde.plasma.kickoff.js new file mode 120000 index 0000000..add2eb3 --- /dev/null +++ b/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents/plasmoidsetupscripts/org.kde.plasma.kickoff.js @@ -0,0 +1 @@ +../../../dev.getaurora.aurora.desktop/contents/plasmoidsetupscripts/org.kde.plasma.kickoff.js \ No newline at end of file diff --git a/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents/plasmoidsetupscripts/org.kde.plasma.systemtray.js b/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents/plasmoidsetupscripts/org.kde.plasma.systemtray.js new file mode 120000 index 0000000..72c5f05 --- /dev/null +++ b/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents/plasmoidsetupscripts/org.kde.plasma.systemtray.js @@ -0,0 +1 @@ +../../../dev.getaurora.aurora.desktop/contents/plasmoidsetupscripts/org.kde.plasma.systemtray.js \ No newline at end of file diff --git a/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/metadata.json b/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/metadata.json new file mode 100644 index 0000000..68df631 --- /dev/null +++ b/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/metadata.json @@ -0,0 +1,23 @@ +{ + "KPackageStructure": "Plasma/LookAndFeel", + "KPlugin": { + "Authors": [ + { + "Email": "", + "Name": "Aurora Contributors" + } + ], + "Category": "", + "Description": "Aurora - Theme variant of KDE Breeze", + "Id": "dev.getaurora.auroralight.desktop", + "License": "GPLv2+", + "Name": "Aurora Light", + "ServiceTypes": [ + "Plasma/LookAndFeel" + ], + "Version": "0.01", + "Website": "https://getaurora.dev" + }, + "X-KDE-ParentApp": "", + "X-Plasma-MainScript": "defaults" +}