HackENS/hackens-org-configurations
5
0
Fork 0
Code Issues 2 Pull requests 1 Projects Releases Packages Wiki Activity

router: update liminix, refactor

Browse source
This commit is contained in:
sinavir 2024-01-26 19:43:04 +01:00
parent ccd7e80da7
commit 3251fc2698
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
machines/router/configuration.nix
View file

@ -7,7 +7,6 @@
{ config, pkgs, lib, modulesPath, ... } : { config, pkgs, lib, modulesPath, ... } :
let let
liminix = ./liminix;
inherit (pkgs.liminix.services) bundle oneshot longrun; inherit (pkgs.liminix.services) bundle oneshot longrun;
inherit (pkgs) serviceFns; inherit (pkgs) serviceFns;
# EDIT: you can pick your preferred RFC1918 address space # EDIT: you can pick your preferred RFC1918 address space
@ -24,16 +23,15 @@ in rec {
}; };
hardware.ubi = { 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"; minIOSize = lib.mkForce "1";
eraseBlockSize = lib.mkForce "130944"; eraseBlockSize = lib.mkForce "130944";
}; };
imports = [ imports = [
(liminix + "/modules/network") (modulesPath + "/network")
(liminix + "/modules/ssh") (modulesPath + "/ssh")
(liminix + "/modules/outputs/ubimage.nix") (modulesPath + "/outputs/ubimage.nix")
#(liminix + "/modules/outputs/ext4fs.nix")
]; ];
rootfsType = "ubifs"; rootfsType = "ubifs";
hostname = "hackens-router"; # EDIT hostname = "hackens-router"; # EDIT

2
machines/router/default.nix
View file

@ -3,6 +3,6 @@
, liminix-config ? ./configuration.nix , liminix-config ? ./configuration.nix
}: }:
let let
liminix = ./liminix; liminix = builtins.toString ./liminix;
in in
(import liminix { inherit nixpkgs liminix-config; device = import (liminix + "/devices/belkin-rt3200"); }) (import liminix { inherit nixpkgs liminix-config; device = import (liminix + "/devices/belkin-rt3200"); })

2
machines/router/liminix

@ -1 +1 @@
Subproject commit 7232a0343513cb33691ebc9e582da87abeff34a2 Subproject commit ce348f2b8ab49ab7ac46537f9bf17e651bcdd3b7