From cf0c9f66c4b5d9e6342c1eac302d0e6bbe9b1587 Mon Sep 17 00:00:00 2001 From: Natasha Moongrave Date: Sat, 4 Apr 2026 23:08:40 +0200 Subject: Refactor rice system imports to flake level - Rice system configs now imported in flake mkSystem helper - Removed rice system.nix imports from host configurations - mkSystem now takes hostname and rice name as parameters - Fixes module ordering issue where rice options weren't defined yet --- flake.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index 96b354b..1ffceff 100644 --- a/flake.nix +++ b/flake.nix @@ -76,8 +76,8 @@ }; }; - # Helper to create a NixOS system - mkSystem = hostname: + # Helper to create a NixOS system with rice + mkSystem = hostname: rice: nixpkgs.lib.nixosSystem { inherit system; specialArgs = {inherit inputs;}; @@ -91,6 +91,7 @@ } ./hosts/${hostname}/configuration.nix ./system + ./home/rices/${rice}/system.nix home-manager.nixosModules.home-manager nixowos.nixosModules.default stylix.nixosModules.stylix @@ -99,9 +100,9 @@ }; in { nixosConfigurations = { - kronos = mkSystem "kronos"; - herra = mkSystem "herra"; - mystra = mkSystem "mystra"; + kronos = mkSystem "kronos" "nord-blue"; + herra = mkSystem "herra" "cassette-futurism"; + mystra = mkSystem "mystra" "nord-blue"; }; }; } -- cgit v1.2.3