| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
|
|
|
| |
The current master version includes a few fixes I made for setting
default values for the Rockfabrik stage setup, which is to be used by my
machine called "kzerza" (booted solely via USB storage device).
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
| |
Since d2ff1a9, we now set a new NIX_PATH instead of patching <nixpkgs>,
which is way less error-prone and get less unexpecting results if we
evaluate against an unmodified <nixpkgs>.
So, patching <nixpkgs> is obsolete and thus removed.
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>
|
|
|
|
|
|
|
|
|
| |
The default font changed to Terminus in NixOS/nixpkgs@0b68b92.
I personally hate Terminus with a passion, so I simply don't want it to
cause eye cancer on any of my machines.
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>
|
|
|
|
|
|
|
| |
Namespacing the options with "vuizvui." now leads to failing tests,
which I probably should have checked in the previous commit, my bad!
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>
|
|
|
|
|
|
|
|
|
| |
Originally only needed for "kzerza", because that machine has always
resided on an USB stick, but could be useful for "arilou" and others as
well. That way you always have a (hopefully working) USB and CD image
available for all machines.
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Ugh... I must have been quite distracted while writing this.
Of course, doing a mkOverride on environment.sessionVariables instead of
environment.sessionVariables.NIX_PATH is going to clear *all*
sessionVariables instead of just replacing NIX_PATH.
This time however, I did a short test with:
nix-instantiate --eval --strict -E '
(import <nixpkgs/nixos/lib/eval-config.nix> {
modules = [ ./modules/profiles/common.nix ];
}).config.environment.sessionVariables
'
... to make sure I just didn't break it *again*.
Also, I'm going to immediately test this after the next evaluation, as
my current system is lacking quite a lot of necessary sessionVariables.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
| |
That way we no longer need to rewrite anything from <nixpkgs> anymore,
because we only need to build one generation of the system and have the
right system-wide NIX_PATH for vuizvui.
For now however, let's test this properly before we can drop the rewrite
of nixos-rebuild and friends.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
In NixOS/nixpkgs@be5f408, the "pulseaudio" attribute has been removed to
prevent accidentally using it if we just want to have the library, so
let's fix this on our side.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
| |
|
| |
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| | |
Fixes typos in the README for the modules subdirectory.
I have a long track record of bad grammar and spelling, so thanks a lot
to @devhell for the corrections.
|
|/
|
|
|
| |
We have a seriously good looking `README.md` here. Let's try to make it
sound good too. ;-)
|
|
|
|
|
|
| |
It's my not day for spulling and gremmar.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
Oh noes... we're too old, no particular reason for updating the kernel
rather than the consistent urge to stay on mainline master.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
| |
Drop patch for NixOS/nixops#280 because it has been applied upstream.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
It's kinda pointless to shovel the whole source to a remote machine and
then shovel the whole source back to the Hydra master without doing any
real compiling or other CPU-intensive processing.
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>
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
This is useful to get an urgency hint as soon as for example a long
running command completes while we're on another terminal and/or
workspace.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This comes with a patch to chainload taskwarrior configs and defaults to
the config supplied by the module. So if we want to play around with
different configuration values, it's easy to do by just adding a
~/.taskrc.
Note that the patch uses nestlevel 2 for ~/.taskrc, because if we would
use the default (1), the default configuration would be applied prior to
parsing ~/.taskrc, which of course would balk our plan.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
| |
This is cruicial for scripts such as nix-prefetch-git, which have the
executable bit set and a builder is trying to call it.
Instead, we're now preserving mode and set it writable for the current
user directly afterwards, which essentially was my original motivation
to not preserve modes.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
Since we now have everything within the vuizvui namespace at the top-
level Nix expression we also need to reference mkChannel from within
that namespace.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
We don't want to build the whole <nixpkgs> package set, which I
accidentally introduced when rewriting the package namespacing in
6ffc2e86150e625266e6836a1404a3e79fc74d49.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
For packageOverrides, we only want to return the vuizvui attribute set
and nothing more. But if we want to import <vuizvui/pkgs>, we want to
have access to <nixpkgs> as well, which is especially useful when using
the <vuizvui> channel.
However, in callPackageWith we're explicitely using the vuizvui
attribute which should override the whole set of <nixpkgs>, so that
references to vuizvui packages don't need to be explicitly namespaced
within vuizvui itself and we can easily override existing packages with
this method as well (like just define a vuizvui package and it overrides
the dependency for all of vuizvui's packages).
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 gets rid of an ugly error message during nixos-rebuild, because the
stock get-version-suffix tries to find <nixpkgs>, which will either lead
to the wrong channel (if it even exists at all) or an ugly error.
In both cases however, it doesn't have an effect, because the channel
expression store path is read-only and ships with a .version-suffix
already.
It really only gets rid of ugly error messages.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|