Skip to content

Commit

Permalink
feat: add aurora files and aurora to build matrix (#1095)
Browse files Browse the repository at this point in the history
  • Loading branch information
m2Giles authored Apr 7, 2024
1 parent 5bef160 commit 9c82ed0
Show file tree
Hide file tree
Showing 29 changed files with 338 additions and 45 deletions.
46 changes: 25 additions & 21 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
fail-fast: false
matrix:
image_flavor: [main, nvidia, asus, asus-nvidia, framework, surface, surface-nvidia]
base_name: [bluefin, bluefin-dx]
base_name: [bluefin, bluefin-dx, aurora, aurora-dx]
major_version: [38, 39, 40]
include:
- major_version: 38
Expand All @@ -48,6 +48,10 @@ jobs:
is_stable_version: false
is_gts_version: false
exclude:
- major_version: 38
base_name: aurora
- major_version: 38
base_name: aurora-dx
- major_version: 38
image_flavor: asus
- major_version: 38
Expand All @@ -63,26 +67,6 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Verify base image
uses: EyeCantCU/cosign-action/[email protected]
with:
containers: silverblue-${{ matrix.image_flavor }}:${{ matrix.major_version }}

- name: Verify Chainguard images
if: matrix.base_name != 'bluefin'
uses: EyeCantCU/cosign-action/[email protected]
with:
containers: dive, flux, helm, ko, minio, kubectl
cert-identity: https://github.com/chainguard-images/images/.github/workflows/release.yaml@refs/heads/main
oidc-issuer: https://token.actions.githubusercontent.com
registry: cgr.dev/chainguard

- name: Maximize build space
uses: ublue-os/remove-unwanted-software@v6

- name: Check just syntax
uses: ublue-os/just-action@v1

- name: Matrix Variables
run: |
if [[ "${{ matrix.image_flavor }}" == "main" ]]; then
Expand All @@ -108,6 +92,26 @@ jobs:
echo "AKMODS_FLAVOR=main" >> $GITHUB_ENV
fi
- name: Verify base image
uses: EyeCantCU/cosign-action/[email protected]
with:
containers: ${{ env.BASE_IMAGE_NAME}}-${{ matrix.image_flavor }}:${{ matrix.major_version }}

- name: Verify Chainguard images
if: matrix.base_name != 'bluefin' && matrix.base_name != 'aurora'
uses: EyeCantCU/cosign-action/[email protected]
with:
containers: dive, flux, helm, ko, minio, kubectl
cert-identity: https://github.com/chainguard-images/images/.github/workflows/release.yaml@refs/heads/main
oidc-issuer: https://token.actions.githubusercontent.com
registry: cgr.dev/chainguard

- name: Maximize build space
uses: ublue-os/remove-unwanted-software@v6

- name: Check just syntax
uses: ublue-os/just-action@v1

- name: Generate tags
id: generate-tags
shell: bash
Expand Down
11 changes: 11 additions & 0 deletions build_files/base/aurora-changes.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/bash

set -oue pipefail

if [[ "${FEDORA_MAJOR_VERSION}" -ge "39" && "${BASE_IMAGE_NAME}" = "kinoite" ]]; then
sed -i '/<entry name="launchers" type="StringList">/,/<\/entry>/ s/<default>[^<]*<\/default>/<default>preferred:\/\/browser,applications:org.gnome.Ptyxis.desktop,applications:org.kde.discover.desktop,preferred:\/\/filemanager<\/default>/' /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml
sed -i '/<entry name="favorites" type="StringList">/,/<\/entry>/ s/<default>[^<]*<\/default>/<default>preferred:\/\/browser,systemsettings.desktop,org.kde.dolphin.desktop,org.kde.kate.desktop,org.gnome.Ptyxis.desktop,org.kde.discover.desktop<\/default>/' /usr/share/plasma/plasmoids/org.kde.plasma.kickoff/contents/config/main.xml
sed -i 's@Exec=ptyxis@Exec=kde-ptyxis@g' /usr/share/applications/org.gnome.Ptyxis.desktop
sed -i 's@Keywords=@Keywords=konsole;@g' /usr/share/applications/org.gnome.Ptyxis.desktop
cp /usr/share/applications/org.gnome.Ptyxis.desktop /usr/share/kglobalaccel/org.gnome.Ptyxis.desktop
fi
1 change: 1 addition & 0 deletions build_files/base/build-base.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ rpm-ostree install ublue-update
. /tmp/build/font-install.sh
. /tmp/build/install-tmp.sh
. /tmp/build/systemd.sh
. /tmp/build/aurora-changes.sh
. /tmp/build/branding.sh
. /tmp/build/cleanup.sh
1 change: 1 addition & 0 deletions packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
"yaru-theme"
],
"kinoite": [
"fastfetch",
"libadwaita-qt5"
],
"dx": [
Expand Down
11 changes: 11 additions & 0 deletions system_files/kinoite/usr/bin/kde-ptyxis
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/bash
# Shim to handle KDE only supporting -e
# https://bugs.kde.org/show_bug.cgi?id=459616
args=("${@//-e/--}")

# Dolphin integration requires --new-window to function properly
if [[ ! "${args[@]}" =~ "--" && ! "${args[@]}" =~ "-h" && ! "${args[@]}" =~ "-x" ]]; then
/usr/bin/ptyxis --new-window "${args[@]}"
else
/usr/bin/ptyxis "${args[@]}"
fi
2 changes: 2 additions & 0 deletions system_files/kinoite/usr/etc/dconf/db/gdm.d/01-ublue
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[org/gnome/desktop/peripherals/touchpad]
tap-to-click=true
9 changes: 9 additions & 0 deletions system_files/kinoite/usr/etc/dconf/db/local.d/01-ptyxis
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[org/gnome/Ptyxis]
restore-session=false
restore-window-size=false
profile-uuids=['2871e8027773ae74d6c87a5f659bbc74']
default-profile-uuid='2871e8027773ae74d6c87a5f659bbc74'

[org/gnome/Ptyxis/Profiles/2871e8027773ae74d6c87a5f659bbc74]
palette='Breeze'
opacity=0.9
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[org/gnome/software]
allow-updates=false
download-updates=false
download-updates-notify=false
3 changes: 3 additions & 0 deletions system_files/kinoite/usr/etc/dconf/profile/gdm
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
user-db:user
system-db:gdm
file-db:/usr/share/gdm/greeter-dconf-defaults
2 changes: 2 additions & 0 deletions system_files/kinoite/usr/etc/dconf/profile/user
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
user-db:user
system-db:local
1 change: 1 addition & 0 deletions system_files/kinoite/usr/etc/environment
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
MUTTER_DEBUG_FORCE_KMS_MODE=simple
15 changes: 15 additions & 0 deletions system_files/kinoite/usr/etc/flatpak/system/install
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
org.freedesktop.Platform.ffmpeg-full//22.08
org.mozilla.Thunderbird
org.kde.kcalc
org.kde.gwenview
org.kde.kontact
org.kde.okular
org.kde.kweather
org.kde.kclock
org.kde.haruna
org.kde.filelight
com.github.tchx84.Flatseal
io.github.dvlv.boxbuddyrs
io.github.flattool.Warehouse
org.fedoraproject.MediaWriter
io.missioncenter.MissionCenter
Empty file.
Empty file.
Empty file.
3 changes: 3 additions & 0 deletions system_files/kinoite/usr/etc/profile.d/aurora-fastfetch.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/sh

alias fastfetch="/usr/bin/fastfetch --file /usr/share/ublue-os/aurora-logo.txt --logo-type file --logo-color-1 94 --logo-color-2 95 --logo-color-3 91 --logo-color-4 97"
2 changes: 2 additions & 0 deletions system_files/kinoite/usr/etc/skel/.config/gtk-4.0/gtk.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import 'colors.css';
@import 'kde_window_geometry.css';
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/*
Extremely trimmed down version of https://github.com/MrCompoopter/Libadwaita-Breeze-Dark
Modifies only the window shape, and otherwise makes no other changes.
This should ensure compatibility with most if not all themes and applications.
*/

window {
border-radius: 4px 4px 0 0;
border-width: 0px;
margin: 0px;
}

window.maximized {
border-radius: 0;
}

.maximized window,
.fullscreen window,
.tiled window {
border-radius: 0;
}

.popup window {
border-radius: 4px;
}

.csd window {
border-radius: 4px;
}

.solid-csd window {
border-radius: 0;
margin: 0;
border-width: 5px;
}
3 changes: 3 additions & 0 deletions system_files/kinoite/usr/etc/xdg/kdeglobals
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[General]
TerminalApplication=kde-ptyxis
TerminalService=org.gnome.Ptyxis.desktop
92 changes: 92 additions & 0 deletions system_files/kinoite/usr/etc/yafti.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
title: Welcome to Aurora
properties:
mode: "run-once"
screens:
first-screen:
source: yafti.screen.title
values:
title: "Welcome to Aurora, the Bluefin-KDE (Alpha)"
icon: "/path/to/icon"
description: |
Applications are also installing in the background, the system will notify you when it is finished.
applications:
source: yafti.screen.package
values:
title: Application Installation
show_terminal: true
package_manager: yafti.plugin.flatpak
groups:
Communication:
default: false
description: Tools to communicate and collaborate
packages:
- Discord: com.discordapp.Discord
- Slack: com.slack.Slack
Development Tools:
description: Start your cloud-native journey here!
default: false
packages:
- GNOME Boxes: org.gnome.Boxes
- Podman Desktop: io.podman_desktop.PodmanDesktop
Gaming:
description: "Rock and Stone!"
default: false
packages:
- Bottles: com.usebottles.bottles
- Heroic Games Launcher: com.heroicgameslauncher.hgl
- Lutris: net.lutris.Lutris
- MangoHUD: org.freedesktop.Platform.VulkanLayer.MangoHud//22.08
- Steam: com.valvesoftware.Steam
- Proton Plus for Steam: com.vysp3r.ProtonPlus
Office:
description: Bow to Capitalism
default: false
packages:
- OnlyOffice: org.onlyoffice.desktopeditors
- LibreOffice: org.libreoffice.LibreOffice
- Obsidian: md.obsidian.Obsidian
- Standard Notes: org.standardnotes.standardnotes
- Thunderbird Email: org.mozilla.Thunderbird
Other Web Browsers:
description: Additional browsers to complement Firefox
default: false
packages:
- Brave: com.brave.Browser
- Google Chrome: com.google.Chrome
- Microsoft Edge: com.microsoft.Edge
- Opera: com.opera.Opera
Streaming:
description: Stream to the Internet
default: false
packages:
- OBS Studio: com.obsproject.Studio
- VkCapture for OBS: com.obsproject.Studio.OBSVkCapture
- Gstreamer for OBS: com.obsproject.Studio.Plugin.Gstreamer
- Gstreamer VAAPI for OBS: com.obsproject.Studio.Plugin.GStreamerVaapi
- Boatswain for Streamdeck: com.feaneron.Boatswain
Utilities:
description: Useful Utilities
default: true
packages:
- Font Downloader: org.gustavoperedo.FontDownloader
- PinApp Menu Editor: io.github.fabrialberio.pinapp
- Backup: org.gnome.DejaDup
- LocalSend: org.localsend.localsend_app
- Syncthing: com.github.zocker_160.SyncThingy
- Cockpit Client: org.cockpit_project.CockpitClient
final-screen:
source: yafti.screen.title
values:
title: "All done!"
icon: "/path/to/icon"
links:
- "Install More Applications":
run: /usr/bin/gnome-software
- "Documentation":
run: /usr/bin/xdg-open https://universal-blue.discourse.group/t/introduction-to-bluefin/41
- "Discussions and Announcements":
run: /usr/bin/xdg-open https://universal-blue.discourse.group/c/bluefin/6
- "Join the Discord Community":
run: /usr/bin/xdg-open https://discord.gg/XjG48C7VHx
description: |
Thanks for trying Bluefin, we hope you enjoy it!
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
[Desktop Entry]
Name[it]=Ptyxis
Name[nl]=Ptyxis
Name[pt_BR]=Ptyxis
Name[tr]=Ptyxis
Name[sv]=Ptyxis
Name=Ptyxis
Comment[it]=Un terminale per GNOME rivolto ai container
Comment[nl]=Een op containers gefocuste terminal voor GNOME
Comment[pt_BR]=Um terminal orientado a contêineres para GNOME
Comment[tr]=GNOME için konteyner odaklı uçbirim
Comment[sv]=En behållar-orienterad terminal för GNOME
Comment=A container-oriented terminal for GNOME
Exec=kde-ptyxis
# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
Icon=org.gnome.Ptyxis
DBusActivatable=true
StartupNotify=true
Terminal=false
Type=Application
Categories=GNOME;GTK;System;TerminalEmulator;
GenericName[it]=Terminale
GenericName[nl]=Terminal
GenericName[pt_BR]=Terminal
GenericName[tr]=Uçbirim
GenericName[sv]=Terminal
GenericName=Terminal
# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
Keywords[tr]=terminal;prompt;ptyxis;shell;command;commandline;cmd;cli;uçbirim;istem;kabuk;komut;komut satırı;
Keywords=konsole;terminal;prompt;ptyxis;shell;command;commandline;cmd;cli;
Actions=new-window;new-tab;preferences;
X-ExecArg=--
X-KDE-AuthorizeAction=shell_access

[Desktop Action new-window]
Name[it]=Nuova finestra
Name[nl]=Nieuw venster
Name[pt_BR]=Nova janela
Name[tr]=Yeni Pencere
Name[sv]=Nytt fönster
Name=New Window
Exec=kde-ptyxis --new-window

[Desktop Action new-tab]
Name[it]=Nuova scheda
Name[nl]=Nieuw tabblad
Name[pt_BR]=Nova aba
Name[tr]=Yeni Sekme
Name[sv]=Ny flik
Name=New Tab
Exec=kde-ptyxis --tab

[Desktop Action preferences]
Name[it]=Preferenze
Name[nl]=Voorkeuren
Name[pt_BR]=Preferências
Name[tr]=Tercihler
Name[sv]=Inställningar
Name=Preferences
Exec=kde-ptyxis --preferences
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
alias fastfetch="/usr/bin/fastfetch --file /usr/share/ublue-os/aurora-logo.txt --logo-type file --logo-color-1 94 --logo-color-2 95 --logo-color-3 91 --logo-color-4 97"
29 changes: 29 additions & 0 deletions system_files/kinoite/usr/share/ublue-os/aurora-logo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
$1
+++++++++
+++++$4+$1++++++$4+$1++
++++++$4+$1+++ +++++++++++
+++++++++++ $2+$1 +++++$4+$1+++++
++++++$4+$1++++ $4+++$1 +++++++++++
++++++++++$4 + +++++ ++ $2+++++$4+$2++++
$1 +++$4+$1++++$4 + + + +++++++ + + $2+++++$4+$2++
$1 ++++++$4 $2+$4 +++ +++++++++ +++ $2++++++++
$1 +++$4+$1++$4 + +++++ +++++ +
$2 ++++++$4 $2+$4 +++++ +++++ +++++
$2 ++$4+$2+++$4 + +++++ ++++++ ++++++++++
$2 ++++++$4 +++++ +++++ + +++++++++++++++++++
$2 ++++++$4 + +++++ + +++++++++++++++
$2 +++$4++$2+$4 ++++++ +++++++++++++
$2 ++++++$4 + ++++++ +++++++++++++ $2+++ $4++
$2 ++++++$4 ++++++++++++++++ $2++$4+$2+ $4++ $1+
$3 ++++++$4 ++++++++++++++ $3+ $2++++
$3 ++++++$4 +++++++++++ + $4+ $3++++++
$3 ++$4+$3+++$4 ++++++++++ +++ $3+++++++++++++
$3 +++++ $4+++++++++ + $3+++++++++++++
$3 +++ $4++++++++ $2++$4 + $3++++++++++++++ ++++
$3 ++ $4++++++++ $3+ ++++++++++++++ +++++++
$3 $4++++++ $2+ $3+++++++++++++ +++++++$2++
$3 $4++++ $3+++++++++++++ ++++++$2+++
$3 +++++++++++ ++++++$2+++
$3 +++++ ++++++$2+++
$3 ++++++$2++
$3 +++++
Loading

0 comments on commit 9c82ed0

Please sign in to comment.