mirror of
https://github.com/get-aurora-dev/common.git
synced 2026-11-03 21:49:43 -09:00
Merge branch 'main' into fixed-timestamp
This commit is contained in:
renner
GitHub
commit
293900bbc4
18 changed files with 142 additions and 228 deletions
6
.github/workflows/build.yml
vendored
6
.github/workflows/build.yml
vendored
|
|
@ -15,7 +15,7 @@ env:
|
|||
jobs:
|
||||
build_push:
|
||||
name: Build and push image
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-26.04
|
||||
permissions:
|
||||
contents: read
|
||||
packages: write
|
||||
|
|
@ -23,7 +23,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
|
||||
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.1
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
|
|
@ -60,7 +60,7 @@ jobs:
|
|||
--source-date-epoch=1321009871
|
||||
|
||||
- name: Login to GitHub Container Registry
|
||||
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
|
||||
uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
|
||||
if: github.event_name != 'pull_request'
|
||||
with:
|
||||
registry: ghcr.io
|
||||
|
|
|
|||
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
|
|
@ -16,7 +16,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
|
||||
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
|
|
|
|||
2
.github/workflows/validate-brewfiles.yml
vendored
2
.github/workflows/validate-brewfiles.yml
vendored
|
|
@ -11,7 +11,7 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
|
||||
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.1
|
||||
|
||||
- name: Set up Homebrew
|
||||
uses: Homebrew/actions/setup-homebrew@main
|
||||
|
|
|
|||
2
.github/workflows/validate-just.yml
vendored
2
.github/workflows/validate-just.yml
vendored
|
|
@ -17,7 +17,7 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
|
||||
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.1
|
||||
|
||||
- name: Setup Just
|
||||
uses: extractions/setup-just@53165ef7e734c5c07cb06b3c8e7b647c5aa16db3 # v4
|
||||
|
|
|
|||
4
.github/workflows/validate-renovate.yml
vendored
4
.github/workflows/validate-renovate.yml
vendored
|
|
@ -17,10 +17,10 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
|
||||
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.1
|
||||
|
||||
- name: Setup Node.js
|
||||
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
|
||||
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7
|
||||
with:
|
||||
node-version: latest
|
||||
|
||||
|
|
|
|||
163
Containerfile
163
Containerfile
|
|
@ -6,90 +6,113 @@ COPY --from=ghcr.io/ublue-os/aurora-wallpapers:latest@sha256:270b3b10cd6fd54e322
|
|||
|
||||
COPY /logos /logos
|
||||
|
||||
RUN set -xeuo pipefail && \
|
||||
cd /wallpapers && \
|
||||
rm -rf kde/*/gnome-background-properties/ && \
|
||||
mkdir -p /out/wallpapers/usr/share/wallpapers /out/wallpapers/usr/share/backgrounds && \
|
||||
mv kde/ /out/wallpapers/usr/share/backgrounds/aurora/ && \
|
||||
cd /out/wallpapers/usr/share/backgrounds && \
|
||||
for dir in aurora/*; do \
|
||||
ln -sr "/out/wallpapers/usr/share/backgrounds/${dir}" /out/wallpapers/usr/share/wallpapers/; \
|
||||
done && \
|
||||
ln -sr /out/wallpapers/usr/share/backgrounds/aurora/aurora-wallpaper-6/ /out/wallpapers/usr/share/backgrounds/aurora/aurora-wallpaper-1 && \
|
||||
ln -sr /out/wallpapers/usr/share/backgrounds/aurora/aurora-wallpaper-1/ /out/wallpapers/usr/share/wallpapers/ && \
|
||||
rm -rf /wallpapers
|
||||
RUN <<EOF
|
||||
set -xeuo pipefail
|
||||
|
||||
cd /wallpapers
|
||||
rm -rf kde/*/gnome-background-properties/
|
||||
mkdir -p /out/wallpapers/usr/share/wallpapers /out/wallpapers/usr/share/backgrounds
|
||||
mv kde/ /out/wallpapers/usr/share/backgrounds/aurora/
|
||||
cd /out/wallpapers/usr/share/backgrounds
|
||||
|
||||
for dir in aurora/*; do
|
||||
ln -sr "/out/wallpapers/usr/share/backgrounds/${dir}" /out/wallpapers/usr/share/wallpapers/
|
||||
done
|
||||
|
||||
ln -sr /out/wallpapers/usr/share/backgrounds/aurora/aurora-wallpaper-6/ /out/wallpapers/usr/share/backgrounds/aurora/aurora-wallpaper-1
|
||||
ln -sr /out/wallpapers/usr/share/backgrounds/aurora/aurora-wallpaper-1/ /out/wallpapers/usr/share/wallpapers/
|
||||
rm -rf /wallpapers
|
||||
EOF
|
||||
|
||||
# Here we set our default wallpaper
|
||||
RUN set -xeuo pipefail && \
|
||||
REV=12 && \
|
||||
ln -sr /out/wallpapers/usr/share/backgrounds/aurora/aurora-wallpaper-"${REV}"/contents/images/3840x2160.jxl /out/wallpapers/usr/share/backgrounds/default.jxl && \
|
||||
ln -sr /out/wallpapers/usr/share/backgrounds/aurora/aurora-wallpaper-"${REV}"/contents/images/3840x2160.jxl /out/wallpapers/usr/share/backgrounds/default-dark.jxl && \
|
||||
ln -sr /out/wallpapers/usr/share/backgrounds/aurora/aurora-wallpaper-"${REV}" /out/wallpapers/usr/share/wallpapers/Aurora && \
|
||||
ln -sr /out/wallpapers/usr/share/backgrounds/aurora/aurora.xml /out/wallpapers/usr/share/backgrounds/default.xml
|
||||
RUN <<EOF
|
||||
set -xeuo pipefail
|
||||
|
||||
RUN set -xeuo pipefail && \
|
||||
mkdir -p /out/logos/usr/share/icons/hicolor/scalable/apps && \
|
||||
mkdir -p /out/logos/usr/share/icons/hicolor/scalable/places && \
|
||||
mkdir -p /out/logos/usr/share/pixmaps && \
|
||||
cp /logos/distributor-logo.svg /out/logos/usr/share/icons/hicolor/scalable && \
|
||||
cp \
|
||||
/logos/auroralogo-white.svg \
|
||||
/logos/distributor-logo-symbolic.svg \
|
||||
/logos/auroralogo-circle-symbolic.svg \
|
||||
/logos/auroralogo-pride.svg \
|
||||
/logos/auroralogo-pride-trans.svg \
|
||||
/out/logos/usr/share/icons/hicolor/scalable/places/ && \
|
||||
REV=4
|
||||
ln -sr /out/wallpapers/usr/share/backgrounds/aurora/aurora-wallpaper-"${REV}"/contents/images/3840x2160.jxl /out/wallpapers/usr/share/backgrounds/default.jxl
|
||||
ln -sr /out/wallpapers/usr/share/backgrounds/aurora/aurora-wallpaper-"${REV}"/contents/images/3840x2160.jxl /out/wallpapers/usr/share/backgrounds/default-dark.jxl
|
||||
ln -sr /out/wallpapers/usr/share/backgrounds/aurora/aurora-wallpaper-"${REV}" /out/wallpapers/usr/share/wallpapers/Aurora
|
||||
ln -sr /out/wallpapers/usr/share/backgrounds/aurora/aurora.xml /out/wallpapers/usr/share/backgrounds/default.xml
|
||||
EOF
|
||||
|
||||
cp /logos/aurora-banner.svg /out/logos/usr/share/pixmaps/ && \
|
||||
ln -sr /out/logos/usr/share/pixmaps/aurora-banner.svg /out/logos/usr/share/pixmaps/fedora-logo.svg && \
|
||||
RUN <<EOF
|
||||
set -xeuo pipefail
|
||||
|
||||
magick -background none /logos/aurora-banner.svg -quality 90 -resize $((400-10*2))x100 -gravity center -extent 400x100 /out/logos/usr/share/pixmaps/fedora-logo.png && \
|
||||
magick -background none /logos/aurora-banner.svg -quality 90 -resize $((128-3*2))x32 -gravity center -extent 128x32 /out/logos/usr/share/pixmaps/fedora-logo-small.png && \
|
||||
magick -background none /logos/aurora-banner.svg -quality 90 -resize $((200-5*2))x50 -gravity center -extent 200x100 /out/logos/usr/share/pixmaps/fedora_logo_med.png && \
|
||||
magick -background none /logos/distributor-logo.svg -quality 90 -resize 256x256! /out/logos/usr/share/pixmaps/system-logo.png && \
|
||||
magick -background none /logos/distributor-logo.svg -quality 90 -resize 128x128! /out/logos/usr/share/pixmaps/fedora-logo-sprite.png && \
|
||||
magick -background none /logos/distributor-logo.svg -quality 90 -resize 256x256! /out/logos/usr/share/pixmaps/system-logo-white.png && \
|
||||
mkdir -p /out/logos/usr/share/icons/hicolor/scalable/apps
|
||||
mkdir -p /out/logos/usr/share/icons/hicolor/scalable/places
|
||||
mkdir -p /out/logos/usr/share/pixmaps
|
||||
cp /logos/distributor-logo.svg /out/logos/usr/share/icons/hicolor/scalable
|
||||
cp \
|
||||
/logos/auroralogo-white.svg \
|
||||
/logos/distributor-logo-symbolic.svg \
|
||||
/logos/auroralogo-circle-symbolic.svg \
|
||||
/logos/auroralogo-pride.svg \
|
||||
/logos/auroralogo-pride-trans.svg \
|
||||
/out/logos/usr/share/icons/hicolor/scalable/places/
|
||||
|
||||
ln -sr /out/logos/usr/share/pixmaps/aurora-banner.svg /out/logos/usr/share/pixmaps/fedora_whitelogo.svg && \
|
||||
ln -sr /out/logos/usr/share/icons/hicolor/scalable/distributor-logo.svg /out/logos/usr/share/pixmaps/fedora-logo-sprite.svg && \
|
||||
ln -sr /out/logos/usr/share/icons/hicolor/scalable/distributor-logo.svg /out/logos/usr/share/icons/hicolor/scalable/places/distributor-logo.svg && \
|
||||
ln -sr /out/logos/usr/share/icons/hicolor/scalable/distributor-logo.svg /out/logos/usr/share/icons/hicolor/scalable/places/auroralogo-gradient.svg && \
|
||||
ln -sr /out/logos/usr/share/icons/hicolor/scalable/places/distributor-logo-symbolic.svg /out/logos/usr/share/icons/hicolor/scalable/places/auroralogo-symbolic.svg && \
|
||||
ln -sr /out/logos/usr/share/icons/hicolor/scalable/places/distributor-logo-symbolic.svg /out/logos/usr/share/icons/hicolor/scalable/places/distributor-logo-white.svg && \
|
||||
ln -sr /out/logos/usr/share/icons/hicolor/scalable/places/distributor-logo-symbolic.svg /out/logos/usr/share/icons/hicolor/scalable/places/start-here.svg && \
|
||||
ln -sr /out/logos/usr/share/icons/hicolor/scalable/places/distributor-logo-symbolic.svg /out/logos/usr/share/icons/hicolor/scalable/apps/start-here.svg
|
||||
cp /logos/aurora-banner.svg /out/logos/usr/share/pixmaps/
|
||||
ln -sr /out/logos/usr/share/pixmaps/aurora-banner.svg /out/logos/usr/share/pixmaps/fedora-logo.svg
|
||||
|
||||
RUN set -xeuo pipefail && \
|
||||
mkdir -p /out/logos/usr/share/plymouth/themes/spinner/ && \
|
||||
magick -background none /out/logos/usr/share/pixmaps/aurora-banner.svg -quality 90 -resize $((128-3*2))x32 -gravity center -extent 128x32 /out/logos/usr/share/plymouth/themes/spinner/watermark.png && \
|
||||
cp /out/logos/usr/share/plymouth/themes/spinner/watermark.png /out/logos/usr/share/plymouth/themes/spinner/kinoite-watermark.png && \
|
||||
mkdir -p /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/images/ && \
|
||||
gzip -c /out/logos/usr/share/icons/hicolor/scalable/distributor-logo.svg > /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/images/aurora_logo.svgz && \
|
||||
curl -Lo /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/images/busywidget.svgz https://invent.kde.org/plasma/plasma-workspace/-/raw/d3b5a422e586ee578efadfe462d0d0b5546aaa3b/lookandfeel/org.kde.breeze/contents/splash/images/busywidget.svgz && \
|
||||
curl -Lo /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/images/kde.svgz https://invent.kde.org/plasma/plasma-workspace/-/raw/d3b5a422e586ee578efadfe462d0d0b5546aaa3b/lookandfeel/org.kde.breeze/contents/splash/images/kde.svgz && \
|
||||
curl -Lo /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/images/plasma.svgz https://invent.kde.org/plasma/plasma-workspace/-/raw/d3b5a422e586ee578efadfe462d0d0b5546aaa3b/lookandfeel/org.kde.breeze/contents/splash/images/plasma.svgz && \
|
||||
mkdir -p /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents/splash/images && \
|
||||
cp -r /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents/
|
||||
magick -background none /logos/aurora-banner.svg -quality 90 -resize $((400-10*2))x100 -gravity center -extent 400x100 /out/logos/usr/share/pixmaps/fedora-logo.png
|
||||
magick -background none /logos/aurora-banner.svg -quality 90 -resize $((128-3*2))x32 -gravity center -extent 128x32 /out/logos/usr/share/pixmaps/fedora-logo-small.png
|
||||
magick -background none /logos/aurora-banner.svg -quality 90 -resize $((200-5*2))x50 -gravity center -extent 200x100 /out/logos/usr/share/pixmaps/fedora_logo_med.png
|
||||
magick -background none /logos/distributor-logo.svg -quality 90 -resize 256x256! /out/logos/usr/share/pixmaps/system-logo.png
|
||||
magick -background none /logos/distributor-logo.svg -quality 90 -resize 128x128! /out/logos/usr/share/pixmaps/fedora-logo-sprite.png
|
||||
magick -background none /logos/distributor-logo.svg -quality 90 -resize 256x256! /out/logos/usr/share/pixmaps/system-logo-white.png
|
||||
|
||||
ln -sr /out/logos/usr/share/pixmaps/aurora-banner.svg /out/logos/usr/share/pixmaps/fedora_whitelogo.svg
|
||||
ln -sr /out/logos/usr/share/icons/hicolor/scalable/distributor-logo.svg /out/logos/usr/share/pixmaps/fedora-logo-sprite.svg
|
||||
ln -sr /out/logos/usr/share/icons/hicolor/scalable/distributor-logo.svg /out/logos/usr/share/icons/hicolor/scalable/places/distributor-logo.svg
|
||||
ln -sr /out/logos/usr/share/icons/hicolor/scalable/distributor-logo.svg /out/logos/usr/share/icons/hicolor/scalable/places/auroralogo-gradient.svg
|
||||
ln -sr /out/logos/usr/share/icons/hicolor/scalable/places/distributor-logo-symbolic.svg /out/logos/usr/share/icons/hicolor/scalable/places/auroralogo-symbolic.svg
|
||||
ln -sr /out/logos/usr/share/icons/hicolor/scalable/places/distributor-logo-symbolic.svg /out/logos/usr/share/icons/hicolor/scalable/places/distributor-logo-white.svg
|
||||
ln -sr /out/logos/usr/share/icons/hicolor/scalable/places/distributor-logo-symbolic.svg /out/logos/usr/share/icons/hicolor/scalable/places/start-here.svg
|
||||
ln -sr /out/logos/usr/share/icons/hicolor/scalable/places/distributor-logo-symbolic.svg /out/logos/usr/share/icons/hicolor/scalable/apps/start-here.svg
|
||||
EOF
|
||||
|
||||
RUN <<EOF
|
||||
set -xeuo pipefail
|
||||
|
||||
mkdir -p /out/logos/usr/share/plymouth/themes/spinner/
|
||||
magick -background none /out/logos/usr/share/pixmaps/aurora-banner.svg -quality 90 -resize $((128-3*2))x32 -gravity center -extent 128x32 /out/logos/usr/share/plymouth/themes/spinner/watermark.png
|
||||
cp /out/logos/usr/share/plymouth/themes/spinner/watermark.png /out/logos/usr/share/plymouth/themes/spinner/kinoite-watermark.png
|
||||
mkdir -p /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/images/
|
||||
gzip -c /out/logos/usr/share/icons/hicolor/scalable/distributor-logo.svg > /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/images/aurora_logo.svgz
|
||||
curl -Lo /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/images/busywidget.svgz https://invent.kde.org/plasma/plasma-workspace/-/raw/d3b5a422e586ee578efadfe462d0d0b5546aaa3b/lookandfeel/org.kde.breeze/contents/splash/images/busywidget.svgz
|
||||
curl -Lo /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/images/kde.svgz https://invent.kde.org/plasma/plasma-workspace/-/raw/d3b5a422e586ee578efadfe462d0d0b5546aaa3b/lookandfeel/org.kde.breeze/contents/splash/images/kde.svgz
|
||||
curl -Lo /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/images/plasma.svgz https://invent.kde.org/plasma/plasma-workspace/-/raw/d3b5a422e586ee578efadfe462d0d0b5546aaa3b/lookandfeel/org.kde.breeze/contents/splash/images/plasma.svgz
|
||||
mkdir -p /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents/splash/images
|
||||
cp -r /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents/
|
||||
EOF
|
||||
COPY /system_files/shared /out/system_files/shared
|
||||
|
||||
# Copy default dark variant things to light variant so that it is shared
|
||||
# Effectively are symlinks but we can't do that here because themes can't execute files of other themes
|
||||
RUN set -xeuo pipefail && \
|
||||
cp -r /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/plasmoidsetupscripts/ /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents && \
|
||||
cp -r /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/ /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents && \
|
||||
cp -r /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/layouts /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents
|
||||
RUN <<EOF
|
||||
set -xeuo pipefail
|
||||
|
||||
RUN install -d /out/system_files/shared/usr/share/bash-completion/completions /out/system_files/shared/usr/share/zsh/site-functions /out/system_files/shared/usr/share/fish/vendor_completions.d/ && \
|
||||
just --completions bash | sed -E 's/([\(_" ])just/\1ujust/g' > /out/system_files/shared/usr/share/bash-completion/completions/ujust && \
|
||||
just --completions zsh | sed -E 's/([\(_" ])just/\1ujust/g' > /out/system_files/shared/usr/share/zsh/site-functions/_ujust && \
|
||||
just --completions fish | sed -E 's/([\(_" ])just/\1ujust/g' > /out/system_files/shared/usr/share/fish/vendor_completions.d/ujust.fish
|
||||
cp -r /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/plasmoidsetupscripts/ /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents
|
||||
cp -r /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/ /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents
|
||||
cp -r /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/layouts /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents
|
||||
EOF
|
||||
|
||||
RUN <<EOF
|
||||
set -xeuo pipefail
|
||||
|
||||
install -d /out/system_files/shared/usr/share/bash-completion/completions /out/system_files/shared/usr/share/zsh/site-functions /out/system_files/shared/usr/share/fish/vendor_completions.d/
|
||||
just --completions bash | sed -E 's/([\(_" ])just/\1ujust/g' > /out/system_files/shared/usr/share/bash-completion/completions/ujust
|
||||
just --completions zsh | sed -E 's/([\(_" ])just/\1ujust/g' > /out/system_files/shared/usr/share/zsh/site-functions/_ujust
|
||||
just --completions fish | sed -E 's/([\(_" ])just/\1ujust/g' > /out/system_files/shared/usr/share/fish/vendor_completions.d/ujust.fish
|
||||
EOF
|
||||
|
||||
RUN <<EOF
|
||||
# FIXME: Renovate
|
||||
RUN curl -fsSLo - https://codeberg.org/fabiscafe/game-devices-udev/archive/1.0.tar.gz | tar xzvf - -C tmp/ && \
|
||||
for f in tmp/game-devices-udev/src/*.rules; do \
|
||||
install -Dpm0644 "$f" "out/system_files/shared/usr/lib/udev/rules.d/71-${f##*/}"; \
|
||||
done && \
|
||||
curl -fsSLo /out/system_files/shared/usr/lib/udev/rules.d/70-u2f.rules https://raw.githubusercontent.com/Yubico/libfido2/refs/heads/main/udev/70-u2f.rules
|
||||
curl -fsSLo - https://codeberg.org/fabiscafe/game-devices-udev/archive/1.0.tar.gz | tar xzvf - -C tmp/
|
||||
for f in tmp/game-devices-udev/src/*.rules; do
|
||||
install -Dpm0644 "$f" "out/system_files/shared/usr/lib/udev/rules.d/71-${f##*/}";
|
||||
done
|
||||
curl -fsSLo /out/system_files/shared/usr/lib/udev/rules.d/70-u2f.rules https://raw.githubusercontent.com/Yubico/libfido2/refs/heads/main/udev/70-u2f.rules
|
||||
EOF
|
||||
|
||||
FROM scratch AS ctx
|
||||
COPY aurorafin-shared/system_files/shared /system_files/shared
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ This repo builds on top of:
|
|||
- `system_files/dx/` - Aurora-DX specific configuration
|
||||
- `wallpapers/` - Aurora wallpapers from [artwork repo](https://github.com/ublue-os/artwork)
|
||||
- `system_files/shared/usr/share/ublue-os/homebrew/` - Flatpak definitions used for including flatpaks for the ISOs and `ujust install-system-flatpaks` - [Yes, homebrew supports the installation of Flatpaks](https://github.com/Homebrew/brew/pull/21097)
|
||||
- `logos/` - Aurora Logos used in SDDM/Plasma Kickoff etc.
|
||||
- `logos/` - Aurora Logos used in PLM/Plasma Kickoff etc.
|
||||
|
||||
Related work is on the [Fedora KDE-SIG](https://forge.fedoraproject.org/kde)
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit afaa14cd378d3b416221fa58242a18da9375f40f
|
||||
Subproject commit 81fae1734f0d909e6d8b3d6d3695cbaf1f7ed1f2
|
||||
2
branding
2
branding
|
|
@ -1 +1 @@
|
|||
Subproject commit a2609104f6b20da64a29b002b7bf0428b466e251
|
||||
Subproject commit 0063d5ca18e2b7dfddd8af05af86e63604dbb737
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
[Unit]
|
||||
Description=Add wheel members to docker,and incus-admin groups
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=/usr/libexec/aurora-dx-groups
|
||||
Restart=on-failure
|
||||
RestartSec=30
|
||||
StartLimitInterval=0
|
||||
|
||||
[Install]
|
||||
WantedBy=default.target
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
# SCRIPT VERSION
|
||||
GROUP_SETUP_VER=2
|
||||
GROUP_SETUP_VER_FILE="/etc/ublue/dx-groups"
|
||||
GROUP_SETUP_VER_RAN=$(cat "$GROUP_SETUP_VER_FILE")
|
||||
|
||||
# make the directory if it doesn't exist
|
||||
mkdir -p /etc/ublue
|
||||
|
||||
# Run script if updated
|
||||
if [[ -f $GROUP_SETUP_VER_FILE && "$GROUP_SETUP_VER" = "$GROUP_SETUP_VER_RAN" ]]; then
|
||||
echo "Group setup has already run. Exiting..."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Function to append a group entry to /etc/group
|
||||
append_group() {
|
||||
local group_name="$1"
|
||||
if ! grep -q "^$group_name:" /etc/group; then
|
||||
echo "Appending $group_name to /etc/group"
|
||||
grep "^$group_name:" /usr/lib/group | tee -a /etc/group >/dev/null
|
||||
fi
|
||||
}
|
||||
|
||||
# Setup Groups
|
||||
append_group docker
|
||||
append_group incus-admin
|
||||
append_group libvirt
|
||||
|
||||
wheelarray=($(getent group wheel | cut -d ":" -f 4 | tr ',' '\n'))
|
||||
for user in $wheelarray; do
|
||||
usermod -aG docker $user
|
||||
usermod -aG incus-admin $user
|
||||
usermod -aG libvirt $user
|
||||
done
|
||||
|
||||
# Prevent future executions
|
||||
echo "Writing state file"
|
||||
echo "$GROUP_SETUP_VER" >"$GROUP_SETUP_VER_FILE"
|
||||
|
|
@ -1,79 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
# All the pieces needed to enable incus on Developer Experience Hosts
|
||||
# This script is meant to be run on a aurora-dx host
|
||||
if [ "$EUID" -eq 0 ]
|
||||
then
|
||||
echo "This script should not be run as root"
|
||||
exit
|
||||
fi
|
||||
|
||||
source /usr/lib/ujust/ujust.sh
|
||||
# add user to incus-admin group
|
||||
pkexec usermod -aG incus-admin $USER
|
||||
|
||||
# check for, then add necessary entries to /etc/subuid and /etc/subgid
|
||||
echo -e "\nChecking for necessary entries in /etc/subuid and /etc/subgid"
|
||||
if grep -q "root:1000000:1000000000" /etc/subuid
|
||||
then
|
||||
echo -e "\n * subuid root range"
|
||||
else
|
||||
echo "root:1000000:1000000000" | pkexec tee -a /etc/subuid
|
||||
fi
|
||||
|
||||
if grep -q "root:1000000:1000000000" /etc/subgid
|
||||
then
|
||||
echo -e "\n * subgid root range"
|
||||
else
|
||||
echo "root:1000000:1000000000" | pkexec tee -a /etc/subgid
|
||||
fi
|
||||
|
||||
if grep -q "root:$UID:1" /etc/subgid
|
||||
then
|
||||
echo -e "\n * subgid root->user"
|
||||
else
|
||||
echo "root:$UID:1" | pkexec tee -a /etc/subgid
|
||||
fi
|
||||
|
||||
if grep -q "root:$UID:1" /etc/subuid
|
||||
then
|
||||
echo ""
|
||||
echo " * subuid root->user"
|
||||
else
|
||||
echo "root:$UID:1" | sudo tee -a /etc/subuid
|
||||
fi
|
||||
|
||||
echo -e "\nEnabling incus services"
|
||||
pkexec /usr/bin/bash <<EOF
|
||||
systemctl enable --now incus-workaround.service
|
||||
systemctl enable --now lxcfs
|
||||
systemctl enable --now incus.socket
|
||||
systemctl start incus.service
|
||||
systemctl enable incus-startup
|
||||
EOF
|
||||
|
||||
echo -e "\nInitializing Incus"
|
||||
echo "Choose your Incus installation type:"
|
||||
OPTION=$(gum choose "Minimal" "Custom" "Cancel")
|
||||
if [[ "${OPTION,,}" =~ ^minimal ]]; then
|
||||
pkexec incus admin init --minimal
|
||||
echo -e "\nAdding the incus bridge to the trusted firewall zone"
|
||||
pkexec firewall-cmd --zone=trusted --change-interface=incusbr0 --permanent
|
||||
pkexec firewall-cmd --reload
|
||||
fi
|
||||
if [[ "${OPTION,,}" =~ ^custom ]]; then
|
||||
pkexec incus admin init
|
||||
echo ""
|
||||
cat <<EOF
|
||||
Add the incus bridge to the trusted firewall zone with
|
||||
```bash
|
||||
sudo firewall-cmd --zone=trusted --change-interface=your-bridge --permanent
|
||||
sudo firewall-cmd --reload
|
||||
```
|
||||
EOF
|
||||
fi
|
||||
if [[ "${OPTION,,}" =~ ^cancel ]]; then
|
||||
echo "You have chosen to cancel the Incus installation process"
|
||||
exit 0
|
||||
fi
|
||||
echo -e "\nIncus has been $installed. You can now run 'incus' to manage your containers."
|
||||
|
|
@ -157,7 +157,7 @@ rows:
|
|||
banner-height: 550
|
||||
appids:
|
||||
- io.github.vani_tty1.memerist
|
||||
- com.pixelomer.ShijimaQt
|
||||
- org.kde.drawy
|
||||
- org.kde.kstars
|
||||
- re.sonny.Eloquent
|
||||
- io.github.halfmexican.Mingle
|
||||
|
|
|
|||
|
|
@ -24,8 +24,8 @@ IMAGE_NAME="$(gum choose --header="Select your image:" "${IMAGES[@]}" cancel)"
|
|||
|
||||
base_image="${IMAGE_REGISTRY}/${IMAGE_NAME}"
|
||||
declare -a CHANNELS
|
||||
CHANNELS=(stable latest)
|
||||
echo "The default selection is stable (weekly builds) and latest is for enthusiasts and testers."
|
||||
CHANNELS=(stable latest testing)
|
||||
echo -e "\nstable: The default selection (weekly builds) with gated CoreOS kernel\nlatest: For enthusiast, stock Fedora kernel and latest updates\ntesting: Get a sneak peak into future Aurora builds and Fedora versions\n\nSee our docs: https://docs.getaurora.dev/guides/release-streams\n"
|
||||
|
||||
channel_choice="$(gum choose "${CHANNELS[@]}" cancel)"
|
||||
[[ "$channel_choice" == "cancel" || "$channel_choice" == "" ]] && exit 0
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
[Theme]
|
||||
Current=01-breeze-aurora
|
||||
# The name comes from /usr/share/icons/breeze_cursors
|
||||
CursorTheme=breeze_cursors
|
||||
CursorSize=24
|
||||
|
|
@ -1,6 +1,8 @@
|
|||
# Make sure to sync with: https://forge.fedoraproject.org/kde/kde-settings/src/branch/rawhide/usr/share/kde-settings/kde-profile/default/xdg/kwinrc
|
||||
[Wayland]
|
||||
InputMethod[$e]=/usr/share/applications/com.github.maliit.keyboard.desktop
|
||||
InputMethod[$e]=/usr/share/applications/org.kde.plasma.keyboard.desktop
|
||||
VirtualKeyboardEnabled=true
|
||||
EnablePrimarySelection=false
|
||||
|
||||
[Plugins]
|
||||
blurEnabled=true
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ flatpak "org.deskflow.deskflow"
|
|||
flatpak "org.fedoraproject.MediaWriter"
|
||||
flatpak "org.fkoehler.KTailctl"
|
||||
flatpak "org.gnome.DejaDup"
|
||||
flatpak "org.gnome.Firmware"
|
||||
flatpak "org.gtk.Gtk3theme.Breeze"
|
||||
flatpak "org.kde.gwenview"
|
||||
flatpak "org.kde.haruna"
|
||||
|
|
@ -16,6 +17,7 @@ flatpak "org.kde.kclock"
|
|||
flatpak "org.kde.kontact"
|
||||
flatpak "org.kde.kweather"
|
||||
flatpak "org.kde.okular"
|
||||
flatpak "org.kde.qrca"
|
||||
flatpak "org.kde.skanpage"
|
||||
flatpak "org.mozilla.thunderbird"
|
||||
flatpak "org.mozilla.firefox"
|
||||
|
|
|
|||
|
|
@ -87,23 +87,46 @@ toggle-devmode:
|
|||
# Configure docker,incus-admin,libvirt, container manager, serial permissions
|
||||
[group('System')]
|
||||
dx-group:
|
||||
#!/usr/bin/pkexec bash
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
if [ "$EUID" -eq 0 ]; then
|
||||
echo "This script should not be run as root."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
append_group() {
|
||||
local group_name="$1"
|
||||
if ! grep -q "^$group_name:" /etc/group; then
|
||||
echo "Appending $group_name to /etc/group"
|
||||
grep "^$group_name:" /usr/lib/group | sudo tee -a /etc/group > /dev/null
|
||||
grep "^$group_name:" /usr/lib/group | pkexec tee -a /etc/group > /dev/null
|
||||
fi
|
||||
}
|
||||
|
||||
GROUPS_ADD=("docker" "incus-admin" "libvirt" "dialout")
|
||||
|
||||
for GROUP_ADD in "${GROUPS_ADD[@]}" ; do
|
||||
append_group $GROUP_ADD
|
||||
usermod -aG $GROUP_ADD $USER
|
||||
done
|
||||
echo "Note that this has security implications and may allow writing to critical system files without authentication."
|
||||
echo "See: https://docs.docker.com/engine/install/linux-postinstall/#manage-docker-as-a-non-root-user"
|
||||
|
||||
echo "Reboot system and log back in to use docker, libvirt, incus, and serial connections."
|
||||
SELECTED_GROUPS=$(gum choose --no-limit --header="Select groups (with spacebar key) to add your \"${USER}\" user account to:" "${GROUPS_ADD[@]}")
|
||||
|
||||
if [[ -n "$SELECTED_GROUPS" ]]; then
|
||||
mapfile -t TARGET_GROUPS <<< "$SELECTED_GROUPS"
|
||||
|
||||
for GROUP in "${TARGET_GROUPS[@]}"; do
|
||||
append_group "$GROUP"
|
||||
done
|
||||
|
||||
ALL_SELECTED_GROUPS=$(IFS=,; echo "${TARGET_GROUPS[*]}")
|
||||
|
||||
echo "Adding \"${USER}\" to selected groups: ${ALL_SELECTED_GROUPS}"
|
||||
|
||||
pkexec usermod -aG "$ALL_SELECTED_GROUPS" "$USER"
|
||||
|
||||
echo "Reboot system and log back in for changes to take effect."
|
||||
else
|
||||
echo "No groups selected."
|
||||
fi
|
||||
|
||||
# Install system flatpaks for rebasers
|
||||
[group('System')]
|
||||
|
|
|
|||
Loading…
Reference in a new issue