Your one-stop-cake-shop for everything Freshly Baked has to offer

feat(ingredients): infer the common ingredient

The common ingredient is required everywhere, so let's make it default

We're setting it in config rather than default because we want to make
it clear that it *won't* be overriden unless you force over it...

+6 -18
-5
packetmix/homes/default.nix
··· 18 18 ingredients = [ 19 19 "catppuccin" 20 20 "collabora" 21 - "common" 22 21 "development" 23 22 "espanso" 24 23 "freshlybakedcake" ··· 42 41 ]; 43 42 ingredients = [ 44 43 "catppuccin" 45 - "common" 46 44 "development" 47 45 "espanso" 48 46 "freshlybakedcake" ··· 67 65 ingredients = [ 68 66 "catppuccin" 69 67 "collabora" 70 - "common" 71 68 "development" 72 69 "espanso" 73 70 "freshlybakedcake" ··· 93 90 ingredients = [ 94 91 "catppuccin" 95 92 "coded" 96 - "common" 97 93 "development" 98 94 "espanso" 99 95 "freshlybakedcake" ··· 116 112 ]; 117 113 ingredients = [ 118 114 "catppuccin" 119 - "common" 120 115 "development" 121 116 "espanso" 122 117 "freshlybakedcake"
+2 -4
packetmix/modules/ingredients.nix
··· 14 14 { config, name, ... }@submodule: 15 15 { 16 16 options.ingredients = nilla.lib.options.create { 17 - description = "Ingredients to activate for the system"; 17 + description = "Ingredients to activate for the system. Defaults to the common ingredient"; 18 18 type = nilla.lib.types.list.of nilla.lib.types.string; 19 - default = [ ]; 20 19 }; 21 20 22 21 config = { 22 + ingredients = [ "common" ]; 23 23 modules = 24 24 ingredientModules 25 25 ++ (map (ingredient: { ··· 30 30 ) 31 31 ); 32 32 }; 33 - 34 - # The type for options.homes is defined in ./nilla-home/homes-type.nix - portable submodules are not mergeable 35 33 }
+4 -1
packetmix/modules/nilla-home/homes-type.nix
··· 96 96 }; 97 97 98 98 ingredients = nilla.lib.options.create { 99 - description = "Ingredients to activate for the home"; 99 + description = "Ingredients to activate for the home. Defaults to the common ingredient"; 100 100 type = nilla.lib.types.list.of nilla.lib.types.string; 101 101 }; 102 102 ··· 109 109 }; 110 110 111 111 config = { 112 + ingredients = [ 113 + "common" 114 + ]; 112 115 modules = 113 116 defaultModules 114 117 ++ ingredientModules
-8
packetmix/systems/default.nix
··· 11 11 config.systems.nixos."redhead" = { 12 12 pkgs = nixpkgs.x86_64-linux; 13 13 ingredients = [ 14 - "common" 15 14 "espanso" 16 15 "freshlybakedcake" 17 16 "javelin" ··· 30 29 config.systems.nixos."emden" = { 31 30 pkgs = nixpkgs.x86_64-linux; 32 31 ingredients = [ 33 - "common" 34 32 "emden" 35 33 "espanso" 36 34 "freshlybakedcake" ··· 49 47 config.systems.nixos."marbled" = { 50 48 pkgs = nixpkgs.x86_64-linux; 51 49 ingredients = [ 52 - "common" 53 50 "espanso" 54 51 "freshlybakedcake" 55 52 "javelin" ··· 69 66 pkgs = nixpkgs.x86_64-linux; 70 67 ingredients = [ 71 68 "coded" 72 - "common" 73 69 "espanso" 74 70 "freshlybakedcake" 75 71 "gaming" ··· 87 83 config.systems.nixos."saurosuchus" = { 88 84 pkgs = nixpkgs.x86_64-linux; 89 85 ingredients = [ 90 - "common" 91 86 "espanso" 92 87 "freshlybakedcake" 93 88 "gaming" ··· 106 101 pkgs = nixpkgs.x86_64-linux; 107 102 ingredients = [ 108 103 "coded" 109 - "common" 110 104 "corsair" 111 105 "espanso" 112 106 "freshlybakedcake" ··· 124 118 config.systems.nixos."midnight" = { 125 119 pkgs = nixpkgs.x86_64-linux; 126 120 ingredients = [ 127 - "common" 128 121 "freshlybakedcake" 129 122 "midnight" 130 123 "server" ··· 137 130 config.systems.nixos."teal" = { 138 131 pkgs = nixpkgs.x86_64-linux; 139 132 ingredients = [ 140 - "common" 141 133 "freshlybakedcake" 142 134 "teal" 143 135 "server"