Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions templates/default/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion templates/default/modules/aspects/defaults.nix
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
#
# # Instead try to be explicit if a function is intended for ONLY { host }.
(den.lib.take.exactly (
{ host }:
# deadnix: skip
{ OS, host }:
{
nixos.networking.hostName = host.hostName;
}
Expand Down
18 changes: 13 additions & 5 deletions templates/default/modules/aspects/eg/vm-bootable.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
let
installer = variant: {
nixos =
{ modulesPath, ... }:
{
imports = [ (modulesPath + "/installer/cd-dvd/installation-cd-${variant}.nix") ];
};
};
in
{
# make USB/VM installers.
eg.vm-bootable.nixos =
{ modulesPath, ... }:
{
imports = [ (modulesPath + "/installer/cd-dvd/installation-cd-graphical-base.nix") ];
};
eg.vm-bootable.provides = {
tui = installer "minimal";
gui = installer "graphical-base";
};
}
15 changes: 15 additions & 0 deletions templates/default/modules/aspects/eg/vm.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{ eg, ... }:
{
eg.vm.provides = {
gui.includes = [
eg.vm
eg.vm-bootable._.gui
eg.xfce-desktop
];

tui.includes = [
eg.vm
eg.vm-bootable._.tui
];
};
}
7 changes: 0 additions & 7 deletions templates/default/modules/aspects/igloo.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{ eg, ... }:
{
den.aspects.igloo = {
# igloo host provides some home-manager defaults to its users.
Expand All @@ -11,12 +10,6 @@
environment.systemPackages = [ pkgs.hello ];
};

# Include aspects from the eg namespace
includes = [
eg.vm-bootable
eg.xfce-desktop
];

# <host>.provides.<user>, via eg/routes.nix
provides.alice =
{ user, ... }:
Expand Down
8 changes: 7 additions & 1 deletion templates/default/modules/vm.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
# enables `nix run .#vm`. it is very useful to have a VM
# you can edit your config an launch the VM to test stuff
# instead of having to reboot each time.
{ inputs, ... }:
{ inputs, eg, ... }:
{

den.aspects.igloo.includes = [
eg.vm._.gui
# eg.vm._.tui
];

perSystem =
{ pkgs, ... }:
{
Expand Down