| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
|
|
|
| |
The jrnl package is now a top-level attribute since
NixOS/nixpkgs@3ff173ffde475f96f12b379f4ae21658e63045c1.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @devhell
|
|
|
|
|
| |
Currently I'm not using GNOME anyway, and it's failing on Hydra, so
might as well disable it at the moment.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Regression introduced by 5990a4d62f2d3146ddd03ec2461d45b2102e5f42.
In this commit, I copied over the nixpkgs.config.packageOverrides
attribute, but didn't trim off the "nixpkgs.config", so the
packageOverrides attribute didn't get evaluated correctly.
While converting everything to overlays in 0feae9218e6f922366665e6515bc,
I noticed that for @devhell's profile the store paths were different. In
hindsight, this is pretty obvious given that overrides didn't apply *at*
*all* but with the move to nixpkgs.overlays they suddenly applied.
So this moves the overrides to overlays instead and drops the override
on gnupg, because gnupg is already gnupg21 in upstream <nixpkgs>.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @devhell
|
|
|
|
| |
Tried it. Meh.
|
|
|
|
| |
Let's see what the fuss is all about.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This introduces another profile module called "packages", which contains
all the package configuration (including overrides) of all the machines
in the devhell namespace.
The machine-specific configuration is now merged into the machine
configurations the same way as we've done previously with the services.
One major difference here is that the haskellPackages workaround is no
longer needed in the package configuration, as it is handled by vuizvui.
Tested this by evaluating all machines and all evaluations succeeded.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @devhell
|
|
|
|
|
|
|
|
|
| |
IMHO this module is really too small to factor it out into its own
profile module, so I'm putting it into the base profile as it's really
common among all of devhell's machines.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @devhell
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
I've added another profile called "services", which now resembles the
services_common.nix from the previous configuration.
The machine-specific definitions now reside directly inside the
machine's Nix expressions for now, until they're properly refactored.
Most of these machine-specific values can be easily modularized,
especially the xrdb config, for example having one base xrdb module
and only small machine-specific definitions if stuff needs to be
overridden.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @devhell
|
|
|
|
|
|
|
|
| |
This is from network/network_common.nix and it really affects all of the
machines, so it makes sense to add it to the base profile.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @devhell
|
|
In his configuration he had machine_common.nix which was imported from
the other machine_*.nix files. However in order to start modularizing
I've converted machine_common.nix into a proper NixOS module which now
resides in modules/user/devhell/profiles/base.nix and can be simply
activated via:
vuizvui.user.devhell.profiles.base.enable = true;
Apart from that I've removed the following configuration definitiens
from machine_common.nix:
nix.binaryCaches = [
"https://headcounter.org/hydra/"
"https://cache.nixos.org/"
];
nix.requireSignedBinaryCaches = true;
nix.binaryCachePublicKeys = [
"headcounter.org:/7YANMvnQnyvcVB6rgFTdb8p5LG1OTXaO+21CaOSBzg="
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
];
nix.nixPath = lib.mkOptionDefault [
"nixpkgs=/home/dev/git/remote/other_github/nixpkgs"
];
The reason for removing them is because we already handle that via the
vuizvui core modules (modules/core/common.nix).
I've tested this by evaluating the machines by temporarily setting
"allowUnfree = true" (which is part of another module I didn't migrate
yet) and it succeeds.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @devhell
|