Compare commits
2
Commits
c18e158b69
...
85788ce32d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
85788ce32d | ||
|
|
e6138d398d |
@@ -10,7 +10,7 @@ env:
|
|||||||
extra-trusted-public-keys = radiantwave-dev:B8FhLu3MQ9JfeEIHIKNrKxnP+3akzzkqMbTZR4hRfj0=
|
extra-trusted-public-keys = radiantwave-dev:B8FhLu3MQ9JfeEIHIKNrKxnP+3akzzkqMbTZR4hRfj0=
|
||||||
jobs:
|
jobs:
|
||||||
build-dev-kiosk:
|
build-dev-kiosk:
|
||||||
runs-on: build-server
|
runs-on: orion-lxc
|
||||||
steps:
|
steps:
|
||||||
- name: Clone Repository
|
- name: Clone Repository
|
||||||
run: git clone --depth 1 --no-single-branch ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/KioskConfig.git .
|
run: git clone --depth 1 --no-single-branch ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/KioskConfig.git .
|
||||||
@@ -37,7 +37,7 @@ jobs:
|
|||||||
run: rm -f "/home/user/radiantwave/${FILENAME}"
|
run: rm -f "/home/user/radiantwave/${FILENAME}"
|
||||||
|
|
||||||
build-dev-android:
|
build-dev-android:
|
||||||
runs-on: build-server
|
runs-on: orion-lxc
|
||||||
steps:
|
steps:
|
||||||
- name: Clone Repository
|
- name: Clone Repository
|
||||||
run: git clone --depth 1 --no-single-branch ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/KioskConfig.git .
|
run: git clone --depth 1 --no-single-branch ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/KioskConfig.git .
|
||||||
@@ -64,7 +64,7 @@ jobs:
|
|||||||
run: rm -f "/home/user/radiantwave/${FILENAME}"
|
run: rm -f "/home/user/radiantwave/${FILENAME}"
|
||||||
|
|
||||||
build-dev-commercial:
|
build-dev-commercial:
|
||||||
runs-on: build-server
|
runs-on: orion-lxc
|
||||||
steps:
|
steps:
|
||||||
- name: Clone Repository
|
- name: Clone Repository
|
||||||
run: git clone --depth 1 --no-single-branch ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/KioskConfig.git .
|
run: git clone --depth 1 --no-single-branch ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/KioskConfig.git .
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ env:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-android:
|
build-android:
|
||||||
runs-on: build-server
|
runs-on: orion-lxc
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ env:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-commercial:
|
build-commercial:
|
||||||
runs-on: build-server
|
runs-on: orion-lxc
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ env:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-kiosk:
|
build-kiosk:
|
||||||
runs-on: build-server
|
runs-on: orion-lxc
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ env:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-rpi:
|
build-rpi:
|
||||||
runs-on: build-server
|
runs-on: orion-lxc
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
|
|||||||
+6
-3
@@ -6,16 +6,19 @@ TIMESTAMP=$(date +"%Y-%m-%d_%H-%M-%S")
|
|||||||
FILENAME="radiantwave-raspberrypi-${TIMESTAMP}.img.zst"
|
FILENAME="radiantwave-raspberrypi-${TIMESTAMP}.img.zst"
|
||||||
REPO="$(pwd)"
|
REPO="$(pwd)"
|
||||||
NIX_STORE="kiosk-nix-store"
|
NIX_STORE="kiosk-nix-store"
|
||||||
|
NIX_STATE="kiosk-nix-state"
|
||||||
|
|
||||||
echo "==> Building ${CONFIG}..."
|
echo "==> Building ${CONFIG}..."
|
||||||
echo "==> Output: ${REPO}/${FILENAME}"
|
echo "==> Output: ${REPO}/${FILENAME}"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
podman volume create "${NIX_STORE}" 2>/dev/null || true
|
podman volume create "${NIX_STORE}" 2>/dev/null || true
|
||||||
|
podman volume create "${NIX_STATE}" 2>/dev/null || true
|
||||||
|
|
||||||
podman run --rm \
|
podman run --rm \
|
||||||
-v "${REPO}:/repo" \
|
-v "${REPO}:/repo" \
|
||||||
-v "${NIX_STORE}:/nix/store" \
|
-v "${NIX_STORE}:/nix/store" \
|
||||||
|
-v "${NIX_STATE}:/nix/var/nix" \
|
||||||
-w /repo \
|
-w /repo \
|
||||||
nixos/nix:latest \
|
nixos/nix:latest \
|
||||||
sh -c '
|
sh -c '
|
||||||
@@ -23,8 +26,8 @@ podman run --rm \
|
|||||||
mkdir -p /etc/nix
|
mkdir -p /etc/nix
|
||||||
echo "experimental-features = nix-command flakes" > /etc/nix/nix.conf
|
echo "experimental-features = nix-command flakes" > /etc/nix/nix.conf
|
||||||
echo "accept-flake-config = true" >> /etc/nix/nix.conf
|
echo "accept-flake-config = true" >> /etc/nix/nix.conf
|
||||||
echo "extra-substituters = https://cache.nixos.org https://nixos-raspberrypi.cachix.org" >> /etc/nix/nix.conf
|
echo "extra-substituters = https://cache.nixos.org https://nixos-raspberrypi.cachix.org https://attic.radiantwavetech.com/radiantwave https://attic.radiantwavetech.com/radiantwave-dev" >> /etc/nix/nix.conf
|
||||||
echo "extra-trusted-public-keys = nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI=" >> /etc/nix/nix.conf
|
echo "extra-trusted-public-keys = nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI= radiantwave:QADrjpBWJssTZ3KmiZtcWEf4uAm66oOlHmtQI3jkrgA= radiantwave-dev:B8FhLu3MQ9JfeEIHIKNrKxnP+3akzzkqMbTZR4hRfj0=" >> /etc/nix/nix.conf
|
||||||
echo "max-jobs = 4" >> /etc/nix/nix.conf
|
echo "max-jobs = 4" >> /etc/nix/nix.conf
|
||||||
|
|
||||||
echo "==> Building sdImage (first run slow, cached after)..."
|
echo "==> Building sdImage (first run slow, cached after)..."
|
||||||
@@ -34,7 +37,7 @@ podman run --rm \
|
|||||||
--print-build-logs
|
--print-build-logs
|
||||||
|
|
||||||
echo "==> Build complete, copying..."
|
echo "==> Build complete, copying..."
|
||||||
cp result/sd-image/*.img* /repo/'${FILENAME}'
|
cp result/sd-image/*.img.zst /repo/'${FILENAME}'
|
||||||
echo "==> Done: ${FILENAME}"
|
echo "==> Done: ${FILENAME}"
|
||||||
ls -lh /repo/'${FILENAME}'
|
ls -lh /repo/'${FILENAME}'
|
||||||
'
|
'
|
||||||
|
|||||||
+1
-1
@@ -35,7 +35,7 @@ in
|
|||||||
# --- RadiantWave splash: Plymouth from boot until the app's first frame ---
|
# --- RadiantWave splash: Plymouth from boot until the app's first frame ---
|
||||||
boot.plymouth.enable = true;
|
boot.plymouth.enable = true;
|
||||||
boot.plymouth.theme = "radiantwave";
|
boot.plymouth.theme = "radiantwave";
|
||||||
boot.plymouth.themePackages = [ radiantwavePlymouth ];
|
boot.plymouth.themePackages = [ (radiantwavePlymouth pkgs) ];
|
||||||
|
|
||||||
# Silence the kernel/initrd output behind the splash. The module adds
|
# Silence the kernel/initrd output behind the splash. The module adds
|
||||||
# "splash" itself; we keep "quiet" plus show_status=false and loglevel 0.
|
# "splash" itself; we keep "quiet" plus show_status=false and loglevel 0.
|
||||||
|
|||||||
@@ -28,30 +28,31 @@
|
|||||||
# at build time (librsvg), so the theme is hermetic and resolution-
|
# at build time (librsvg), so the theme is hermetic and resolution-
|
||||||
# independent. The .plymouth file's /usr paths are rewritten to $out
|
# independent. The .plymouth file's /usr paths are rewritten to $out
|
||||||
# (the NixOS module's initrd fixup rewrites store paths again).
|
# (the NixOS module's initrd fixup rewrites store paths again).
|
||||||
radiantwavePlymouth = pkgs.stdenv.mkDerivation {
|
mkRadiantwavePlymouth = targetPkgs:
|
||||||
pname = "radiantwave-plymouth";
|
targetPkgs.stdenv.mkDerivation {
|
||||||
version = "1.0.0";
|
pname = "radiantwave-plymouth";
|
||||||
|
version = "1.0.0";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgs.librsvg ];
|
nativeBuildInputs = [ targetPkgs.librsvg ];
|
||||||
|
|
||||||
src = ./assets/RWT-Circular-Color-ForOnDark.svg;
|
src = ./assets/RWT-Circular-Color-ForOnDark.svg;
|
||||||
dontUnpack = true;
|
dontUnpack = true;
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
mkdir -p $out/share/plymouth/themes/radiantwave
|
mkdir -p $out/share/plymouth/themes/radiantwave
|
||||||
rsvg-convert \
|
rsvg-convert \
|
||||||
--keep-aspect-ratio \
|
--keep-aspect-ratio \
|
||||||
--background-color=#111318 \
|
--background-color=#111318 \
|
||||||
--width=1280 \
|
--width=1280 \
|
||||||
--height=720 \
|
--height=720 \
|
||||||
--output=$out/share/plymouth/themes/radiantwave/splash.png \
|
--output=$out/share/plymouth/themes/radiantwave/splash.png \
|
||||||
$src
|
$src
|
||||||
sed 's,/usr/,'"$out"'/,g' ${./plymouth-theme/radiantwave.plymouth} \
|
sed 's,/usr/,'"$out"'/,g' ${./plymouth-theme/radiantwave.plymouth} \
|
||||||
> $out/share/plymouth/themes/radiantwave/radiantwave.plymouth
|
> $out/share/plymouth/themes/radiantwave/radiantwave.plymouth
|
||||||
cp ${./plymouth-theme/radiantwave.script} \
|
cp ${./plymouth-theme/radiantwave.script} \
|
||||||
$out/share/plymouth/themes/radiantwave/radiantwave.script
|
$out/share/plymouth/themes/radiantwave/radiantwave.script
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
revision = self.rev or self.dirtyRev or null;
|
revision = self.rev or self.dirtyRev or null;
|
||||||
|
|
||||||
@@ -101,7 +102,7 @@
|
|||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit radiantwave;
|
inherit radiantwave;
|
||||||
inherit upgradeFlakeRef;
|
inherit upgradeFlakeRef;
|
||||||
inherit radiantwavePlymouth;
|
radiantwavePlymouth = mkRadiantwavePlymouth;
|
||||||
};
|
};
|
||||||
|
|
||||||
modules = [
|
modules = [
|
||||||
@@ -136,7 +137,7 @@
|
|||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit radiantwave upgradeFlakeRef;
|
inherit radiantwave upgradeFlakeRef;
|
||||||
inherit nixos-raspberrypi;
|
inherit nixos-raspberrypi;
|
||||||
inherit radiantwavePlymouth;
|
radiantwavePlymouth = mkRadiantwavePlymouth;
|
||||||
};
|
};
|
||||||
|
|
||||||
modules = [
|
modules = [
|
||||||
|
|||||||
Reference in New Issue
Block a user