diff --git a/flake.lock b/flake.lock index 365eb7b..86cdfe0 100644 --- a/flake.lock +++ b/flake.lock @@ -87,24 +87,6 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "nixos-facter-modules": { "locked": { "lastModified": 1773858690, @@ -232,22 +214,6 @@ "type": "github" } }, - "nixpkgs_5": { - "locked": { - "lastModified": 1776877367, - "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "radiantwave": { "inputs": { "flake-utils": "flake-utils", @@ -288,26 +254,6 @@ "url": "ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/radiantwave.git" } }, - "radiantwave-legacy": { - "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1786170011, - "narHash": "sha256-Vx/3kwIQFRYDZQtVdcdGgJPnNa2Y44HRYZyJAeug6OI=", - "ref": "main", - "rev": "312f5e2a90e03f32ce61d6db54f46b9adac60933", - "revCount": 250, - "type": "git", - "url": "ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/radiantwave-legacy.git" - }, - "original": { - "ref": "main", - "type": "git", - "url": "ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/radiantwave-legacy.git" - } - }, "root": { "inputs": { "disko": "disko", @@ -315,8 +261,7 @@ "nixos-raspberrypi": "nixos-raspberrypi", "nixpkgs": "nixpkgs_2", "radiantwave": "radiantwave", - "radiantwave-dev": "radiantwave-dev", - "radiantwave-legacy": "radiantwave-legacy" + "radiantwave-dev": "radiantwave-dev" } }, "systems": { @@ -348,21 +293,6 @@ "repo": "default", "type": "github" } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 5b2cdb7..260298e 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; 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"; + # radiantwave-old.url = "git+ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/radiantwave.git?ref=main"; nixos-raspberrypi.url = "github:nvmd/nixos-raspberrypi/main"; }; @@ -18,7 +18,6 @@ nixos-facter-modules, radiantwave, radiantwave-dev, - radiantwave-legacy, nixos-raspberrypi, ... }@inputs: @@ -119,7 +118,7 @@ nixosConfigurations = { radiantwavekiosk = mkKioskSystem { system = "x86_64-linux"; - radiantwave = radiantwave-legacy; + radiantwave = radiantwave; diskModule = ./disk-config.nix; upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/KioskConfig.git#radiantwavekiosk"; extraModules = []; @@ -135,7 +134,7 @@ # Commercial radiantwavekiosk-commercial = mkKioskSystem { system = "x86_64-linux"; - radiantwave = radiantwave-legacy; + radiantwave = radiantwave; diskModule = ./commercial-disk-config.nix; upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/KioskConfig.git#radiantwavekiosk-commercial"; extraModules = []; @@ -151,7 +150,7 @@ # Kiosk - rotated screen for android displays radiantwavekiosk-android = mkKioskSystem { system = "x86_64-linux"; - radiantwave = radiantwave-legacy; + radiantwave = radiantwave; diskModule = ./disk-config.nix; upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/KioskConfig.git#radiantwavekiosk-android"; extraModules = [./rotated_display.nix ]; @@ -166,7 +165,7 @@ }; # Raspberry pi 5 radiantwavekiosk-rpi = mkRpiKioskSystem { - radiantwave = radiantwave-legacy; + radiantwave = radiantwave; upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/KioskConfig.git#radiantwavekiosk-rpi"; }; # Raspberry pi 5 dev