| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
We can't really do a "mkForce {}" or "mkForce null" on the submodule
type and the upstream module throws an error on null values, so we
simply define a dummy fileSystem with the noauto option set.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We now do it the exact opposite way than introduced in 27dce7b. Instead
of evaluating the machine config and stripping off the options we don't
want to conflict with the iso-image.nix module, we now wrap the
iso-image.nix module itself and just mkForce the values we don't want to
collide.
The reason for this is that the previous implementation just didn't work
because dependent module options from the machine config (for example
config.system.build.*) were already evaluated and thus we end up with
overriding configuration options but get an initrd with the machine
options (which we actually want to override) instead of the
fileSystem/boot options that come with the iso-image.nix module.
Although I'm not quite happy with this approach, it's still better than
the old one and if iso-image.nix gets conflicting options we at least
get a better error message rather than the definitions simply being
stripped off.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
| |
Introduced in NixOS/nixpkgs@f9bd72f24cfc8c160d144615522b0bc692cde9d0.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
I know it's a somewhat hacky approach to strip off "_module",
"boot.loader" and "fileSystems" from the machine config, but that should
be the options which are to be set by iso-image.nix but that way we can
re-use the upstream module.
Also, if one of our modules sets an option without a proper "vuizvui."
namespace, we get an error as well. But it's our policy anyway to always
namespace with "vuizvui." so it's even good to get an error here.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
|
|
|
|
|
|
|
|
| |
This file is just defaulting to <nixpkgs>, but we're going to substitue
it by the channel generator. We also need to make sure that we don't
have any other references to <nixpkgs>, but the latter can best be done
on Hydra's side if we don't make <nixpkgs> available to vuizvui builds.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
Useful to call the machine from configuration.nix like this:
(import <vuizvui/machines> {}).aszlig.mmrnmhrm.use
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
I've moved the restrictions config of Postfix into the default module
for now and actually fixed it so that it's actually working (the config
value wasn't set before). Also, the option type was incorrectly set to
types.list, which aliases to types.listOf and expects another function
(kind) as its argument.
This marks the end of LaberNix and the beginning of a new Vuizvui!
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
| |
So far I'm not quite sure whether mailserver really belongs to labnet,
so I'm leaving it at the labernix subtree. Maybe it even makes sense to
just make it a profile until we have it on a real machine.
We no longer need common.nix for these machines, because it is already
done via callMachine.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Both files are specific to my machines only and need to be generalized
in order to be useful for anyone else.
Moving these files has a few other censequences, such that we now need
to automatically import the module-list.nix in callMachine.
Speaking of module-list.nix, the file is now alphabetically sorted.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
Introduces callMachine in machines/default.nix, which returns an
attribute set containing the (input) configuration and also a build
attribute containing the output configuration and thus also the builds.
However, we still have references to ../../common-workstation.nix which
we need to refactor very soon.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|