diff --git a/templates/default/flake.lock b/templates/default/flake.lock index 50c09c7..995d6d7 100644 --- a/templates/default/flake.lock +++ b/templates/default/flake.lock @@ -22,11 +22,11 @@ }, "den": { "locked": { - "lastModified": 1762857244, - "narHash": "sha256-jv+YPHX9XZg8zri1LfbZo1uNLIxNwXpLgHS6yigfFWI=", + "lastModified": 1763024281, + "narHash": "sha256-H1gXc/wdj9J5WwZcTNk4UTFHKLcBXpmsr8eEp4rvM6o=", "owner": "vic", "repo": "den", - "rev": "db007d3af41b6a03ccf0148727bc93c713b05096", + "rev": "bab28b55a72d2801d1e91243ea44ae6d24cffd5b", "type": "github" }, "original": { diff --git a/templates/default/modules/aspects/defaults.nix b/templates/default/modules/aspects/defaults.nix index 00df1c5..ca450ea 100644 --- a/templates/default/modules/aspects/defaults.nix +++ b/templates/default/modules/aspects/defaults.nix @@ -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; } diff --git a/templates/default/modules/aspects/eg/vm-bootable.nix b/templates/default/modules/aspects/eg/vm-bootable.nix index c9b9990..4fae247 100644 --- a/templates/default/modules/aspects/eg/vm-bootable.nix +++ b/templates/default/modules/aspects/eg/vm-bootable.nix @@ -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"; + }; } diff --git a/templates/default/modules/aspects/eg/vm.nix b/templates/default/modules/aspects/eg/vm.nix new file mode 100644 index 0000000..b503be7 --- /dev/null +++ b/templates/default/modules/aspects/eg/vm.nix @@ -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 + ]; + }; +} diff --git a/templates/default/modules/aspects/igloo.nix b/templates/default/modules/aspects/igloo.nix index eab55eb..1f272de 100644 --- a/templates/default/modules/aspects/igloo.nix +++ b/templates/default/modules/aspects/igloo.nix @@ -1,4 +1,3 @@ -{ eg, ... }: { den.aspects.igloo = { # igloo host provides some home-manager defaults to its users. @@ -11,12 +10,6 @@ environment.systemPackages = [ pkgs.hello ]; }; - # Include aspects from the eg namespace - includes = [ - eg.vm-bootable - eg.xfce-desktop - ]; - # .provides., via eg/routes.nix provides.alice = { user, ... }: diff --git a/templates/default/modules/vm.nix b/templates/default/modules/vm.nix index f3d44d3..799492c 100644 --- a/templates/default/modules/vm.nix +++ b/templates/default/modules/vm.nix @@ -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, ... }: {