aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatasha Moongrave <natasha@256phi.eu>2026-04-04 23:29:14 +0200
committerNatasha Moongrave <natasha@256phi.eu>2026-04-04 23:29:14 +0200
commit29327f37614667444761d1c2a8f71fe54fddec66 (patch)
tree2b62e0b2cdbe0b28408001dc99be99333d8a1a0e
parentcf0c9f66c4b5d9e6342c1eac302d0e6bbe9b1587 (diff)
Simplify rice selection - single parameter drives all config
- Rice parameter now passed to both system and home-manager - Removed hostname-based rice mapping from home/mun/default.nix - Home config directly imports rice using rice parameter - Now you just specify rice once: mkSystem hostname rice-name
-rw-r--r--flake.nix5
-rw-r--r--home/mun/default.nix14
2 files changed, 6 insertions, 13 deletions
diff --git a/flake.nix b/flake.nix
index 1ffceff..454cfb1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -61,13 +61,14 @@
];
# Per-host home-manager configuration
- mkHomeManagerModule = hostname: {
+ mkHomeManagerModule = hostname: rice: {
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = {
inherit inputs;
inherit hostname;
+ inherit rice;
};
users.mun = import ./home/mun;
sharedModules = [
@@ -95,7 +96,7 @@
home-manager.nixosModules.home-manager
nixowos.nixosModules.default
stylix.nixosModules.stylix
- (mkHomeManagerModule hostname)
+ (mkHomeManagerModule hostname rice)
];
};
in {
diff --git a/home/mun/default.nix b/home/mun/default.nix
index 71b844b..5fa0c48 100644
--- a/home/mun/default.nix
+++ b/home/mun/default.nix
@@ -1,21 +1,13 @@
{
pkgs,
- hostname ? "kronos",
+ rice ? "nord-blue",
...
-}: let
- # Hostname-aware rice selection
- riceMap = {
- herra = ../rices/cassette-futurism;
- kronos = ../rices/nord-blue;
- mystra = ../rices/nord-blue;
- };
- selectedRice = riceMap.${hostname} or ../rices/nord-blue;
-in {
+}: {
imports = [
./programs/zsh.nix
./programs/ssh.nix
./programs/git.nix
- selectedRice
+ ../rices/${rice}
];
nixowos = {