From 6f24ca94e431fd6a8b53c9bd3e1eb83d10d72658 Mon Sep 17 00:00:00 2001
From: Natasha Moongrave <natasha@256phi.eu>
Date: Tue, 7 Apr 2026 12:00:58 +0200
Subject: Updated flake to import rice modules directly

mkSystem now imports ./home/rices/${rice}/system.nix
mkHomeManagerModule now imports ./home/rices/${rice}/home.nix

This fixes the dual import issue and ensures rice configs are properly separated between NixOS and home-manager contexts
---
 flake.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index df19116..6fd8c41 100644
--- a/flake.nix
+++ b/flake.nix
@@ -70,7 +70,12 @@
           inherit hostname;
           inherit rice;
         };
-        users.mun = import ./home/mun;
+        users.mun = {
+          imports = [
+            ./home/mun
+            ./home/rices/${rice}/home.nix
+          ];
+        };
         sharedModules = [
           nixowos.homeModules.default
         ];
@@ -92,7 +97,7 @@
           }
           ./hosts/${hostname}/configuration.nix
           ./system
-          ./home/rices/${rice}/default.nix
+          ./home/rices/${rice}/system.nix
           home-manager.nixosModules.home-manager
           nixowos.nixosModules.default
           stylix.nixosModules.stylix
-- 
cgit v1.2.3