From 8e8da490e471e84731a1195aa35a7a932b8755de Mon Sep 17 00:00:00 2001 From: NeilClack Date: Mon, 17 Aug 2026 22:44:14 -0500 Subject: [PATCH] Update radiantwave reference and add dev variants to all images --- flake.nix | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 4d4d9e3..5d0782d 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,6 @@ disko.url = "github:nix-community/disko"; disko.inputs.nixpkgs.follows = "nixpkgs"; nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; - # radiantwave.url = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/radiantwave.git?ref=main"; # This is the NEW RadiantWave radiantwave.url = "git+ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/radiantwave.git?ref=main"; radiantwave-dev.url = "git+ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/radiantwave.git?ref=dev"; radiantwave-legacy.url = "git+ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/radiantwave-legacy.git?ref=main"; @@ -128,7 +127,7 @@ # Kiosk-dev radiantwavekiosk-dev = mkKioskSystem { system = "x86_64-linux"; - radiantwave = radiantwave-dev; + radiantwave = radiantwave; diskModule = ./disk-config.nix; upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/KioskConfig.git?ref=dev#radiantwavekiosk-dev"; extraModules = []; @@ -144,7 +143,7 @@ # Commercial-dev radiantwavekiosk-commercial-dev = mkKioskSystem { system = "x86_64-linux"; - radiantwave = radiantwave-dev; + radiantwave = radiantwave; diskModule = ./commercial-disk-config.nix; upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/KioskConfig.git?ref=dev#radiantwavekiosk-commercial-dev"; extraModules = []; @@ -157,6 +156,14 @@ upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/KioskConfig.git#radiantwavekiosk-android"; extraModules = [./rotated_display.nix ]; }; + # Kiosk-dev - rotated screen for android displays + radiantwavekiosk-android-dev = mkKioskSystem { + system = "x86_64-linux"; + radiantwave = radiantwave; + diskModule = ./disk-config.nix; + upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/KioskConfig.git#radiantwavekiosk-android"; + extraModules = [./rotated_display.nix ]; + }; # Raspberry pi 5 radiantwavekiosk-rpi = mkRpiKioskSystem { radiantwave = radiantwave-legacy; @@ -164,7 +171,7 @@ }; # Raspberry pi 5 dev radiantwavekiosk-rpi-dev = mkRpiKioskSystem { - radiantwave = radiantwave-dev; + radiantwave = radiantwave; upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/KioskConfig.git?ref=dev#radiantwavekiosk-rpi-dev"; }; # === USB Images === @@ -260,6 +267,53 @@ }) ]; }; + # Kiosk iso development branch + dev-iso = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { + inherit inputs; + inherit self; + }; + modules = [ + "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" + disko.nixosModules.disko + ./dev-iso.nix + ./disk-config.nix + ({ pkgs, ... }: { + environment.systemPackages = [ + disko.packages.${system}.default + ]; + isoImage.storeContents = [ + self.packages.x86_64-linux.radiantwavekiosk-commercial-dev + ]; + environment.etc."disko-config.nix".source = ./commercial-disk-config.nix; + }) + ]; + }; + # Kiosk iso development branch + dev-iso = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { + inherit inputs; + inherit self; + }; + modules = [ + "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" + disko.nixosModules.disko + ./dev-iso.nix + ./disk-config.nix + ({ pkgs, ... }: { + environment.systemPackages = [ + disko.packages.${system}.default + ]; + isoImage.storeContents = [ + self.packages.x86_64-linux.radiantwavekiosk-android-dev + ]; + environment.etc."disko-config.nix".source = ./disk-config.nix; + }) + ]; + }; + }; }; }