| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
We only did simple substitutions of <path/references/like/this/one> but
completely ignored the --find-file argument of nix-instantiate.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
| |
|
|
|
|
|
|
|
|
|
| |
The reason why the manual is needed is that we implicitly rely on the
tarball job of the upstream project's release.nix. Let's fix that at
some later point if we really need to (because it might become quite
tricky).
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
We could use find to recursively replace all references, but let's just
do it one-by-one, because NixOps still has a few references that cannot
be changed right now.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
So now we're seeing exactly the right thing happen: Builds breaking on
Hydra when they *should* break.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is needed because we're relying on nixpkgs-path.nix to point to a
valid nixpkgs tree, which we deliberately don't have anymore because we
wanted to avoid references to <nixpkgs>.
So providing vuizvuiSrc instead of vuizvui has another advantage that we
now are no longer dependant on the channel name and also have a safety
net (Hydra) to inform us of references to <vuizvui> in the form of
failed builds and/or evaluations.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
| |
Yeah, probably will work a bit better without evaluation errors ;-)
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We now use nixpkgsSrc to make sure that Hydra builds will fail as soon
as we hit a reference of <nixpkgs> in either vuizvui of nixpkgs.
This also means, that we don't rewrite all of vuizvui and nixpkgs
anymore and we only really need to rewrite nixos-rebuild.sh.
Although we're using patched nixpkgs for Hydra builds, the release.nix
still has a fallback to <nixpkgs> to make development easier (patching
nixpkgs on every tiny change will take a long time otherwise).
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>
|
|
|
|
|
|
|
| |
We want to ensure that we possibly have only *one* point where we decide
on the path of nixpkgs, so it's easier to switch.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|