| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
|
|
|
| |
We only really need an ISO image for kzerza, as mentioned in the
previous commit, because that's the one that's really dd'ed onto an USB
stick.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
It has been a long time (~2 months) since I've been back to my
workstations, so there was a new kernel release in-between.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
We don't want the ExecStopPost action to run whenever GrandPA exits with
a failure state, because this would make debugging very nasty ("Noooo,
don't shut doooooooow... DAMN!"), especially on read-only media.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This was the behaviour back then when NixOS still used upstart and after
some searching I found that ExecStopPost is what we want here, despite
its name (I'd imply that it is used in parts to stop the service rather
than executed after the service has stopped).
So in turn, it means that using Ctrl-Q within GrandPA shuts down the
whole system.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
This has been enabled before, but got lost while refactoring my base
profile in fb1ddce32989fdea137f2b225ae4c24d2badf3a4.
It is okay to have it only in the workstation profile, but if it comes
to kzerza, the GrandPA application depends on it.
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>
|
|
|
|
|
|
|
|
|
| |
The machine was using only configuration-internal options, which is why
I missed it when I was introducing a common namespace. Still, the
machine needs to be refactored, but right now I'm just going to give it
a proper namespace in order to fix evaluation of the ISO images.
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>
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
| |
Since NixOS/nixpkgs@e212e07, boolean options don't default to true
anymore if they're defined multiple times. So we need to explicitly
override the value for networking.wireless.enable, because we have set
it to false in the base profile.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
| |
That monitor died a few days ago (probably blown capacitor), so let's
disable it until I got time to fix that monitor.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
It's about time I update these machines to the latest and greatest
kernel. Not much to say about the config as it's mostly catching up with
new options, although I'm still not happy to do configuration manually
without generalizing common options.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
| |
Not really optimized to what I would like it to, but much better than
with the default setup and it's annoying tap buttons.
Odds are greater that I might switch back to keynav instead of investing
more time in configuring a pointing device.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
This causes an infinite recursion on evaluation if we import something
from a module argument. So until we have an importsArgs module attribute
we're going to refer to ../../nixpkgs-path.nix.
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>
|
|
|
| |
by default usb <-> rs232 interfaces which are used to connect to 3d printers are owned by the group `dialout`.
|
|
|
|
|
|
|
|
| |
We now no longer can (or even should) refer to pkgs.lib within modules
since the merge of the module system improvements in
NixOS/nixpkgs@889f72b.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
Also, since NixOS/nixpkgs@6b467ad we no longer need to use allowBroken.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
So far only emulateWheel has been set, but it doesn't work if you don't
also enable the module.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
| |
Its upstream package is called "printrun" and includes Pronterface.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
| |
This reverts the split up of the config from 55ec3a1 and puts all the
stuff from the hardware configuration file into the main config. The
reason for this is that vuizvui is structured so that the machine
definition *IS* the actual hardware configuration which deviates from a
common profile.
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>
|
|
|
|
|
|
|
|
| |
Regression is from 012fc8e4f399af06ab013ba136fe1d2cffb913f1.
We have renamed the package, so let's put in the right attribute path.
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Just moving the overrides into the base profile isn't enough here,
as we wouldn't be able to refer to packages anymore, because the global
nixpkgs.config override is now gone.
Instead, we're now putting pkgs.vuizvui.* into the NixOS module system
by a new profiles/common.nix, which is used unconditionally for all
machines.
Of course, the result of this is that we now need to change all
references to vuizvui-related packages, which also is a good thing,
because we will no longer shadow existing packages from upstream
nixpkgs.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This means, we don't have that lib directory anymore and also we're not
doing text substitution on the kernel config but instead override the
original attributes.
However, this needs to be refactored even further, so we can use the
NixOS kernel system, which allows for certain modules to require
specific kernel features. That way we can automatically create a kernel
config from the list of required features and we only need to set a
specific base config instead of specifying the *full* kernel config.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
Thus we now got rid of the cfgfiles directory, especially because the
Synergy server config file is rather small, so inlining makes sense
here.
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>
|