repoint production to radiantwave-legacy, dev to radiantwave (ref=main)
- Replace radiantwave-dev input with radiantwave-legacy - Production configs (kiosk, commercial, android, rpi) now use radiantwave-legacy - Dev configs (kiosk-dev, commercial-dev, rpi-dev) now use radiantwave (ref=main) - Fix KioskConfig -> kioskconfig case mismatch in all upgradeFlakeRef URLs
This commit is contained in:
@@ -5,8 +5,7 @@
|
|||||||
disko.inputs.nixpkgs.follows = "nixpkgs";
|
disko.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
|
nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
|
||||||
radiantwave.url = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/radiantwave.git?ref=main";
|
radiantwave.url = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/radiantwave.git?ref=main";
|
||||||
radiantwave-dev.url = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/radiantwave.git?ref=dev";
|
radiantwave-legacy.url = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/radiantwave-legacy.git?ref=main";
|
||||||
# radiantwave-dev.url = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/radiantwave-cpp.git?ref=dev";
|
|
||||||
nixos-raspberrypi.url = "github:nvmd/nixos-raspberrypi/main";
|
nixos-raspberrypi.url = "github:nvmd/nixos-raspberrypi/main";
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -17,7 +16,7 @@
|
|||||||
disko,
|
disko,
|
||||||
nixos-facter-modules,
|
nixos-facter-modules,
|
||||||
radiantwave,
|
radiantwave,
|
||||||
radiantwave-dev,
|
radiantwave-legacy,
|
||||||
nixos-raspberrypi,
|
nixos-raspberrypi,
|
||||||
...
|
...
|
||||||
}@inputs:
|
}@inputs:
|
||||||
@@ -118,52 +117,52 @@
|
|||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
radiantwavekiosk = mkKioskSystem {
|
radiantwavekiosk = mkKioskSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
radiantwave = radiantwave;
|
radiantwave = radiantwave-legacy;
|
||||||
diskModule = ./disk-config.nix;
|
diskModule = ./disk-config.nix;
|
||||||
upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/KioskConfig.git#radiantwavekiosk";
|
upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/kioskconfig.git#radiantwavekiosk";
|
||||||
extraModules = [];
|
extraModules = [];
|
||||||
};
|
};
|
||||||
# Kiosk-dev
|
# Kiosk-dev
|
||||||
radiantwavekiosk-dev = mkKioskSystem {
|
radiantwavekiosk-dev = mkKioskSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
radiantwave = radiantwave-dev;
|
radiantwave = radiantwave;
|
||||||
diskModule = ./disk-config.nix;
|
diskModule = ./disk-config.nix;
|
||||||
upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/KioskConfig.git?ref=dev#radiantwavekiosk-dev";
|
upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/kioskconfig.git?ref=dev#radiantwavekiosk-dev";
|
||||||
extraModules = [];
|
extraModules = [];
|
||||||
};
|
};
|
||||||
# Commercial
|
# Commercial
|
||||||
radiantwavekiosk-commercial = mkKioskSystem {
|
radiantwavekiosk-commercial = mkKioskSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
radiantwave = radiantwave;
|
radiantwave = radiantwave-legacy;
|
||||||
diskModule = ./commercial-disk-config.nix;
|
diskModule = ./commercial-disk-config.nix;
|
||||||
upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/KioskConfig.git#radiantwavekiosk-commercial";
|
upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/kioskconfig.git#radiantwavekiosk-commercial";
|
||||||
extraModules = [];
|
extraModules = [];
|
||||||
};
|
};
|
||||||
# Commercial-dev
|
# Commercial-dev
|
||||||
radiantwavekiosk-commercial-dev = mkKioskSystem {
|
radiantwavekiosk-commercial-dev = mkKioskSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
radiantwave = radiantwave-dev;
|
radiantwave = radiantwave;
|
||||||
diskModule = ./commercial-disk-config.nix;
|
diskModule = ./commercial-disk-config.nix;
|
||||||
upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/KioskConfig.git?ref=dev#radiantwavekiosk-commercial";
|
upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/kioskconfig.git?ref=dev#radiantwavekiosk-commercial";
|
||||||
extraModules = [];
|
extraModules = [];
|
||||||
};
|
};
|
||||||
# Kiosk - rotated screen for android displays
|
# Kiosk - rotated screen for android displays
|
||||||
radiantwavekiosk-android = mkKioskSystem {
|
radiantwavekiosk-android = mkKioskSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
radiantwave = radiantwave;
|
radiantwave = radiantwave-legacy;
|
||||||
diskModule = ./disk-config.nix;
|
diskModule = ./disk-config.nix;
|
||||||
upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/KioskConfig.git#radiantwavekiosk-android";
|
upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/kioskconfig.git#radiantwavekiosk-android";
|
||||||
extraModules = [./rotated_display.nix ];
|
extraModules = [./rotated_display.nix ];
|
||||||
};
|
};
|
||||||
# Raspberry pi 5
|
# Raspberry pi 5
|
||||||
radiantwavekiosk-rpi = mkRpiKioskSystem {
|
radiantwavekiosk-rpi = mkRpiKioskSystem {
|
||||||
radiantwave = radiantwave;
|
radiantwave = radiantwave-legacy;
|
||||||
upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/KioskConfig.git#radiantwavekiosk-rpi";
|
upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/kioskconfig.git#radiantwavekiosk-rpi";
|
||||||
};
|
};
|
||||||
# Raspberry pi 5 dev
|
# Raspberry pi 5 dev
|
||||||
radiantwavekiosk-rpi-dev = mkRpiKioskSystem {
|
radiantwavekiosk-rpi-dev = mkRpiKioskSystem {
|
||||||
radiantwave = radiantwave-dev;
|
radiantwave = radiantwave;
|
||||||
upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/KioskConfig.git?ref=dev#radiantwavekiosk-rpi-dev";
|
upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/kioskconfig.git?ref=dev#radiantwavekiosk-rpi-dev";
|
||||||
};
|
};
|
||||||
# === USB Images ===
|
# === USB Images ===
|
||||||
# Kiosk ISO
|
# Kiosk ISO
|
||||||
|
|||||||
Reference in New Issue
Block a user