diff --git a/machines/router/configuration.nix b/machines/router/configuration.nix index 272fb0c..d44c2fc 100644 --- a/machines/router/configuration.nix +++ b/machines/router/configuration.nix @@ -7,7 +7,6 @@ { config, pkgs, lib, modulesPath, ... } : let - liminix = ./liminix; inherit (pkgs.liminix.services) bundle oneshot longrun; inherit (pkgs) serviceFns; # EDIT: you can pick your preferred RFC1918 address space @@ -24,16 +23,15 @@ in rec { }; hardware.ubi = { - # PLEASE remove this when using the real RAM. These are just tweaks to make tftpboot working + # PLEASE remove this when using the real ROM. These are just tweaks to make tftpboot working minIOSize = lib.mkForce "1"; eraseBlockSize = lib.mkForce "130944"; }; imports = [ - (liminix + "/modules/network") - (liminix + "/modules/ssh") - (liminix + "/modules/outputs/ubimage.nix") - #(liminix + "/modules/outputs/ext4fs.nix") + (modulesPath + "/network") + (modulesPath + "/ssh") + (modulesPath + "/outputs/ubimage.nix") ]; rootfsType = "ubifs"; hostname = "hackens-router"; # EDIT diff --git a/machines/router/default.nix b/machines/router/default.nix index 0791c27..a016f58 100644 --- a/machines/router/default.nix +++ b/machines/router/default.nix @@ -3,6 +3,6 @@ , liminix-config ? ./configuration.nix }: let - liminix = ./liminix; + liminix = builtins.toString ./liminix; in (import liminix { inherit nixpkgs liminix-config; device = import (liminix + "/devices/belkin-rt3200"); }) diff --git a/machines/router/liminix b/machines/router/liminix index 7232a03..ce348f2 160000 --- a/machines/router/liminix +++ b/machines/router/liminix @@ -1 +1 @@ -Subproject commit 7232a0343513cb33691ebc9e582da87abeff34a2 +Subproject commit ce348f2b8ab49ab7ac46537f9bf17e651bcdd3b7