forked from dan/liminix
1
0
Fork 0

move all output modules to subdirectory, trash standard.nix

standard.nix isn't, is the essence here. Not all devices
support flashimage as it is currently defined - some
have diskimage, some have neither
This commit is contained in:
Daniel Barlow 2023-12-10 15:23:12 +00:00
parent 53fed8839a
commit c81e7c4d35
12 changed files with 28 additions and 20 deletions

View File

@ -24,13 +24,18 @@ in rec {
};
imports = [
../modules/standard.nix
../modules/wlan.nix
../modules/network
../modules/vlan
../modules/ssh
../modules/watchdog
../modules/mount
../modules/outputs/tftpboot.nix
../modules/outputs/kexecboot.nix
../modules/outputs/flashimage.nix
../modules/outputs/jffs2.nix
../modules/outputs/ubifs.nix
];
hostname = "arhcive";

View File

@ -33,7 +33,11 @@ in rec {
../modules/ntp
../modules/ppp
../modules/ssh
../modules/standard.nix
../modules/outputs/tftpboot.nix
../modules/outputs/kexecboot.nix
../modules/outputs/flashimage.nix
../modules/outputs/jffs2.nix
../modules/outputs/ubifs.nix
../modules/vlan
../modules/wlan.nix
];

View File

@ -30,7 +30,11 @@ in rec {
../modules/hostapd
../modules/bridge
../modules/ssh
../modules/standard.nix
../modules/outputs/tftpboot.nix
../modules/outputs/kexecboot.nix
../modules/outputs/flashimage.nix
../modules/outputs/jffs2.nix
../modules/outputs/ubifs.nix
];
hostname = "extneder";

View File

@ -34,7 +34,6 @@ in rec {
imports = [
../modules/wlan.nix
../modules/standard.nix
../modules/network
../modules/ppp
../modules/dnsmasq
@ -44,6 +43,11 @@ in rec {
../modules/bridge
../modules/ntp
../modules/ssh
../modules/outputs/tftpboot.nix
../modules/outputs/kexecboot.nix
../modules/outputs/flashimage.nix
../modules/outputs/jffs2.nix
../modules/outputs/ubifs.nix
];
rootfsType = "jffs2";
hostname = "rotuer";

View File

@ -29,7 +29,6 @@
./ramdisk.nix
./squashfs.nix
./ssh
./standard.nix
./tftpboot.nix
./ubifs.nix
./users.nix

View File

@ -7,7 +7,7 @@
let
inherit (lib) mkOption mkForce types concatStringsSep;
in {
imports = [ ./ramdisk.nix ];
imports = [ ../ramdisk.nix ];
options.system.outputs = {
kexecboot = mkOption {
type = types.package;

View File

@ -8,7 +8,7 @@ let
inherit (lib) mkOption types concatStringsSep;
cfg = config.boot.tftp;
in {
imports = [ ./ramdisk.nix ];
imports = [ ../ramdisk.nix ];
options.boot.tftp.freeSpaceBytes = mkOption {
type = types.int;
default = 0;

View File

@ -1,12 +0,0 @@
{
# "standard" modules that aren't fundamentally required,
# but are probably useful in most common workflows and
# you should have to opt out of instead of into
imports = [
./tftpboot.nix
./kexecboot.nix
./outputs/flashimage.nix
./jffs2.nix
./ubifs.nix
];
}

View File

@ -2,6 +2,10 @@
{
imports = [
./vanilla-configuration.nix
./modules/standard.nix
./modules/outputs/tftpboot.nix
./modules/outputs/kexecboot.nix
./modules/outputs/flashimage.nix
./modules/outputs/jffs2.nix
./modules/outputs/ubifs.nix
];
}