dan/liminix
1
0
Fork 5
Code

nixfmt-rfc-style

Browse Source 
There is nothing in this commit except for the changes made by
nix-shell -p nixfmt-rfc-style --run "nixfmt ."

If this has mucked up your open branches then sorry about that. You
can probably nixfmt them to match before merging
This commit is contained in:
Daniel Barlow 2025-02-10 21:55:08 +00:00
parent 13cc5a8992
commit 7e2b0068e6
211 changed files with 6049 additions and 4355 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
bordervm-configuration.nix
View File

@ -1,8 +1,21 @@
{ config, pkgs, lib, ... }: {
config,
pkgs,
lib,
...
}:
let let
cfg = config.bordervm; cfg = config.bordervm;
inherit (lib) mkOption mkEnableOption mdDoc types optional optionals; inherit (lib)
in { mkOption
mkEnableOption
mdDoc
types
optional
optionals
;
in
{
options.bordervm = { options.bordervm = {
keys = mkOption { keys = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
@ -113,7 +126,8 @@ in {
host.port = 2222; host.port = 2222;
guest.address = "10.0.2.15"; guest.address = "10.0.2.15";
guest.port = 22; guest.port = 22;
}]; }
];
qemu = { qemu = {
networkingOptions = [ ]; networkingOptions = [ ];
options = options =
@ -139,12 +153,18 @@ in {
services.tang = { services.tang = {
enable = true; enable = true;
ipAddressAllow = [ "10.0.0.0/24" "0.0.0.0/0" ]; ipAddressAllow = [
"10.0.0.0/24"
"0.0.0.0/0"
];
}; };
environment.systemPackages = environment.systemPackages =
let wireshark-nogui = pkgs.wireshark.override { withQt = false ; }; let
in with pkgs; [ wireshark-nogui = pkgs.wireshark.override { withQt = false; };
in
with pkgs;
[
tcpdump tcpdump
wireshark-nogui wireshark-nogui
socat socat
@ -157,10 +177,17 @@ in {
security.sudo.wheelNeedsPassword = false; security.sudo.wheelNeedsPassword = false;
networking = { networking = {
hostName = "border"; hostName = "border";
firewall = { enable = false; }; firewall = {
enable = false;
};
interfaces.eth1 = { interfaces.eth1 = {
useDHCP = false; useDHCP = false;
ipv4.addresses = [ { address = "10.0.0.1"; prefixLength = 24;}]; ipv4.addresses = [
{
address = "10.0.0.1";
prefixLength = 24;
}
];
}; };
nat = { nat = {
enable = true; enable = true;

8
ci.nix
View File

@ -17,7 +17,8 @@ let
"belkin-rt3200" "belkin-rt3200"
]; ];
vanilla = ./vanilla-configuration.nix; vanilla = ./vanilla-configuration.nix;
for-device = name: for-device =
name:
(import liminix { (import liminix {
inherit borderVmConf; inherit borderVmConf;
device = import (liminix + "/devices/${name}"); device = import (liminix + "/devices/${name}");
@ -73,8 +74,9 @@ let
''; '';
}; };
}; };
in jobs // in
{ jobs
// {
all = pkgs.mkShell { all = pkgs.mkShell {
name = "all tests"; name = "all tests";
contents = pkgs.lib.collect pkgs.lib.isDerivation jobs; contents = pkgs.lib.collect pkgs.lib.isDerivation jobs;

19
default.nix
View File

@ -27,7 +27,12 @@ let
modulesPath = builtins.toString ./modules; modulesPath = builtins.toString ./modules;
}; };
modules = [ modules = [
{ _module.args = { inherit pkgs; inherit (pkgs) lim; }; } {
_module.args = {
inherit pkgs;
inherit (pkgs) lim;
};
}
./modules/hardware.nix ./modules/hardware.nix
./modules/base.nix ./modules/base.nix
./modules/busybox.nix ./modules/busybox.nix
@ -47,7 +52,8 @@ let
}; };
config = eval.config; config = eval.config;
borderVm = ((import <nixpkgs/nixos/lib/eval-config.nix>) { borderVm =
((import <nixpkgs/nixos/lib/eval-config.nix>) {
system = builtins.currentSystem; system = builtins.currentSystem;
modules = [ modules = [
{ {
@ -62,15 +68,18 @@ let
borderVmConf borderVmConf
]; ];
}).config.system; }).config.system;
in { in
{
outputs = config.system.outputs // { outputs = config.system.outputs // {
default = config.system.outputs.${config.hardware.defaultOutput}; default = config.system.outputs.${config.hardware.defaultOutput};
optionsJson = optionsJson =
let o = import ./doc/extract-options.nix { let
o = import ./doc/extract-options.nix {
inherit pkgs eval; inherit pkgs eval;
lib = pkgs.lib; lib = pkgs.lib;
}; };
in pkgs.writeText "options.json" (builtins.toJSON o); in
pkgs.writeText "options.json" (builtins.toJSON o);
}; };
# this is just here as a convenience, so that we can get a # this is just here as a convenience, so that we can get a

29
devices/belkin-rt3200/default.nix
View File

@ -115,8 +115,16 @@
}; };
}; };
module = {pkgs, config, lib, lim, ... }: module =
let inherit (lib) mkIf; {
pkgs,
config,
lib,
lim,
...
}:
let
inherit (lib) mkIf;
firmware = pkgs.stdenv.mkDerivation { firmware = pkgs.stdenv.mkDerivation {
name = "wlan-firmware"; name = "wlan-firmware";
phases = [ "installPhase" ]; phases = [ "installPhase" ];
@ -126,7 +134,8 @@
''; '';
}; };
openwrt = pkgs.openwrt_24_10; openwrt = pkgs.openwrt_24_10;
in { in
{
imports = [ imports = [
../../modules/arch/aarch64.nix ../../modules/arch/aarch64.nix
../../modules/outputs/tftpboot.nix ../../modules/outputs/tftpboot.nix
@ -240,7 +249,8 @@
}; };
rootfsType = lib.mkDefault "ubifs"; # override this if you are building tftpboot rootfsType = lib.mkDefault "ubifs"; # override this if you are building tftpboot
filesystem = filesystem =
let inherit (pkgs.pseudofile) dir symlink; let
inherit (pkgs.pseudofile) dir symlink;
in in
dir { dir {
lib = dir { lib = dir {
@ -253,10 +263,14 @@
hardware = hardware =
let let
mac80211 = pkgs.kmodloader.override { mac80211 = pkgs.kmodloader.override {
targets = ["mt7615e" "mt7915e"]; targets = [
"mt7615e"
"mt7915e"
];
inherit (config.system.outputs) kernel; inherit (config.system.outputs) kernel;
}; };
in { in
{
ubi = { ubi = {
minIOSize = "2048"; minIOSize = "2048";
logicalEraseBlockSize = "126976"; logicalEraseBlockSize = "126976";
@ -294,7 +308,8 @@
networkInterfaces = networkInterfaces =
let let
inherit (config.system.service.network) link; inherit (config.system.service.network) link;
in rec { in
rec {
wan = link.build { ifname = "wan"; }; wan = link.build { ifname = "wan"; };
lan1 = link.build { ifname = "lan1"; }; lan1 = link.build { ifname = "lan1"; };
lan2 = link.build { ifname = "lan2"; }; lan2 = link.build { ifname = "lan2"; };

9
devices/families/qemu.nix
View File

@ -30,14 +30,17 @@
inherit (config.system.outputs) kernel; inherit (config.system.outputs) kernel;
targets = [ "mac80211_hwsim" ]; targets = [ "mac80211_hwsim" ];
}; };
in { in
{
defaultOutput = "vmroot"; defaultOutput = "vmroot";
rootDevice = "/dev/mtdblock0"; rootDevice = "/dev/mtdblock0";
dts.src = pkgs.lib.mkDefault null; dts.src = pkgs.lib.mkDefault null;
flash.eraseBlockSize = 65536; flash.eraseBlockSize = 65536;
networkInterfaces = networkInterfaces =
let inherit (config.system.service.network) link; let
in { inherit (config.system.service.network) link;
in
{
wan = link.build { wan = link.build {
devpath = "/devices/pci0000:00/0000:00:13.0/virtio0"; devpath = "/devices/pci0000:00/0000:00:13.0/virtio0";
ifname = "wan"; ifname = "wan";

31
devices/gl-ar750/default.nix
View File

@ -53,7 +53,14 @@
''; '';
module = {pkgs, config, lim, lib, ... }: module =
{
pkgs,
config,
lim,
lib,
...
}:
let let
inherit (lib) mkIf; inherit (lib) mkIf;
openwrt = pkgs.openwrt; openwrt = pkgs.openwrt;
@ -74,7 +81,10 @@
''; '';
}; };
mac80211 = pkgs.kmodloader.override { mac80211 = pkgs.kmodloader.override {
targets = ["ath9k" "ath10k_pci"]; targets = [
"ath9k"
"ath10k_pci"
];
inherit (config.system.outputs) kernel; inherit (config.system.outputs) kernel;
dependencies = [ ath10k_cal_data ]; dependencies = [ ath10k_cal_data ];
}; };
@ -82,7 +92,8 @@
let let
offset = lim.parseInt "0x5000"; offset = lim.parseInt "0x5000";
size = lim.parseInt "0x844"; size = lim.parseInt "0x844";
in pkgs.liminix.services.oneshot rec { in
pkgs.liminix.services.oneshot rec {
name = "ath10k_cal_data"; name = "ath10k_cal_data";
up = '' up = ''
part=$(basename $(dirname $(grep -l art /sys/class/mtd/*/name))) part=$(basename $(dirname $(grep -l art /sys/class/mtd/*/name)))
@ -94,7 +105,8 @@
''; '';
}; };
inherit (pkgs.pseudofile) dir symlink; inherit (pkgs.pseudofile) dir symlink;
in { in
{
imports = [ imports = [
../../modules/network ../../modules/network
../../modules/arch/mipseb.nix ../../modules/arch/mipseb.nix
@ -127,8 +139,10 @@
}; };
networkInterfaces = networkInterfaces =
let inherit (config.system.service.network) link; let
in { inherit (config.system.service.network) link;
in
{
lan = link.build { lan = link.build {
ifname = "lan"; ifname = "lan";
devpath = "/devices/platform/ahb/1a000000.eth"; devpath = "/devices/platform/ahb/1a000000.eth";
@ -143,7 +157,10 @@
}; };
wlan5 = link.build { wlan5 = link.build {
ifname = "wlan1"; ifname = "wlan1";
dependencies = [ ath10k_cal_data mac80211 ]; dependencies = [
ath10k_cal_data
mac80211
];
}; };
}; };
}; };

21
devices/gl-mt300a/default.nix
View File

@ -44,14 +44,22 @@
''; '';
module = { pkgs, config, lib, lim, ...}: module =
{
pkgs,
config,
lib,
lim,
...
}:
let let
inherit (pkgs) openwrt; inherit (pkgs) openwrt;
mac80211 = pkgs.kmodloader.override { mac80211 = pkgs.kmodloader.override {
targets = [ "rt2800soc" ]; targets = [ "rt2800soc" ];
inherit (config.system.outputs) kernel; inherit (config.system.outputs) kernel;
}; };
in { in
{
imports = [ imports = [
../../modules/arch/mipsel.nix ../../modules/arch/mipsel.nix
../../modules/outputs/tftpboot.nix ../../modules/outputs/tftpboot.nix
@ -90,7 +98,8 @@
let let
inherit (config.system.service.network) link; inherit (config.system.service.network) link;
inherit (config.system.service) vlan; inherit (config.system.service) vlan;
in rec { in
rec {
eth = link.build { ifname = "eth0"; }; eth = link.build { ifname = "eth0"; };
# lan and wan ports are both behind a switch on eth0 # lan and wan ports are both behind a switch on eth0
lan = vlan.build { lan = vlan.build {
@ -119,7 +128,8 @@
${openwrt.applyPatches.ramips} ${openwrt.applyPatches.ramips}
${openwrt.applyPatches.rt2x00} ${openwrt.applyPatches.rt2x00}
''; '';
config = { config =
{
RALINK = "y"; RALINK = "y";
PCI = "y"; PCI = "y";
@ -157,7 +167,8 @@
LEDS_CLASS = "y"; # required by rt2x00lib LEDS_CLASS = "y"; # required by rt2x00lib
PRINTK_TIME = "y"; PRINTK_TIME = "y";
} // lib.optionalAttrs (config.system.service ? vlan) { }
// lib.optionalAttrs (config.system.service ? vlan) {
SWCONFIG = "y"; SWCONFIG = "y";
}; };
conditionalConfig = { conditionalConfig = {

29
devices/gl-mt300n-v2/default.nix
View File

@ -37,7 +37,14 @@
''; '';
module = { pkgs, config, lib, lim, ...}: module =
{
pkgs,
config,
lib,
lim,
...
}:
let let
inherit (pkgs.liminix.services) oneshot; inherit (pkgs.liminix.services) oneshot;
inherit (pkgs.pseudofile) dir symlink; inherit (pkgs.pseudofile) dir symlink;
@ -51,7 +58,8 @@
url = "https://github.com/openwrt/mt76/raw/f24b56f935392ca1d35fae5fd6e56ef9deda4aad/firmware/mt7628_e2.bin"; url = "https://github.com/openwrt/mt76/raw/f24b56f935392ca1d35fae5fd6e56ef9deda4aad/firmware/mt7628_e2.bin";
hash = "sha256:1dkhfznmdz6s50kwc841x3wj0h6zg6icg5g2bim9pvg66as2vmh9"; hash = "sha256:1dkhfznmdz6s50kwc841x3wj0h6zg6icg5g2bim9pvg66as2vmh9";
}; };
in { in
{
imports = [ imports = [
../../modules/arch/mipsel.nix ../../modules/arch/mipsel.nix
../../modules/outputs/tftpboot.nix ../../modules/outputs/tftpboot.nix
@ -99,8 +107,12 @@
''; '';
down = "${pkgs.swconfig}/bin/swconfig dev switch0 set reset"; down = "${pkgs.swconfig}/bin/swconfig dev switch0 set reset";
}; };
in rec { in
eth = link.build { ifname = "eth0"; dependencies = [swconfig]; }; rec {
eth = link.build {
ifname = "eth0";
dependencies = [ swconfig ];
};
# lan and wan ports are both behind a switch on eth0 # lan and wan ports are both behind a switch on eth0
lan = vlan.build { lan = vlan.build {
ifname = "eth0.1"; ifname = "eth0.1";
@ -129,7 +141,8 @@
extraPatchPhase = '' extraPatchPhase = ''
${openwrt.applyPatches.ramips} ${openwrt.applyPatches.ramips}
''; '';
config = { config =
{
RALINK = "y"; RALINK = "y";
PCI = "y"; PCI = "y";
@ -175,9 +188,11 @@
EARLY_PRINTK = "y"; EARLY_PRINTK = "y";
PRINTK_TIME = "y"; PRINTK_TIME = "y";
} // lib.optionalAttrs (config.system.service ? vlan) { }
// lib.optionalAttrs (config.system.service ? vlan) {
SWCONFIG = "y"; SWCONFIG = "y";
} // lib.optionalAttrs (config.system.service ? watchdog) { }
// lib.optionalAttrs (config.system.service ? watchdog) {
RALINK_WDT = "y"; # watchdog RALINK_WDT = "y"; # watchdog
MT7621_WDT = "y"; # or it might be this one MT7621_WDT = "y"; # or it might be this one
}; };

28
devices/openwrt-one/default.nix
View File

@ -79,7 +79,14 @@
}; };
}; };
module = {pkgs, config, lib, lim, ... }: module =
{
pkgs,
config,
lib,
lim,
...
}:
let let
openwrt = pkgs.openwrt_24_10; openwrt = pkgs.openwrt_24_10;
mediatek-firmware = pkgs.stdenv.mkDerivation { mediatek-firmware = pkgs.stdenv.mkDerivation {
@ -100,7 +107,8 @@
cp ${pkgs.linux-firmware}/lib/firmware/airoha/* $out cp ${pkgs.linux-firmware}/lib/firmware/airoha/* $out
''; '';
}; };
in { in
{
imports = [ imports = [
../../modules/arch/aarch64.nix ../../modules/arch/aarch64.nix
../../modules/outputs/tftpboot.nix ../../modules/outputs/tftpboot.nix
@ -113,7 +121,8 @@
extraPatchPhase = '' extraPatchPhase = ''
${openwrt.applyPatches.mediatek} ${openwrt.applyPatches.mediatek}
''; '';
config = { config =
{
NET = "y"; # unlock NET_XGRESS NET = "y"; # unlock NET_XGRESS
SERIAL_8250 = "y"; # unlock SERIAL_8250_FSL SERIAL_8250 = "y"; # unlock SERIAL_8250_FSL
SERIAL_8250_CONSOLE = "y"; # to get the serial console SERIAL_8250_CONSOLE = "y"; # to get the serial console
@ -593,7 +602,8 @@
# ??? # ???
AQUANTIA_PHY = "m"; AQUANTIA_PHY = "m";
MT798X_WMAC = "y"; MT798X_WMAC = "y";
} // lib.optionalAttrs (config.system.service ? watchdog) { }
// lib.optionalAttrs (config.system.service ? watchdog) {
RALINK_WDT = "y"; # watchdog RALINK_WDT = "y"; # watchdog
MT7621_WDT = "y"; # or it might be this one MT7621_WDT = "y"; # or it might be this one
}; };
@ -617,7 +627,8 @@
}; };
rootfsType = lib.mkDefault "ubifs"; # override this if you are building tftpboot rootfsType = lib.mkDefault "ubifs"; # override this if you are building tftpboot
filesystem = filesystem =
let inherit (pkgs.pseudofile) dir symlink; let
inherit (pkgs.pseudofile) dir symlink;
in in
dir { dir {
lib = dir { lib = dir {
@ -647,7 +658,8 @@
]; ];
inherit (config.system.outputs) kernel; inherit (config.system.outputs) kernel;
}; };
in { in
{
# from OEM bootlog # from OEM bootlog
# Creating 4 MTD partitions on "spi0.0": # Creating 4 MTD partitions on "spi0.0":
# 0x000000000000-0x000000040000 : "bl2-nor" # 0x000000000000-0x000000040000 : "bl2-nor"
@ -698,7 +710,6 @@
maxLEBcount = "1024"; # guessing maxLEBcount = "1024"; # guessing
}; };
defaultOutput = "ubimage"; defaultOutput = "ubimage";
loadAddress = lim.parseInt "0x44000000"; loadAddress = lim.parseInt "0x44000000";
entryPoint = lim.parseInt "0x44000000"; entryPoint = lim.parseInt "0x44000000";
@ -717,7 +728,8 @@
networkInterfaces = networkInterfaces =
let let
inherit (config.system.service.network) link; inherit (config.system.service.network) link;
in rec { in
rec {
eth0 = link.build { eth0 = link.build {
ifname = "eth0"; ifname = "eth0";
dependencies = [ phy ]; dependencies = [ phy ];

10
devices/qemu-aarch64/default.nix
View File

@ -26,7 +26,9 @@
# this device is described by the "qemu" device # this device is described by the "qemu" device
installer = "vmroot"; installer = "vmroot";
module = { config, lim, ... }: { module =
{ config, lim, ... }:
{
imports = [ imports = [
../../modules/arch/aarch64.nix ../../modules/arch/aarch64.nix
../families/qemu.nix ../families/qemu.nix
@ -43,7 +45,11 @@
boot.commandLine = [ boot.commandLine = [
"console=ttyAMA0,38400" "console=ttyAMA0,38400"
]; ];
hardware = let addr = lim.parseInt "0x40010000"; in { hardware =
let
addr = lim.parseInt "0x40010000";
in
{
loadAddress = addr; loadAddress = addr;
entryPoint = addr; entryPoint = addr;
}; };

10
devices/qemu-armv7l/default.nix
View File

@ -24,7 +24,9 @@
''; '';
installer = "vmroot"; installer = "vmroot";
module = { config, lim, ... }: { module =
{ config, lim, ... }:
{
imports = [ imports = [
../../modules/arch/arm.nix ../../modules/arch/arm.nix
../families/qemu.nix ../families/qemu.nix
@ -45,7 +47,11 @@
boot.commandLine = [ boot.commandLine = [
"console=ttyAMA0" "console=ttyAMA0"
]; ];
hardware = let addr = lim.parseInt "0x40008000"; in { hardware =
let
addr = lim.parseInt "0x40008000";
in
{
loadAddress = addr; loadAddress = addr;
entryPoint = addr; entryPoint = addr;
}; };

15
devices/qemu/default.nix
View File

@ -36,7 +36,14 @@
in the Development manual. in the Development manual.
''; '';
module = { config, lib, lim, ... }: { module =
{
config,
lib,
lim,
...
}:
{
imports = [ imports = [
../../modules/arch/mipseb.nix ../../modules/arch/mipseb.nix
../families/qemu.nix ../families/qemu.nix
@ -55,8 +62,10 @@
}; };
hardware = hardware =
# from arch/mips/mti-malta/Platform:load-$(CONFIG_MIPS_MALTA) += 0xffffffff80100000 # from arch/mips/mti-malta/Platform:load-$(CONFIG_MIPS_MALTA) += 0xffffffff80100000
let addr = lim.parseInt "0x80100000"; let
in { addr = lim.parseInt "0x80100000";
in
{
loadAddress = addr; loadAddress = addr;
entryPoint = addr; entryPoint = addr;

30
devices/tp-archer-ax23/default.nix
View File

@ -33,8 +33,16 @@
}; };
}; };
module = {pkgs, config, lib, lim, ... }: module =
let firmware = pkgs.stdenv.mkDerivation { {
pkgs,
config,
lib,
lim,
...
}:
let
firmware = pkgs.stdenv.mkDerivation {
name = "wlan-firmware"; name = "wlan-firmware";
phases = [ "installPhase" ]; phases = [ "installPhase" ];
installPhase = '' installPhase = ''
@ -42,7 +50,8 @@
cp ${pkgs.linux-firmware}/lib/firmware/mediatek/{mt7915,mt7615,mt7622}* $out cp ${pkgs.linux-firmware}/lib/firmware/mediatek/{mt7915,mt7615,mt7622}* $out
''; '';
}; };
in { in
{
imports = [ imports = [
../../modules/arch/mipsel.nix ../../modules/arch/mipsel.nix
../../modules/outputs/tftpboot.nix ../../modules/outputs/tftpboot.nix
@ -53,7 +62,8 @@
extraPatchPhase = '' extraPatchPhase = ''
${pkgs.openwrt.applyPatches.ramips} ${pkgs.openwrt.applyPatches.ramips}
''; '';
config = { config =
{
# Initially taken from openwrt's ./target/linux/ramips/mt7621/config-5.15, # Initially taken from openwrt's ./target/linux/ramips/mt7621/config-5.15,
# then tweaked here and there # then tweaked here and there
ARCH_32BIT_OFF_T = "y"; ARCH_32BIT_OFF_T = "y";
@ -316,7 +326,8 @@
ZLIB_INFLATE = "y"; ZLIB_INFLATE = "y";
ZSTD_COMPRESS = "y"; ZSTD_COMPRESS = "y";
ZSTD_DECOMPRESS = "y"; ZSTD_DECOMPRESS = "y";
} // lib.optionalAttrs (config.system.service ? watchdog) { }
// lib.optionalAttrs (config.system.service ? watchdog) {
RALINK_WDT = "y"; # watchdog RALINK_WDT = "y"; # watchdog
MT7621_WDT = "y"; # or it might be this one MT7621_WDT = "y"; # or it might be this one
}; };
@ -340,7 +351,8 @@
}; };
}; };
filesystem = filesystem =
let inherit (pkgs.pseudofile) dir symlink; let
inherit (pkgs.pseudofile) dir symlink;
in in
dir { dir {
lib = dir { lib = dir {
@ -359,7 +371,8 @@
]; ];
inherit (config.system.outputs) kernel; inherit (config.system.outputs) kernel;
}; };
in { in
{
# from OEM bootlog (openwrt wiki): # from OEM bootlog (openwrt wiki):
# 4 cmdlinepart partitions found on MTD device raspi # 4 cmdlinepart partitions found on MTD device raspi
# Creating 4 MTD partitions on "raspi": # Creating 4 MTD partitions on "raspi":
@ -414,7 +427,8 @@
networkInterfaces = networkInterfaces =
let let
inherit (config.system.service.network) link; inherit (config.system.service.network) link;
in rec { in
rec {
lan1 = link.build { ifname = "lan1"; }; lan1 = link.build { ifname = "lan1"; };
lan2 = link.build { ifname = "lan2"; }; lan2 = link.build { ifname = "lan2"; };
lan3 = link.build { ifname = "lan3"; }; lan3 = link.build { ifname = "lan3"; };

36
devices/turris-omnia/default.nix
View File

@ -153,7 +153,14 @@
}; };
}; };
module = {pkgs, config, lib, lim, ... }: module =
{
pkgs,
config,
lib,
lim,
...
}:
let let
inherit (pkgs.liminix.services) oneshot; inherit (pkgs.liminix.services) oneshot;
inherit (pkgs) liminix; inherit (pkgs) liminix;
@ -167,7 +174,8 @@
done done
''; '';
}; };
in { in
{
imports = [ imports = [
../../modules/arch/arm.nix ../../modules/arch/arm.nix
../../modules/outputs/tftpboot.nix ../../modules/outputs/tftpboot.nix
@ -204,7 +212,6 @@
EXPERT = "y"; EXPERT = "y";
ALLOW_DEV_COREDUMP = "n"; ALLOW_DEV_COREDUMP = "n";
# dts has a compatible for this but dmesg is not # dts has a compatible for this but dmesg is not
# showing it # showing it
EEPROM_AT24 = "y"; # atmel,24c64 EEPROM_AT24 = "y"; # atmel,24c64
@ -312,7 +319,8 @@
cp -r ${pkgs.linux-firmware}/lib/firmware/ath10k/QCA988X $out cp -r ${pkgs.linux-firmware}/lib/firmware/ath10k/QCA988X $out
''; '';
}; };
in dir { in
dir {
lib = dir { lib = dir {
firmware = dir { firmware = dir {
ath10k = symlink firmware; ath10k = symlink firmware;
@ -320,10 +328,12 @@
}; };
etc = dir { etc = dir {
"fw_env.config" = "fw_env.config" =
let f = pkgs.writeText "fw_env.config" '' let
f = pkgs.writeText "fw_env.config" ''
/dev/mtd/by-name/u-boot-env 0x0 0x10000 0x10000 /dev/mtd/by-name/u-boot-env 0x0 0x10000 0x10000
''; '';
in symlink f; in
symlink f;
}; };
}; };
@ -333,12 +343,17 @@
compressRoot = true; compressRoot = true;
}; };
hardware = let hardware =
let
mac80211 = pkgs.kmodloader.override { mac80211 = pkgs.kmodloader.override {
inherit (config.system.outputs) kernel; inherit (config.system.outputs) kernel;
targets = ["ath9k" "ath10k_pci"]; targets = [
"ath9k"
"ath10k_pci"
];
}; };
in { in
{
defaultOutput = "updater"; defaultOutput = "updater";
loadAddress = lim.parseInt "0x00800000"; # "0x00008000"; loadAddress = lim.parseInt "0x00800000"; # "0x00008000";
entryPoint = lim.parseInt "0x00800000"; # "0x00008000"; entryPoint = lim.parseInt "0x00800000"; # "0x00008000";
@ -354,7 +369,8 @@
networkInterfaces = networkInterfaces =
let let
inherit (config.system.service.network) link; inherit (config.system.service.network) link;
in rec { in
rec {
en70000 = link.build { en70000 = link.build {
# in armada-38x.dtsi this is eth0. # in armada-38x.dtsi this is eth0.
# It's connected to port 5 of the 88E6176 switch # It's connected to port 5 of the 88E6176 switch

24
devices/zyxel-nwa50ax/default.nix
View File

@ -101,7 +101,14 @@
''; '';
module = { pkgs, config, lib, lim, ...}: module =
{
pkgs,
config,
lib,
lim,
...
}:
let let
inherit (pkgs.pseudofile) dir symlink; inherit (pkgs.pseudofile) dir symlink;
inherit (pkgs) openwrt; inherit (pkgs) openwrt;
@ -123,7 +130,8 @@
url = "https://github.com/openwrt/mt76/raw/1b88dd07f153b202e57fe29734806744ed006b0e/firmware/mt7915_rom_patch.bin"; url = "https://github.com/openwrt/mt76/raw/1b88dd07f153b202e57fe29734806744ed006b0e/firmware/mt7915_rom_patch.bin";
hash = "sha256-ifriAjWzFACrxVWCANZpUaEZgB/0pdbhnTVQytx6ddg="; hash = "sha256-ifriAjWzFACrxVWCANZpUaEZgB/0pdbhnTVQytx6ddg=";
}; };
in { in
{
imports = [ imports = [
# We include it to ensure the bridge functionality # We include it to ensure the bridge functionality
# is available on the target kernel. # is available on the target kernel.
@ -201,7 +209,8 @@
networkInterfaces = networkInterfaces =
let let
inherit (config.system.service.network) link; inherit (config.system.service.network) link;
in { in
{
eth = link.build { ifname = "eth0"; }; eth = link.build { ifname = "eth0"; };
lan = link.build { ifname = "lan"; }; lan = link.build { ifname = "lan"; };
wlan0 = link.build { wlan0 = link.build {
@ -253,7 +262,8 @@
extraPatchPhase = '' extraPatchPhase = ''
${openwrt.applyPatches.ramips} ${openwrt.applyPatches.ramips}
''; '';
config = { config =
{
RALINK = "y"; RALINK = "y";
PCI = "y"; PCI = "y";
@ -348,9 +358,11 @@
LEDS_BRIGHTNESS_HW_CHANGED = "y"; LEDS_BRIGHTNESS_HW_CHANGED = "y";
PRINTK_TIME = "y"; PRINTK_TIME = "y";
} // lib.optionalAttrs (config.system.service ? vlan) { }
// lib.optionalAttrs (config.system.service ? vlan) {
SWCONFIG = "y"; SWCONFIG = "y";
} // lib.optionalAttrs (config.system.service ? watchdog) { }
// lib.optionalAttrs (config.system.service ? watchdog) {
RALINK_WDT = "y"; # watchdog RALINK_WDT = "y"; # watchdog
MT7621_WDT = "y"; # or it might be this one MT7621_WDT = "y"; # or it might be this one
}; };

29
doc/extract-options.nix
View File

@ -1,4 +1,8 @@
{ eval, lib, pkgs }: {
eval,
lib,
pkgs,
}:
let let
conf = eval.config; conf = eval.config;
rootDir = builtins.toPath ./..; rootDir = builtins.toPath ./..;
@ -7,21 +11,24 @@ let
inherit name; inherit name;
description = opt.description or null; description = opt.description or null;
default = opt.default or null; default = opt.default or null;
visible = visible = if (opt ? visible && opt.visible == "shallow") then true else opt.visible or true;
if (opt ? visible && opt.visible == "shallow")
then true
else opt.visible or true;
readOnly = opt.readOnly or false; readOnly = opt.readOnly or false;
type = opt.type.description or "unspecified"; type = opt.type.description or "unspecified";
}; };
spliceServiceDefn = item : spliceServiceDefn =
if item.type == "parametrisable s6-rc service definition" item:
then if item.type == "parametrisable s6-rc service definition" then
let sd = lib.attrByPath item.loc ["not found"] conf; let
in item // { sd = lib.attrByPath item.loc [ "not found" ] conf;
in
item
// {
declarations = map stripAnyPrefixes item.declarations; declarations = map stripAnyPrefixes item.declarations;
parameters = parameters =
let x = lib.mapAttrsToList optToDoc sd.parameters; in x; let
x = lib.mapAttrsToList optToDoc sd.parameters;
in
x;
} }
else else
item // { declarations = map stripAnyPrefixes item.declarations; }; item // { declarations = map stripAnyPrefixes item.declarations; };

26
examples/arhcive.nix
View File

@ -9,13 +9,15 @@
pkgs, pkgs,
lib, lib,
... ...
}: let }:
let
secrets = import ./extneder-secrets.nix; secrets = import ./extneder-secrets.nix;
inherit (pkgs.liminix.services) oneshot longrun target; inherit (pkgs.liminix.services) oneshot longrun target;
inherit (pkgs.pseudofile) dir symlink; inherit (pkgs.pseudofile) dir symlink;
inherit (pkgs) writeText serviceFns; inherit (pkgs) writeText serviceFns;
svc = config.system.service; svc = config.system.service;
in rec { in
rec {
boot = { boot = {
tftp = { tftp = {
serverip = "10.0.0.1"; serverip = "10.0.0.1";
@ -34,10 +36,11 @@ in rec {
]; ];
hostname = "arhcive"; hostname = "arhcive";
services.dhcpc = services.dhcpc =
let iface = config.hardware.networkInterfaces.lan; let
in svc.network.dhcp.client.build { iface = config.hardware.networkInterfaces.lan;
in
svc.network.dhcp.client.build {
interface = iface; interface = iface;
dependencies = [ config.services.hostname ]; dependencies = [ config.services.hostname ];
}; };
@ -45,7 +48,10 @@ in rec {
services.sshd = svc.ssh.build { }; services.sshd = svc.ssh.build { };
services.watchdog = svc.watchdog.build { services.watchdog = svc.watchdog.build {
watched = with config.services ; [ sshd dhcpc ]; watched = with config.services; [
sshd
dhcpc
];
}; };
services.resolvconf = oneshot rec { services.resolvconf = oneshot rec {
@ -73,7 +79,10 @@ in rec {
}; };
programs.busybox = { programs.busybox = {
applets = ["lsusb" "tar"]; applets = [
"lsusb"
"tar"
];
options = { options = {
FEATURE_LS_TIMESTAMPS = "y"; FEATURE_LS_TIMESTAMPS = "y";
FEATURE_LS_SORTFILES = "y"; FEATURE_LS_SORTFILES = "y";
@ -108,7 +117,8 @@ in rec {
gid = backup gid = backup
secrets file = ${secrets_file}/.outputs/secrets secrets file = ${secrets_file}/.outputs/secrets
''; '';
in longrun { in
longrun {
name = "rsync"; name = "rsync";
run = '' run = ''
${pkgs.rsyncSmall}/bin/rsync --no-detach --daemon --config=${configFile} ${pkgs.rsyncSmall}/bin/rsync --no-detach --daemon --config=${configFile}

31
examples/demo.nix
View File

@ -14,7 +14,8 @@ let
ipv4LocalNet = "10.8.0"; ipv4LocalNet = "10.8.0";
svc = config.system.service; svc = config.system.service;
in rec { in
rec {
boot = { boot = {
tftp = { tftp = {
freeSpaceBytes = 3 * 1024 * 1024; freeSpaceBytes = 3 * 1024 * 1024;
@ -99,8 +100,10 @@ in rec {
}; };
services.dns = services.dns =
let interface = services.int; let
in svc.dnsmasq.build { interface = services.int;
in
svc.dnsmasq.build {
resolvconf = services.resolvconf; resolvconf = services.resolvconf;
inherit interface; inherit interface;
ranges = [ ranges = [
@ -124,12 +127,16 @@ in rec {
services.wan = svc.pppoe.build { services.wan = svc.pppoe.build {
interface = config.hardware.networkInterfaces.wan; interface = config.hardware.networkInterfaces.wan;
ppp-options = [ ppp-options = [
"debug" "+ipv6" "noauth" "debug"
"+ipv6"
"noauth"
# EDIT: change the strings "chap-username" # EDIT: change the strings "chap-username"
# and "chap-secret" to match the username/password # and "chap-secret" to match the username/password
# provided by your ISP for PPP logins # provided by your ISP for PPP logins
"name" "chap-username" "name"
"password" "chap-secret" "chap-username"
"password"
"chap-secret"
]; ];
}; };
@ -146,8 +153,10 @@ in rec {
}; };
filesystem = filesystem =
let inherit (pkgs.pseudofile) dir symlink; let
in dir { inherit (pkgs.pseudofile) dir symlink;
in
dir {
etc = dir { etc = dir {
"resolv.conf" = symlink "${services.resolvconf}/.outputs/resolv.conf"; "resolv.conf" = symlink "${services.resolvconf}/.outputs/resolv.conf";
}; };
@ -176,10 +185,12 @@ in rec {
# LAN interfaces respectively. # LAN interfaces respectively.
services.dhcp6c = services.dhcp6c =
let client = svc.dhcp6c.client.build { let
client = svc.dhcp6c.client.build {
interface = services.wan; interface = services.wan;
}; };
in bundle { in
bundle {
name = "dhcp6c"; name = "dhcp6c";
contents = [ contents = [
(svc.dhcp6c.prefix.build { (svc.dhcp6c.prefix.build {

13
examples/extneder.nix
View File

@ -10,10 +10,12 @@
lib, lib,
modulesPath, modulesPath,
... ...
}: let }:
let
secrets = import ./extneder-secrets.nix; secrets = import ./extneder-secrets.nix;
svc = config.system.service; svc = config.system.service;
in rec { in
rec {
boot = { boot = {
tftp = { tftp = {
serverip = "192.168.8.148"; serverip = "192.168.8.148";
@ -49,5 +51,10 @@ in rec {
services.sshd = svc.ssh.build { }; services.sshd = svc.ssh.build { };
users.root.passwd = lib.mkForce secrets.root.passwd; users.root.passwd = lib.mkForce secrets.root.passwd;
defaultProfile.packages = with pkgs; [nftables strace tcpdump swconfig]; defaultProfile.packages = with pkgs; [
nftables
strace
tcpdump
swconfig
];
} }

3
examples/hello-from-mt300.nix
View File

@ -2,7 +2,8 @@
let let
svc = config.system.service; svc = config.system.service;
in rec { in
rec {
imports = [ imports = [
../modules/network ../modules/network
../modules/ssh ../modules/ssh

13
examples/hello-from-qemu.nix
View File

@ -2,7 +2,8 @@
let let
svc = config.system.service; svc = config.system.service;
in rec { in
rec {
imports = [ imports = [
../modules/network ../modules/network
../modules/dnsmasq ../modules/dnsmasq
@ -14,7 +15,9 @@ in rec {
# configure the internal network (LAN) with an address # configure the internal network (LAN) with an address
services.int = svc.network.address.build { services.int = svc.network.address.build {
interface = config.hardware.networkInterfaces.lan; interface = config.hardware.networkInterfaces.lan;
family = "inet"; address ="10.3.0.1"; prefixLength = 16; family = "inet";
address = "10.3.0.1";
prefixLength = 16;
}; };
services.sshd = svc.ssh.build { }; services.sshd = svc.ssh.build { };
@ -26,8 +29,10 @@ in rec {
}; };
services.dns = services.dns =
let interface = services.int; let
in svc.dnsmasq.build { interface = services.int;
in
svc.dnsmasq.build {
inherit interface; inherit interface;
ranges = [ ranges = [
"10.3.0.10,10.3.0.240" "10.3.0.10,10.3.0.240"

12
examples/module-https-proxy.nix
View File

@ -22,10 +22,12 @@ let
inherit (pkgs.liminix.services) longrun; inherit (pkgs.liminix.services) longrun;
inherit (pkgs) writeText; inherit (pkgs) writeText;
nginx_uid = 62; nginx_uid = 62;
in { in
{
config = { config = {
users.nginx = { users.nginx = {
uid = nginx_uid; gid= nginx_uid; uid = nginx_uid;
gid = nginx_uid;
dir = "/run/"; dir = "/run/";
shell = "/bin/false"; shell = "/bin/false";
}; };
@ -41,7 +43,8 @@ in {
zlib = null; zlib = null;
options = [ options = [
"stream" "stream"
"stream_ssl_module" "stream_ssl_preread_module" "stream_ssl_module"
"stream_ssl_preread_module"
"stream_map_module" "stream_map_module"
]; ];
}; };
@ -72,7 +75,8 @@ in {
} }
} }
''; '';
in longrun { in
longrun {
name = "sniproxy"; name = "sniproxy";
run = '' run = ''
${nginx}/bin/nginx -c ${conf} ${nginx}/bin/nginx -c ${conf}

28
examples/nwa50ax-ap.nix
View File

@ -43,13 +43,16 @@ let
he_oper_centr_freq_seg0_idx = 42; he_oper_centr_freq_seg0_idx = 42;
require_vht = 1; require_vht = 1;
}; };
mkWifiSta = params: interface: secrets: svc.hostapd.build { mkWifiSta =
params: interface: secrets:
svc.hostapd.build {
inherit interface; inherit interface;
params = params // { params = params // {
inherit (secrets) ssid wpa_passphrase; inherit (secrets) ssid wpa_passphrase;
}; };
}; };
in rec { in
rec {
imports = [ imports = [
../modules/wlan.nix ../modules/wlan.nix
../modules/network ../modules/network
@ -87,8 +90,10 @@ in rec {
}; };
services.dhcpv4 = services.dhcpv4 =
let iface = services.int; let
in svc.network.dhcp.client.build { interface = iface; }; iface = services.int;
in
svc.network.dhcp.client.build { interface = iface; };
services.defaultroute4 = svc.network.route.build { services.defaultroute4 = svc.network.route.build {
via = "$(output ${services.dhcpv4} address)"; via = "$(output ${services.dhcpv4} address)";
@ -102,7 +107,9 @@ in rec {
}; };
services.ntp = config.system.service.ntp.build { services.ntp = config.system.service.ntp.build {
pools = { "pool.ntp.org" = ["iburst"] ; }; pools = {
"pool.ntp.org" = [ "iburst" ];
};
}; };
boot.tftp = { boot.tftp = {
@ -113,7 +120,14 @@ in rec {
# wlan0 is the 2.4GHz interface. # wlan0 is the 2.4GHz interface.
services.hostap-1 = mkWifiSta baseParams config.hardware.networkInterfaces.wlan0 secrets-1; services.hostap-1 = mkWifiSta baseParams config.hardware.networkInterfaces.wlan0 secrets-1;
# wlan1 is the 5GHz interface, e.g. AX capable. # wlan1 is the 5GHz interface, e.g. AX capable.
services.hostap-2 = mkWifiSta (baseParams // modernParams) config.hardware.networkInterfaces.wlan1 secrets-2; services.hostap-2 = mkWifiSta (
baseParams // modernParams
) config.hardware.networkInterfaces.wlan1 secrets-2;
defaultProfile.packages = with pkgs; [ zyxel-bootconfig iw min-collect-garbage mtdutils ]; defaultProfile.packages = with pkgs; [
zyxel-bootconfig
iw
min-collect-garbage
mtdutils
];
} }

26
examples/recovery.nix
View File

@ -1,4 +1,9 @@
{ config, pkgs, lib, ... } : {
config,
pkgs,
lib,
...
}:
let let
inherit (pkgs) serviceFns; inherit (pkgs) serviceFns;
svc = config.system.service; svc = config.system.service;
@ -9,7 +14,8 @@ let
cd ${pkgs.util-linux-small}/bin cd ${pkgs.util-linux-small}/bin
cp fdisk sfdisk mkswap $out/bin cp fdisk sfdisk mkswap $out/bin
''; '';
in rec { in
rec {
imports = [ imports = [
../modules/network ../modules/network
../modules/ssh ../modules/ssh
@ -67,7 +73,11 @@ in rec {
''; '';
}; };
services.growfs = let name = "growfs"; in oneshot { services.growfs =
let
name = "growfs";
in
oneshot {
inherit name; inherit name;
up = '' up = ''
device=$(grep /persist /proc/1/mountinfo | cut -f9 -d' ') device=$(grep /persist /proc/1/mountinfo | cut -f9 -d' ')
@ -92,13 +102,13 @@ in rec {
# create this hashed password string # create this hashed password string
passwd = "$6$y7WZ5hM6l5nriLmo$5AJlmzQZ6WA.7uBC7S8L4o19ESR28Dg25v64/vDvvCN01Ms9QoHeGByj8lGlJ4/b.dbwR9Hq2KXurSnLigt1W1"; passwd = "$6$y7WZ5hM6l5nriLmo$5AJlmzQZ6WA.7uBC7S8L4o19ESR28Dg25v64/vDvvCN01Ms9QoHeGByj8lGlJ4/b.dbwR9Hq2KXurSnLigt1W1";
openssh.authorizedKeys.keys = openssh.authorizedKeys.keys =
let fromBuild = let
(builtins.readFile fromBuild = (
((builtins.toPath (builtins.getEnv "HOME")) + "/.ssh/authorized_keys") builtins.readFile ((builtins.toPath (builtins.getEnv "HOME")) + "/.ssh/authorized_keys")
); );
in lib.splitString "\n" fromBuild; in
lib.splitString "\n" fromBuild;
}; };
defaultProfile.packages = with pkgs; [ defaultProfile.packages = with pkgs; [

37
examples/rotuer.nix
View File

@ -4,7 +4,13 @@
# devices: mostly you will need to attend to the number of wlan and lan # devices: mostly you will need to attend to the number of wlan and lan
# interfaces # interfaces
{ config, pkgs, lib, modulesPath, ... } : {
config,
pkgs,
lib,
modulesPath,
...
}:
let let
secrets = { secrets = {
domainName = "fake.liminix.org"; domainName = "fake.liminix.org";
@ -17,7 +23,8 @@ let
wmm_enabled = 1; wmm_enabled = 1;
}; };
in rec { in
rec {
boot = { boot = {
tftp = { tftp = {
freeSpaceBytes = 3 * 1024 * 1024; freeSpaceBytes = 3 * 1024 * 1024;
@ -33,22 +40,26 @@ in rec {
profile.gateway = { profile.gateway = {
lan = { lan = {
interfaces = with config.hardware.networkInterfaces; interfaces = with config.hardware.networkInterfaces; [
[
# EDIT: these are the interfaces exposed by the gl.inet gl-ar750: # EDIT: these are the interfaces exposed by the gl.inet gl-ar750:
# if your device has more or differently named lan interfaces, # if your device has more or differently named lan interfaces,
# specify them here # specify them here
wlan wlan5 wlan
wlan5
lan lan
]; ];
inherit (secrets.lan) prefix; inherit (secrets.lan) prefix;
address = { address = {
family = "inet"; address ="${secrets.lan.prefix}.1"; prefixLength = 24; family = "inet";
address = "${secrets.lan.prefix}.1";
prefixLength = 24;
}; };
dhcp = { dhcp = {
start = 10; start = 10;
end = 240; end = 240;
hosts = { } // lib.optionalAttrs (builtins.pathExists ./static-leases.nix) (import ./static-leases.nix); hosts =
{ }
// lib.optionalAttrs (builtins.pathExists ./static-leases.nix) (import ./static-leases.nix);
localDomain = "lan"; localDomain = "lan";
}; };
}; };
@ -95,8 +106,13 @@ in rec {
}; };
services.ntp = svc.ntp.build { services.ntp = svc.ntp.build {
pools = { "pool.ntp.org" = ["iburst"]; }; pools = {
makestep = { threshold = 1.0; limit = 3; }; "pool.ntp.org" = [ "iburst" ];
};
makestep = {
threshold = 1.0;
limit = 3;
};
}; };
services.sshd = svc.ssh.build { }; services.sshd = svc.ssh.build { };
@ -113,7 +129,8 @@ in rec {
programs.busybox = { programs.busybox = {
applets = [ applets = [
"fdisk" "sfdisk" "fdisk"
"sfdisk"
]; ];
options = { options = {
FEATURE_FANCY_TAIL = "y"; FEATURE_FANCY_TAIL = "y";

71
examples/router-with-l2tp.nix
View File

@ -6,7 +6,8 @@
pkgs, pkgs,
lib, lib,
... ...
}: let }:
let
secrets = import ./extneder-secrets.nix; secrets = import ./extneder-secrets.nix;
rsecrets = import ./rotuer-secrets.nix; rsecrets = import ./rotuer-secrets.nix;
@ -27,7 +28,10 @@
# to start l2tp unless the expected lns address is one of the # to start l2tp unless the expected lns address is one of the
# addresses returned. I think this satisfies "do check the DNS" # addresses returned. I think this satisfies "do check the DNS"
lns = { hostname = "l2tp.aaisp.net.uk"; address = "194.4.172.12"; }; lns = {
hostname = "l2tp.aaisp.net.uk";
address = "194.4.172.12";
};
inherit (pkgs.liminix.services) oneshot longrun target; inherit (pkgs.liminix.services) oneshot longrun target;
inherit (pkgs.liminix) outputRef; inherit (pkgs.liminix) outputRef;
@ -39,7 +43,8 @@
inherit (rsecrets) wpa_passphrase; inherit (rsecrets) wpa_passphrase;
wmm_enabled = 1; wmm_enabled = 1;
}; };
in rec { in
rec {
boot = { boot = {
tftp = { tftp = {
serverip = "10.0.0.1"; serverip = "10.0.0.1";
@ -62,7 +67,9 @@ in rec {
services.wan-address-for-secrets = svc.network.address.build { services.wan-address-for-secrets = svc.network.address.build {
interface = config.hardware.networkInterfaces.wan; interface = config.hardware.networkInterfaces.wan;
family = "inet"; address ="10.0.0.10"; prefixLength = 24; family = "inet";
address = "10.0.0.10";
prefixLength = 24;
}; };
services.secrets = svc.secrets.outboard.build { services.secrets = svc.secrets.outboard.build {
@ -83,22 +90,26 @@ in rec {
profile.gateway = { profile.gateway = {
lan = { lan = {
interfaces = with config.hardware.networkInterfaces; interfaces = with config.hardware.networkInterfaces; [
[
# EDIT: these are the interfaces exposed by the gl.inet gl-ar750: # EDIT: these are the interfaces exposed by the gl.inet gl-ar750:
# if your device has more or differently named lan interfaces, # if your device has more or differently named lan interfaces,
# specify them here # specify them here
wlan wlan5 wlan
wlan5
lan lan
]; ];
inherit (rsecrets.lan) prefix; inherit (rsecrets.lan) prefix;
address = { address = {
family = "inet"; address ="${rsecrets.lan.prefix}.1"; prefixLength = 24; family = "inet";
address = "${rsecrets.lan.prefix}.1";
prefixLength = 24;
}; };
dhcp = { dhcp = {
start = 10; start = 10;
end = 240; end = 240;
hosts = { } // lib.optionalAttrs (builtins.pathExists ./static-leases.nix) (import ./static-leases.nix); hosts =
{ }
// lib.optionalAttrs (builtins.pathExists ./static-leases.nix) (import ./static-leases.nix);
localDomain = "lan"; localDomain = "lan";
}; };
}; };
@ -107,7 +118,8 @@ in rec {
secret = outputRef config.services.secrets; secret = outputRef config.services.secrets;
username = secret "ppp/username"; username = secret "ppp/username";
password = secret "ppp/password"; password = secret "ppp/password";
in { in
{
interface = interface =
let let
pppoe = svc.pppoe.build { pppoe = svc.pppoe.build {
@ -126,12 +138,19 @@ in rec {
route = svc.network.route.build { route = svc.network.route.build {
via = "$(output ${services.bootstrap-dhcpc} router)"; via = "$(output ${services.bootstrap-dhcpc} router)";
target = lns.address; target = lns.address;
dependencies = [services.bootstrap-dhcpc check-address]; dependencies = [
services.bootstrap-dhcpc
check-address
];
}; };
l2tpd = svc.l2tp.build { l2tpd = svc.l2tp.build {
lns = lns.address; lns = lns.address;
inherit username password; inherit username password;
dependencies = [config.services.lns-address route check-address]; dependencies = [
config.services.lns-address
route
check-address
];
}; };
in in
svc.health-check.build { svc.health-check.build {
@ -140,7 +159,8 @@ in rec {
interval = 2; interval = 2;
healthCheck = pkgs.writeAshScript "ping-check" { } "ping 1.1.1.1"; healthCheck = pkgs.writeAshScript "ping-check" { } "ping 1.1.1.1";
}; };
in svc.round-robin.build { in
svc.round-robin.build {
name = "wan"; name = "wan";
services = [ services = [
pppoe pppoe
@ -151,16 +171,20 @@ in rec {
}; };
wireless.networks = { wireless.networks = {
"${rsecrets.ssid}" = { "${rsecrets.ssid}" =
{
interface = config.hardware.networkInterfaces.wlan; interface = config.hardware.networkInterfaces.wlan;
hw_mode = "g"; hw_mode = "g";
channel = "6"; channel = "6";
ieee80211n = 1; ieee80211n = 1;
} // wirelessConfig // { }
// wirelessConfig
// {
wpa_passphrase = outputRef config.services.secrets "wpa_passphrase"; wpa_passphrase = outputRef config.services.secrets "wpa_passphrase";
}; };
"${rsecrets.ssid}5" = rec { "${rsecrets.ssid}5" =
rec {
interface = config.hardware.networkInterfaces.wlan5; interface = config.hardware.networkInterfaces.wlan5;
hw_mode = "a"; hw_mode = "a";
channel = 36; channel = 36;
@ -169,7 +193,9 @@ in rec {
vht_oper_centr_freq_seg0_idx = channel + 6; vht_oper_centr_freq_seg0_idx = channel + 6;
ieee80211n = 1; ieee80211n = 1;
ieee80211ac = 1; ieee80211ac = 1;
} // wirelessConfig // { }
// wirelessConfig
// {
wpa_passphrase = outputRef config.services.secrets "wpa_passphrase"; wpa_passphrase = outputRef config.services.secrets "wpa_passphrase";
}; };
}; };
@ -184,16 +210,21 @@ in rec {
authorizedKeys = outputRef config.services.secrets "ssh/authorizedKeys"; authorizedKeys = outputRef config.services.secrets "ssh/authorizedKeys";
}; };
services.lns-address = let services.lns-address =
let
ns = "$(output_word ${services.bootstrap-dhcpc} dns 1)"; ns = "$(output_word ${services.bootstrap-dhcpc} dns 1)";
route-to-bootstrap-nameserver = svc.network.route.build { route-to-bootstrap-nameserver = svc.network.route.build {
via = "$(output ${services.bootstrap-dhcpc} router)"; via = "$(output ${services.bootstrap-dhcpc} router)";
target = ns; target = ns;
dependencies = [ services.bootstrap-dhcpc ]; dependencies = [ services.bootstrap-dhcpc ];
}; };
in oneshot rec { in
oneshot rec {
name = "resolve-l2tp-server"; name = "resolve-l2tp-server";
dependencies = [ services.bootstrap-dhcpc route-to-bootstrap-nameserver ]; dependencies = [
services.bootstrap-dhcpc
route-to-bootstrap-nameserver
];
up = '' up = ''
(in_outputs ${name} (in_outputs ${name}
DNSCACHEIP="${ns}" ${pkgs.s6-dns}/bin/s6-dnsip4 ${lns.hostname} \ DNSCACHEIP="${ns}" ${pkgs.s6-dns}/bin/s6-dnsip4 ${lns.hostname} \

25
examples/turris.nix
View File

@ -1,8 +1,14 @@
{ config, pkgs, lim, ... } : {
config,
pkgs,
lim,
...
}:
let let
svc = config.system.service; svc = config.system.service;
in rec { in
rec {
imports = [ imports = [
../modules/network ../modules/network
../modules/ssh ../modules/ssh
@ -29,12 +35,14 @@ in rec {
hostname = "omnia"; hostname = "omnia";
services.hostap = services.hostap =
let secrets = { let
secrets = {
ssid = "not-the-internet"; ssid = "not-the-internet";
channel = 4; channel = 4;
wpa_passphrase = "diamond dogs"; wpa_passphrase = "diamond dogs";
}; };
in svc.hostapd.build { in
svc.hostapd.build {
interface = config.hardware.networkInterfaces.wlan; interface = config.hardware.networkInterfaces.wlan;
params = { params = {
country_code = "GB"; country_code = "GB";
@ -51,12 +59,14 @@ in rec {
}; };
services.hostap5 = services.hostap5 =
let secrets = { let
secrets = {
ssid = "not-the-internet"; ssid = "not-the-internet";
channel = 36; channel = 36;
wpa_passphrase = "diamond dogs"; wpa_passphrase = "diamond dogs";
}; };
in svc.hostapd.build { in
svc.hostapd.build {
interface = config.hardware.networkInterfaces.wlan5; interface = config.hardware.networkInterfaces.wlan5;
params = { params = {
country_code = "GB"; country_code = "GB";
@ -103,6 +113,7 @@ in rec {
}; };
defaultProfile.packages = with pkgs; [ defaultProfile.packages = with pkgs; [
figlet pciutils figlet
pciutils
]; ];
} }

7
modules/arch/aarch64.nix
View File

@ -1,4 +1,9 @@
{ lim, pkgs, config, ...}: {
lim,
pkgs,
config,
...
}:
{ {
config = { config = {
kernel.config = { kernel.config = {

7
modules/arch/arm.nix
View File

@ -1,4 +1,9 @@
{ lim, pkgs, config, ...}: {
lim,
pkgs,
config,
...
}:
{ {
config = { config = {
kernel.config = { kernel.config = {

87
modules/base.nix
View File

@ -1,15 +1,20 @@
## Base options ## Base options
## ============ ## ============
{
{ lib, pkgs, config, ...}: lib,
pkgs,
config,
...
}:
let let
inherit (lib) mkOption types; inherit (lib) mkOption types;
inherit (pkgs.pseudofile) dir symlink; inherit (pkgs.pseudofile) dir symlink;
type_service = pkgs.liminix.lib.types.service; type_service = pkgs.liminix.lib.types.service;
in { in
{
options = { options = {
defaultProfile = { defaultProfile = {
packages = mkOption { packages = mkOption {
@ -109,8 +114,13 @@ in {
}; };
}; };
config = { config = {
defaultProfile.packages = with pkgs; defaultProfile.packages = with pkgs; [
[ s6 s6-init-bin execline s6-linux-init s6-rc ]; s6
s6-init-bin
execline
s6-linux-init
s6-rc
];
boot.commandLine = [ boot.commandLine = [
"panic=10 oops=panic init=/bin/init loglevel=8" "panic=10 oops=panic init=/bin/init loglevel=8"
@ -119,61 +129,90 @@ in {
"fw_devlink=off" "fw_devlink=off"
] ++ lib.optional (config.rootOptions != null) "rootflags=${config.rootOptions}"; ] ++ lib.optional (config.rootOptions != null) "rootflags=${config.rootOptions}";
system.callService = path : parameters : system.callService =
path: parameters:
let let
typeChecked = caller: type: value: typeChecked =
caller: type: value:
let let
inherit (lib) types mergeDefinitions; inherit (lib) types mergeDefinitions;
defs = [{ file = caller; inherit value; }]; defs = [
{
file = caller;
inherit value;
}
];
type' = types.submodule { options = type; }; type' = types.submodule { options = type; };
in (mergeDefinitions [] type' defs).mergedValue; in
(mergeDefinitions [ ] type' defs).mergedValue;
cp = lib.callPackageWith (pkgs // { svc = config.system.service; }); cp = lib.callPackageWith (pkgs // { svc = config.system.service; });
pkg = cp path { }; pkg = cp path { };
checkTypes = t: p: typeChecked (builtins.toString path) t p; checkTypes = t: p: typeChecked (builtins.toString path) t p;
in { in
{
inherit parameters; inherit parameters;
build = { dependencies ? [], ... } @ args : build =
{
dependencies ? [ ],
...
}@args:
let let
s = pkg (checkTypes parameters s = pkg (checkTypes parameters (builtins.removeAttrs args [ "dependencies" ]));
(builtins.removeAttrs args ["dependencies"])); in
in s.overrideAttrs (o: { s.overrideAttrs (o: {
dependencies = dependencies ++ o.dependencies; dependencies = dependencies ++ o.dependencies;
buildInputs = dependencies ++ o.buildInputs; buildInputs = dependencies ++ o.buildInputs;
}); });
}; };
users.root = { users.root = {
uid = 0; gid= 0; gecos = "Root of all evaluation"; uid = 0;
gid = 0;
gecos = "Root of all evaluation";
dir = "/home/root/"; dir = "/home/root/";
passwd = lib.mkDefault ""; passwd = lib.mkDefault "";
shell = "/bin/sh"; shell = "/bin/sh";
}; };
groups = { groups = {
root = { root = {
gid = 0; usernames = ["root"]; gid = 0;
usernames = [ "root" ];
}; };
system = { system = {
gid = 1; usernames = ["root"]; gid = 1;
usernames = [ "root" ];
}; };
}; };
filesystem = dir { filesystem = dir {
dev = dev =
let node = type: major: minor: mode : { inherit type major minor mode; }; let
in dir { node = type: major: minor: mode: {
inherit
type
major
minor
mode
;
};
in
dir {
null = node "c" "1" "3" "0666"; null = node "c" "1" "3" "0666";
zero = node "c" "1" "5" "0666"; zero = node "c" "1" "5" "0666";
tty = node "c" "5" "0" "0666"; tty = node "c" "5" "0" "0666";
console = node "c" "5" "1" "0600"; console = node "c" "5" "1" "0600";
pts = dir { }; pts = dir { };
}; };
etc = let etc =
profile = symlink let
(pkgs.writeScript ".profile" '' profile = symlink (
pkgs.writeScript ".profile" ''
PATH=${lib.makeBinPath config.defaultProfile.packages}:/bin PATH=${lib.makeBinPath config.defaultProfile.packages}:/bin
export PATH export PATH
''); ''
in dir { );
in
dir {
inherit profile; inherit profile;
ashrc = profile; ashrc = profile;
}; };

14
modules/bridge/default.nix
View File

@ -6,8 +6,12 @@
## with one or more WLANs so that several local devices appear to be ## with one or more WLANs so that several local devices appear to be
## on the same network. ## on the same network.
{
{ lib, pkgs, config, ...}: lib,
pkgs,
config,
...
}:
let let
inherit (lib) mkOption types; inherit (lib) mkOption types;
inherit (pkgs) liminix; inherit (pkgs) liminix;
@ -40,10 +44,12 @@ in
}; };
}; };
}; };
config.kernel.config = { config.kernel.config =
{
BRIDGE = "y"; BRIDGE = "y";
BRIDGE_IGMP_SNOOPING = "y"; BRIDGE_IGMP_SNOOPING = "y";
} // lib.optionalAttrs (config.system.service ? vlan) { }
// lib.optionalAttrs (config.system.service ? vlan) {
# depends on bridge _and_ vlan. I would like there to be # depends on bridge _and_ vlan. I would like there to be
# a better way to test for the existence of vlan config: # a better way to test for the existence of vlan config:
# maybe the module should set an `enabled` attribute? # maybe the module should set an `enabled` attribute?

17
modules/bridge/members.nix
View File

@ -1,21 +1,25 @@
{ {
liminix liminix,
, ifwait ifwait,
, svc svc,
}: }:
{ members, primary }: { members, primary }:
let let
inherit (liminix.networking) interface; inherit (liminix.networking) interface;
inherit (liminix.services) bundle oneshot; inherit (liminix.services) bundle oneshot;
addif = member : addif =
member:
# how do we get sight of services from here? maybe we need to # how do we get sight of services from here? maybe we need to
# implement ifwait as a regualr derivation instead of a # implement ifwait as a regualr derivation instead of a
# servicedefinition # servicedefinition
svc.ifwait.build { svc.ifwait.build {
state = "running"; state = "running";
interface = member; interface = member;
dependencies = [ primary member ]; dependencies = [
primary
member
];
service = oneshot { service = oneshot {
name = "${primary.name}.member.${member.name}"; name = "${primary.name}.member.${member.name}";
up = '' up = ''
@ -24,7 +28,8 @@ let
down = "ip link set dev $(output ${member} ifname) nomaster"; down = "ip link set dev $(output ${member} ifname) nomaster";
}; };
}; };
in bundle { in
bundle {
name = "${primary.name}.members"; name = "${primary.name}.members";
contents = map addif members; contents = map addif members;
} }

7
modules/bridge/primary.nix
View File

@ -1,11 +1,12 @@
{ {
liminix liminix,
, lib lib,
}: }:
{ ifname }: { ifname }:
let let
inherit (liminix.services) oneshot; inherit (liminix.services) oneshot;
in oneshot rec { in
oneshot rec {
name = "${ifname}.link"; name = "${ifname}.link";
up = '' up = ''
ip link add name ${ifname} type bridge ip link add name ${ifname} type bridge

192
modules/busybox.nix
View File

@ -6,19 +6,26 @@
## the commands (termed "applets") required by the user or ## the commands (termed "applets") required by the user or
## by other included modules. ## by other included modules.
{ lib, pkgs, config, ...}: {
lib,
pkgs,
config,
...
}:
let let
inherit (lib) mkOption types mapAttrsToList; inherit (lib) mkOption types mapAttrsToList;
inherit (pkgs.pseudofile) dir symlink; inherit (pkgs.pseudofile) dir symlink;
inherit (lib.strings) toUpper; inherit (lib.strings) toUpper;
attrs = { options, applets } : attrs =
{ options, applets }:
let let
extraOptions = builtins.concatStringsSep "\n" extraOptions = builtins.concatStringsSep "\n" (
(mapAttrsToList (n: v: "CONFIG_${toUpper n} ${toString v}") options); mapAttrsToList (n: v: "CONFIG_${toUpper n} ${toString v}") options
appletOptions = builtins.concatStringsSep "\n" );
(map (n: "CONFIG_${toUpper n} y") applets); appletOptions = builtins.concatStringsSep "\n" (map (n: "CONFIG_${toUpper n} y") applets);
in { in
{
enableMinimal = true; enableMinimal = true;
extraConfig = '' extraConfig = ''
${extraOptions} ${extraOptions}
@ -26,36 +33,161 @@ let
''; '';
}; };
cfg = config.programs.busybox; cfg = config.programs.busybox;
busybox = pkgs.busybox.override (attrs { inherit (cfg) applets options; }); busybox = pkgs.busybox.override (attrs {
makeLinks = lib.attrsets.genAttrs inherit (cfg) applets options;
cfg.applets });
(a: symlink "${busybox}/bin/busybox"); makeLinks = lib.attrsets.genAttrs cfg.applets (a: symlink "${busybox}/bin/busybox");
minimalApplets = [ minimalApplets = [
# this is probably less minimal than it could be # this is probably less minimal than it could be
"arch" "ash" "base64" "basename" "bc" "brctl" "bunzip2" "bzcat" "bzip2" "arch"
"cal" "cat" "chattr" "chgrp" "chmod" "chown" "chpst" "chroot" "clear" "cmp" "ash"
"comm" "cp" "cpio" "cut" "date" "dhcprelay" "dd" "df" "dirname" "dmesg" "base64"
"du" "echo" "egrep" "env" "expand" "expr" "false" "fdisk" "fgrep" "find" "basename"
"free" "fuser" "grep" "gunzip" "gzip" "head" "hexdump" "hostname" "hwclock" "bc"
"ifconfig" "ip" "ipaddr" "iplink" "ipneigh" "iproute" "iprule" "kill" "brctl"
"killall" "killall5" "less" "ln" "ls" "lsattr" "lsof" "md5sum" "mkdir" "bunzip2"
"mknod" "mktemp" "mount" "mv" "nc" "netstat" "nohup" "od" "pgrep" "pidof" "bzcat"
"ping" "ping6" "pkill" "pmap" "printenv" "printf" "ps" "pwd" "readlink" "bzip2"
"realpath" "reset" "rm" "rmdir" "route" "sed" "seq" "setsid" "sha1sum" "cal"
"sha256sum" "sha512sum" "sleep" "sort" "stat" "strings" "stty" "su" "sum" "cat"
"swapoff" "swapon" "sync" "tail" "tee" "test" "time" "touch" "tr" "chattr"
"traceroute" "traceroute6" "true" "truncate" "tty" "udhcpc" "umount" "chgrp"
"uname" "unexpand" "uniq" "unlink" "unlzma" "unxz" "unzip" "uptime" "watch" "chmod"
"wc" "whoami" "xargs" "xxd" "xz" "xzcat" "yes" "zcat" "chown"
"chpst"
"chroot"
"clear"
"cmp"
"comm"
"cp"
"cpio"
"cut"
"date"
"dhcprelay"
"dd"
"df"
"dirname"
"dmesg"
"du"
"echo"
"egrep"
"env"
"expand"
"expr"
"false"
"fdisk"
"fgrep"
"find"
"free"
"fuser"
"grep"
"gunzip"
"gzip"
"head"
"hexdump"
"hostname"
"hwclock"
"ifconfig"
"ip"
"ipaddr"
"iplink"
"ipneigh"
"iproute"
"iprule"
"kill"
"killall"
"killall5"
"less"
"ln"
"ls"
"lsattr"
"lsof"
"md5sum"
"mkdir"
"mknod"
"mktemp"
"mount"
"mv"
"nc"
"netstat"
"nohup"
"od"
"pgrep"
"pidof"
"ping"
"ping6"
"pkill"
"pmap"
"printenv"
"printf"
"ps"
"pwd"
"readlink"
"realpath"
"reset"
"rm"
"rmdir"
"route"
"sed"
"seq"
"setsid"
"sha1sum"
"sha256sum"
"sha512sum"
"sleep"
"sort"
"stat"
"strings"
"stty"
"su"
"sum"
"swapoff"
"swapon"
"sync"
"tail"
"tee"
"test"
"time"
"touch"
"tr"
"traceroute"
"traceroute6"
"true"
"truncate"
"tty"
"udhcpc"
"umount"
"uname"
"unexpand"
"uniq"
"unlink"
"unlzma"
"unxz"
"unzip"
"uptime"
"watch"
"wc"
"whoami"
"xargs"
"xxd"
"xz"
"xzcat"
"yes"
"zcat"
]; ];
in { in
{
options = { options = {
programs.busybox = { programs.busybox = {
applets = mkOption { applets = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
description = "Applets required"; description = "Applets required";
default = [ ]; default = [ ];
example = ["sh" "getty" "login"]; example = [
"sh"
"getty"
"login"
];
}; };
options = mkOption { options = mkOption {
# mostly the values are y n or m, but sometimes # mostly the values are y n or m, but sometimes
@ -63,7 +195,9 @@ in {
description = "Other busybox config flags that do not map directly to applet names (often prefixed FEATURE_)"; description = "Other busybox config flags that do not map directly to applet names (often prefixed FEATURE_)";
type = types.attrsOf types.nonEmptyStr; type = types.attrsOf types.nonEmptyStr;
default = { }; default = { };
example = { FEATURE_DD_IBS_OBS = "y"; }; example = {
FEATURE_DD_IBS_OBS = "y";
};
}; };
}; };
}; };

14
modules/dhcp6c/acquire-delegated-prefix.nix
View File

@ -1,10 +1,14 @@
{ {
writeFennel writeFennel,
, linotify linotify,
, anoia anoia,
, lualinux lualinux,
}: }:
writeFennel "acquire-delegated-prefix" { writeFennel "acquire-delegated-prefix" {
packages = [ linotify anoia lualinux ]; packages = [
linotify
anoia
lualinux
];
mainFunction = "run"; mainFunction = "run";
} ./acquire-delegated-prefix.fnl } ./acquire-delegated-prefix.fnl

14
modules/dhcp6c/acquire-wan-address.nix
View File

@ -1,10 +1,14 @@
{ {
writeFennel writeFennel,
, linotify linotify,
, anoia anoia,
, lualinux lualinux,
}: }:
writeFennel "acquire-wan-address" { writeFennel "acquire-wan-address" {
packages = [ linotify anoia lualinux ]; packages = [
linotify
anoia
lualinux
];
mainFunction = "run"; mainFunction = "run";
} ./acquire-wan-address.fnl } ./acquire-wan-address.fnl

12
modules/dhcp6c/address.nix
View File

@ -1,14 +1,18 @@
{ {
liminix liminix,
, callPackage callPackage,
}: }:
{ client, interface }: { client, interface }:
let let
inherit (liminix.services) longrun; inherit (liminix.services) longrun;
name = "dhcp6c.addr.${client.name}.${interface.name}"; name = "dhcp6c.addr.${client.name}.${interface.name}";
script = callPackage ./acquire-wan-address.nix { }; script = callPackage ./acquire-wan-address.nix { };
in longrun { in
longrun {
inherit name; inherit name;
run = "${script} $SERVICE_OUTPUTS/${client.name} $(output ${interface} ifname)"; run = "${script} $SERVICE_OUTPUTS/${client.name} $(output ${interface} ifname)";
dependencies = [ client interface ]; dependencies = [
client
interface
];
} }

9
modules/dhcp6c/client.nix
View File

@ -1,13 +1,14 @@
{ {
liminix liminix,
, odhcp6c odhcp6c,
, odhcp-script odhcp-script,
}: }:
{ interface }: { interface }:
let let
inherit (liminix.services) longrun; inherit (liminix.services) longrun;
name = "dhcp6c.${interface.name}"; name = "dhcp6c.${interface.name}";
in longrun { in
longrun {
inherit name; inherit name;
notification-fd = 10; notification-fd = 10;
run = '' run = ''

7
modules/dhcp6c/default.nix
View File

@ -9,7 +9,12 @@
## addresses of network interfaces that you want to assign those ## addresses of network interfaces that you want to assign those
## prefixes to ## prefixes to
{ lib, pkgs, config, ...}: {
lib,
pkgs,
config,
...
}:
let let
inherit (lib) mkOption types; inherit (lib) mkOption types;
inherit (pkgs) liminix; inherit (pkgs) liminix;

12
modules/dhcp6c/prefix.nix
View File

@ -1,14 +1,18 @@
{ {
liminix liminix,
, callPackage callPackage,
}: }:
{ client, interface }: { client, interface }:
let let
inherit (liminix.services) longrun; inherit (liminix.services) longrun;
name = "dhcp6c.prefix.${client.name}.${interface.name}"; name = "dhcp6c.prefix.${client.name}.${interface.name}";
script = callPackage ./acquire-delegated-prefix.nix { }; script = callPackage ./acquire-delegated-prefix.nix { };
in longrun { in
longrun {
inherit name; inherit name;
run = "${script} $SERVICE_OUTPUTS/${client.name} $(output ${interface} ifname)"; run = "${script} $SERVICE_OUTPUTS/${client.name} $(output ${interface} ifname)";
dependencies = [ client interface ]; dependencies = [
client
interface
];
} }

29
modules/dnsmasq/default.nix
View File

@ -4,12 +4,17 @@
## This module includes a service to provide DNS, DHCP, and IPv6 ## This module includes a service to provide DNS, DHCP, and IPv6
## router advertisement for the local network. ## router advertisement for the local network.
{
{ lib, pkgs, config, ...}: lib,
pkgs,
config,
...
}:
let let
inherit (lib) mkOption types; inherit (lib) mkOption types;
inherit (pkgs) liminix; inherit (pkgs) liminix;
in { in
{
options = { options = {
system.service.dnsmasq = mkOption { system.service.dnsmasq = mkOption {
type = liminix.lib.types.serviceDefn; type = liminix.lib.types.serviceDefn;
@ -44,7 +49,8 @@ in {
}; };
hosts = mkOption { hosts = mkOption {
default = { }; default = { };
type = types.attrsOf (types.submodule { type = types.attrsOf (
types.submodule {
options = { options = {
mac = mkOption { mac = mkOption {
description = '' description = ''
@ -65,14 +71,18 @@ in {
type = types.listOf types.str; type = types.listOf types.str;
description = "IPv6 addresses or interface-ids to assign to this client"; description = "IPv6 addresses or interface-ids to assign to this client";
default = [ ]; default = [ ];
example = [ "fe80::42:1eff:fefd:b341" "::1234"]; example = [
"fe80::42:1eff:fefd:b341"
"::1234"
];
}; };
leasetime = mkOption { leasetime = mkOption {
type = types.int; type = types.int;
default = 86400; default = 86400;
}; };
}; };
}); }
);
}; };
domain = mkOption { domain = mkOption {
# this can be given multiple times so probably should be # this can be given multiple times so probably should be
@ -83,12 +93,15 @@ in {
}; };
}; };
users.dnsmasq = { users.dnsmasq = {
uid = 51; gid= 51; gecos = "DNS/DHCP service user"; uid = 51;
gid = 51;
gecos = "DNS/DHCP service user";
dir = "/run/dnsmasq"; dir = "/run/dnsmasq";
shell = "/bin/false"; shell = "/bin/false";
}; };
groups.dnsmasq = { groups.dnsmasq = {
gid = 51; usernames = ["dnsmasq"]; gid = 51;
usernames = [ "dnsmasq" ];
}; };
groups.system.usernames = [ "dnsmasq" ]; groups.system.usernames = [ "dnsmasq" ];
}; };

46
modules/dnsmasq/service.nix
View File

@ -1,26 +1,35 @@
{ {
liminix liminix,
, dnsmasq dnsmasq,
, serviceFns serviceFns,
, lib lib,
}: }:
{ {
interface interface,
, user user,
, domain domain,
, group group,
, ranges ranges,
, hosts hosts,
, upstreams upstreams,
, resolvconf resolvconf,
}: }:
let let
name = "${interface.name}.dnsmasq"; name = "${interface.name}.dnsmasq";
inherit (liminix.services) longrun; inherit (liminix.services) longrun;
inherit (lib) concatStrings concatStringsSep mapAttrsToList; inherit (lib) concatStrings concatStringsSep mapAttrsToList;
hostOpt = name : { mac, v4, v6, leasetime }: hostOpt =
let v6s = concatStrings (map (a : ",[${a}]") v6); name:
in "--dhcp-host=${mac},${v4}${v6s},${name},${builtins.toString leasetime}"; {
mac,
v4,
v6,
leasetime,
}:
let
v6s = concatStrings (map (a: ",[${a}]") v6);
in
"--dhcp-host=${mac},${v4}${v6s},${name},${builtins.toString leasetime}";
in in
longrun { longrun {
inherit name; inherit name;
@ -35,7 +44,12 @@ longrun {
${lib.concatStringsSep " " (builtins.map (r: "--server=${r}") upstreams)} \ ${lib.concatStringsSep " " (builtins.map (r: "--server=${r}") upstreams)} \
--keep-in-foreground \ --keep-in-foreground \
--dhcp-authoritative \ --dhcp-authoritative \
${if resolvconf != null then "--resolv-file=$(output_path ${resolvconf} resolv.conf)" else "--no-resolv"} \ ${
if resolvconf != null then
"--resolv-file=$(output_path ${resolvconf} resolv.conf)"
else
"--no-resolv"
} \
${lib.concatStringsSep " " (mapAttrsToList hostOpt hosts)} \ ${lib.concatStringsSep " " (mapAttrsToList hostOpt hosts)} \
--no-hosts \ --no-hosts \
--log-dhcp \ --log-dhcp \

19
modules/firewall/default-rules.nix
View File

@ -3,7 +3,8 @@ let
accept = expr: "${expr} accept"; accept = expr: "${expr} accept";
mcast-scope = 8; mcast-scope = 8;
allow-incoming = false; allow-incoming = false;
in { in
{
bogons-ip6 = { bogons-ip6 = {
type = "filter"; type = "filter";
family = "ip6"; family = "ip6";
@ -60,7 +61,8 @@ in {
(drop (drop
# dest addr first byte 0xff, low nibble of second byte <= scope # dest addr first byte 0xff, low nibble of second byte <= scope
# https://www.mankier.com/8/nft#Payload_Expressions-Raw_Payload_Expression # https://www.mankier.com/8/nft#Payload_Expressions-Raw_Payload_Expression
"@nh,192,8 eq 0xff @nh,204,4 le ${toString mcast-scope}") "@nh,192,8 eq 0xff @nh,204,4 le ${toString mcast-scope}"
)
(accept "oifname @lan iifname @wan meta l4proto udp ct state established,related") (accept "oifname @lan iifname @wan meta l4proto udp ct state established,related")
(accept "iifname @lan oifname @wan meta l4proto udp") (accept "iifname @lan oifname @wan meta l4proto udp")
@ -88,9 +90,11 @@ in {
# we can allow all reasonable inbound, or we can use an explicit # we can allow all reasonable inbound, or we can use an explicit
# allowlist to enumerate the endpoints that are allowed to # allowlist to enumerate the endpoints that are allowed to
# accept inbound from the WAN # accept inbound from the WAN
(if allow-incoming (
then accept "oifname @lan iifname @wan" if allow-incoming then
else "iifname @wan jump incoming-allowed-ip6" accept "oifname @lan iifname @wan"
else
"iifname @wan jump incoming-allowed-ip6"
) )
# allow all outbound and any inbound that's part of a # allow all outbound and any inbound that's part of a
# recognised (outbound-initiated) flow # recognised (outbound-initiated) flow
@ -130,10 +134,7 @@ in {
(accept "meta l4proto icmpv6") (accept "meta l4proto icmpv6")
"iifname @lan jump input-ip6-lan" "iifname @lan jump input-ip6-lan"
"iifname @wan jump input-ip6-wan" "iifname @wan jump input-ip6-wan"
(if allow-incoming (if allow-incoming then accept "iifname @wan" else "iifname @wan jump incoming-allowed-ip6")
then accept "iifname @wan"
else "iifname @wan jump incoming-allowed-ip6"
)
# how does this even make sense in an input chain? # how does this even make sense in an input chain?
(accept "iifname @wan ct state established,related") (accept "iifname @wan ct state established,related")
(accept "iifname @lan ") (accept "iifname @lan ")

26
modules/firewall/default.nix
View File

@ -4,7 +4,12 @@
## Provides a service to create an nftables ruleset based on ## Provides a service to create an nftables ruleset based on
## configuration supplied to it. ## configuration supplied to it.
{ lib, pkgs, config, ...}: {
lib,
pkgs,
config,
...
}:
let let
inherit (lib) mkOption types; inherit (lib) mkOption types;
inherit (pkgs) liminix; inherit (pkgs) liminix;
@ -54,7 +59,8 @@ in
}; };
config = { config = {
system.service.firewall = system.service.firewall =
let svc = config.system.callService ./service.nix { let
svc = config.system.callService ./service.nix {
extraRules = mkOption { extraRules = mkOption {
type = types.attrsOf types.attrs; type = types.attrsOf types.attrs;
description = "firewall ruleset"; description = "firewall ruleset";
@ -76,15 +82,21 @@ in
description = "firewall ruleset"; description = "firewall ruleset";
}; };
}; };
in svc // { in
build = args : svc
let args' = args // { // {
build =
args:
let
args' = args // {
dependencies = (args.dependencies or [ ]) ++ [ kmodules ]; dependencies = (args.dependencies or [ ]) ++ [ kmodules ];
}; };
in svc.build args' ; in
svc.build args';
}; };
programs.busybox.applets = [ programs.busybox.applets = [
"insmod" "rmmod" "insmod"
"rmmod"
]; ];
kernel.config = { kernel.config = {
NETFILTER = "y"; NETFILTER = "y";

41
modules/firewall/service.nix
View File

@ -1,37 +1,44 @@
{ {
liminix liminix,
, lib lib,
, firewallgen firewallgen,
, nftables nftables,
, writeFennel writeFennel,
, anoia anoia,
, lualinux lualinux,
, linotify linotify,
}:
{
rules,
extraRules,
zones,
}: }:
{ rules, extraRules, zones }:
let let
inherit (liminix.services) longrun; inherit (liminix.services) longrun;
inherit (lib.attrsets) mapAttrs' nameValuePair mapAttrsToList; inherit (lib.attrsets) mapAttrs' nameValuePair mapAttrsToList;
inherit (lib.strings) concatStringsSep; inherit (lib.strings) concatStringsSep;
inherit (lib.lists) flatten; inherit (lib.lists) flatten;
mkSet = family : name : mkSet =
nameValuePair family: name:
"${name}-set-${family}" nameValuePair "${name}-set-${family}" {
{
kind = "set"; kind = "set";
inherit name family; inherit name family;
type = "ifname"; type = "ifname";
}; };
sets = (mapAttrs' (n : _ : mkSet "ip" n) zones) // sets = (mapAttrs' (n: _: mkSet "ip" n) zones) // (mapAttrs' (n: _: mkSet "ip6" n) zones);
(mapAttrs' (n : _ : mkSet "ip6" n) zones);
allRules = lib.recursiveUpdate extraRules (lib.recursiveUpdate (builtins.trace sets sets) rules); allRules = lib.recursiveUpdate extraRules (lib.recursiveUpdate (builtins.trace sets sets) rules);
script = firewallgen "firewall1.nft" allRules; script = firewallgen "firewall1.nft" allRules;
ifwatch = writeFennel "ifwatch" { ifwatch = writeFennel "ifwatch" {
packages = [anoia lualinux linotify]; packages = [
anoia
lualinux
linotify
];
mainFunction = "run"; mainFunction = "run";
} ./ifwatch.fnl; } ./ifwatch.fnl;
watchArg = z: intfs: map (i: "${z}:${i}/.outputs") intfs; watchArg = z: intfs: map (i: "${z}:${i}/.outputs") intfs;
in longrun { in
longrun {
name = "firewall"; name = "firewall";
run = '' run = ''
${script} ${script}

16
modules/hardware.nix
View File

@ -75,9 +75,16 @@ in
type = types.ints.unsigned; type = types.ints.unsigned;
}; };
}; };
loadAddress = mkOption { type = types.ints.unsigned; default = null; }; loadAddress = mkOption {
type = types.ints.unsigned;
default = null;
};
entryPoint = mkOption { type = types.ints.unsigned; }; entryPoint = mkOption { type = types.ints.unsigned; };
alignment = mkOption { type = types.nullOr types.ints.unsigned; default = null; description = "Alignment passed to `mkimage` for FIT"; }; alignment = mkOption {
type = types.nullOr types.ints.unsigned;
default = null;
description = "Alignment passed to `mkimage` for FIT";
};
radios = mkOption { radios = mkOption {
description = '' description = ''
Kernel modules (from mac80211 package) required for the Kernel modules (from mac80211 package) required for the
@ -85,7 +92,10 @@ in
''; '';
type = types.listOf types.str; type = types.listOf types.str;
default = [ ]; default = [ ];
example = ["ath9k" "ath10k"]; example = [
"ath9k"
"ath10k"
];
}; };
rootDevice = mkOption { rootDevice = mkOption {
description = "Full path to preferred root device"; description = "Full path to preferred root device";

11
modules/health-check/default.nix
View File

@ -6,13 +6,18 @@
## have other behaviours by e.g. combining this service with a round-robin ## have other behaviours by e.g. combining this service with a round-robin
## for failover) ## for failover)
{
{ lib, pkgs, config, ...}: lib,
pkgs,
config,
...
}:
let let
inherit (lib) mkOption types; inherit (lib) mkOption types;
inherit (pkgs) liminix; inherit (pkgs) liminix;
in
# inherit (pkgs.liminix.services) longrun; # inherit (pkgs.liminix.services) longrun;
in { {
options = { options = {
system.service.health-check = mkOption { system.service.health-check = mkOption {
description = "run a service while periodically checking it is healthy"; description = "run a service while periodically checking it is healthy";

21
modules/health-check/service.nix
View File

@ -1,12 +1,24 @@
{ {
liminix, lib, lim, s6 liminix,
lib,
lim,
s6,
}:
{
service,
interval,
threshold,
healthCheck,
}: }:
{ service, interval, threshold, healthCheck } :
let let
inherit (liminix.services) oneshot longrun; inherit (liminix.services) oneshot longrun;
inherit (builtins) toString; inherit (builtins) toString;
inherit (service) name; inherit (service) name;
checker = let name' = "check-${name}"; in longrun { checker =
let
name' = "check-${name}";
in
longrun {
name = name'; name = name';
run = '' run = ''
fails=0 fails=0
@ -31,7 +43,8 @@ let
done done
''; '';
}; };
in service.overrideAttrs(o: { in
service.overrideAttrs (o: {
buildInputs = (lim.orEmpty o.buildInputs) ++ [ checker ]; buildInputs = (lim.orEmpty o.buildInputs) ++ [ checker ];
dependencies = (lim.orEmpty o.dependencies) ++ [ checker ]; dependencies = (lim.orEmpty o.dependencies) ++ [ checker ];
}) })

10
modules/hostapd/default.nix
View File

@ -11,11 +11,17 @@
## If you have more than one wireless network interface (e.g. ## If you have more than one wireless network interface (e.g.
## wlan0, wlan1) you can run an instance of hostapd on each of them. ## wlan0, wlan1) you can run an instance of hostapd on each of them.
{ lib, pkgs, config, ...}: {
lib,
pkgs,
config,
...
}:
let let
inherit (lib) mkOption types; inherit (lib) mkOption types;
inherit (pkgs) liminix; inherit (pkgs) liminix;
in { in
{
imports = [ ../secrets ]; imports = [ ../secrets ];
options = { options = {
system.service.hostapd = mkOption { system.service.hostapd = mkOption {

46
modules/hostapd/service.nix
View File

@ -1,16 +1,23 @@
{ {
liminix liminix,
, svc svc,
, hostapd hostapd,
, output-template output-template,
, writeText writeText,
, lib lib,
}: }:
{ interface, params }: { interface, params }:
let let
inherit (liminix.services) longrun; inherit (liminix.services) longrun;
inherit (lib) concatStringsSep mapAttrsToList unique; inherit (lib) concatStringsSep mapAttrsToList unique;
inherit (builtins) map filter attrValues length head typeOf; inherit (builtins)
map
filter
attrValues
length
head
typeOf
;
# This is not a friendly interface to configuring a wireless AP: it # This is not a friendly interface to configuring a wireless AP: it
# just passes everything straight through to the hostapd config. # just passes everything straight through to the hostapd config.
@ -27,19 +34,23 @@ let
ctrl_interface_group = 0; ctrl_interface_group = 0;
}; };
attrs = defaults // params; attrs = defaults // params;
literal_or_output = o: ({ literal_or_output =
o:
(
{
string = builtins.toJSON; string = builtins.toJSON;
int = builtins.toJSON; int = builtins.toJSON;
lambda = (o: "output(${builtins.toJSON (o "service")}, ${builtins.toJSON (o "path")})"); lambda = (o: "output(${builtins.toJSON (o "service")}, ${builtins.toJSON (o "path")})");
}.${builtins.typeOf o}) o; }
.${builtins.typeOf o}
)
o;
conf = conf = (
(writeText "hostapd.conf.in" writeText "hostapd.conf.in" (
((concatStringsSep (concatStringsSep "\n" (mapAttrsToList (n: v: "${n}={{ ${literal_or_output v} }}") attrs)) + "\n"
"\n" )
(mapAttrsToList );
(n : v : "${n}={{ ${literal_or_output v} }}")
attrs)) + "\n"));
service = longrun { service = longrun {
inherit name; inherit name;
dependencies = [ interface ]; dependencies = [ interface ];
@ -51,7 +62,8 @@ let
''; '';
}; };
watch = filter (f: typeOf f == "lambda") (attrValues attrs); watch = filter (f: typeOf f == "lambda") (attrValues attrs);
in svc.secrets.subscriber.build { in
svc.secrets.subscriber.build {
inherit service watch; inherit service watch;
action = "restart-all"; action = "restart-all";
} }

10
modules/hostname.nix
View File

@ -1,8 +1,14 @@
{ lib, pkgs, config, ...}: {
lib,
pkgs,
config,
...
}:
let let
inherit (lib) mkOption types; inherit (lib) mkOption types;
inherit (pkgs.liminix.services) oneshot; inherit (pkgs.liminix.services) oneshot;
in { in
{
options = { options = {
hostname = mkOption { hostname = mkOption {
description = '' description = ''

13
modules/ifwait/default.nix
View File

@ -1,10 +1,15 @@
{ config, pkgs, lib, ... } : {
config,
pkgs,
lib,
...
}:
let let
inherit (pkgs) liminix; inherit (pkgs) liminix;
inherit (lib) mkOption types; inherit (lib) mkOption types;
in { in
options.system.service.ifwait = {
mkOption { type = liminix.lib.types.serviceDefn; }; options.system.service.ifwait = mkOption { type = liminix.lib.types.serviceDefn; };
config.system.service.ifwait = config.system.callService ./ifwait.nix { config.system.service.ifwait = config.system.callService ./ifwait.nix {
state = mkOption { type = types.str; }; state = mkOption { type = types.str; };

9
modules/ifwait/ifwait.nix
View File

@ -1,12 +1,13 @@
{ ifwait, liminix }: { ifwait, liminix }:
{ {
state state,
, interface interface,
, service service,
}: }:
let let
inherit (liminix.services) longrun; inherit (liminix.services) longrun;
in longrun { in
longrun {
name = "ifwait.${interface.name}"; name = "ifwait.${interface.name}";
buildInputs = [ service ]; buildInputs = [ service ];
restart-on-upgrade = true; restart-on-upgrade = true;

41
modules/kernel/default.nix
View File

@ -3,26 +3,36 @@
## ##
## ##
{ lib, pkgs, config, ...}: {
lib,
pkgs,
config,
...
}:
let let
inherit (lib) mkOption types; inherit (lib) mkOption types;
inherit (pkgs) liminix openwrt; inherit (pkgs) liminix openwrt;
mergeConditionals = conf : conditions : mergeConditionals =
conf: conditions:
# for each key in conditions, if it is present in conf # for each key in conditions, if it is present in conf
# then merge the associated value into conf # then merge the associated value into conf
lib.foldlAttrs lib.foldlAttrs (
(acc: name: value: acc: name: value:
if (conf ? ${name}) && (conf.${name} != "n") if (conf ? ${name}) && (conf.${name} != "n") then acc // value else acc
then acc // value ) conf conditions;
else acc) in
conf {
conditions;
in {
options = { options = {
kernel = { kernel = {
src = mkOption { type = types.path; default = openwrt.kernelSrc; } ; src = mkOption {
version = mkOption { type = types.str; default = openwrt.kernelVersion;} ; type = types.path;
default = openwrt.kernelSrc;
};
version = mkOption {
type = types.str;
default = openwrt.kernelVersion;
};
modular = mkOption { modular = mkOption {
type = types.bool; type = types.bool;
default = true; default = true;
@ -70,10 +80,9 @@ in {
config = { config = {
system.outputs.kernel = system.outputs.kernel =
let let
mergedConfig = mergeConditionals mergedConfig = mergeConditionals config.kernel.config config.kernel.conditionalConfig;
config.kernel.config in
config.kernel.conditionalConfig; liminix.builders.kernel.override {
in liminix.builders.kernel.override {
config = mergedConfig; config = mergedConfig;
inherit (config.kernel) version src extraPatchPhase; inherit (config.kernel) version src extraPatchPhase;
targets = config.kernel.makeTargets; targets = config.kernel.makeTargets;

10
modules/klogd.nix
View File

@ -1,7 +1,13 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
let let
inherit (pkgs.liminix.services) longrun; inherit (pkgs.liminix.services) longrun;
in { in
{
config.services.klogd = longrun { config.services.klogd = longrun {
name = "klogd"; name = "klogd";
run = '' run = ''

10
modules/logging.nix
View File

@ -1,7 +1,13 @@
{ config, lib, ... }: { config, lib, ... }:
let let
inherit (lib) mkIf mkEnableOption mkOption types; inherit (lib)
in { mkIf
mkEnableOption
mkOption
types
;
in
{
options = { options = {
logging = { logging = {
persistent = { persistent = {

6
modules/mdevd.nix
View File

@ -1,6 +1,8 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let inherit (pkgs.liminix.services) oneshot longrun; let
in { inherit (pkgs.liminix.services) oneshot longrun;
in
{
config = { config = {
services = rec { services = rec {
mdevd = longrun { mdevd = longrun {

43
modules/mount/default.nix
View File

@ -2,21 +2,30 @@
## ##
## Mount filesystems ## Mount filesystems
{
{ lib, pkgs, config, ...}: lib,
pkgs,
config,
...
}:
let let
inherit (lib) mkOption types; inherit (lib) mkOption types;
inherit (pkgs) liminix; inherit (pkgs) liminix;
in { in
{
options = { options = {
system.service.mount = mkOption { system.service.mount = mkOption {
type = liminix.lib.types.serviceDefn; type = liminix.lib.types.serviceDefn;
}; };
}; };
imports = [ ../mdevd.nix ../uevent-rule ]; imports = [
../mdevd.nix
../uevent-rule
];
config.system.service.mount = config.system.service.mount =
let svc = config.system.callService ./service.nix { let
svc = config.system.callService ./service.nix {
partlabel = mkOption { partlabel = mkOption {
type = types.str; type = types.str;
example = "my-usb-stick"; example = "my-usb-stick";
@ -28,7 +37,11 @@ in {
options = mkOption { options = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = [ ]; default = [ ];
example = ["noatime" "ro" "sync"]; example = [
"noatime"
"ro"
"sync"
];
}; };
fstype = mkOption { fstype = mkOption {
type = types.str; type = types.str;
@ -36,19 +49,27 @@ in {
example = "vfat"; example = "vfat";
}; };
}; };
in svc // { in
build = args: svc
let args' = args // { // {
build =
args:
let
args' = args // {
dependencies = (args.dependencies or [ ]) ++ [ dependencies = (args.dependencies or [ ]) ++ [
config.services.mdevd config.services.mdevd
config.services.devout config.services.devout
]; ];
}; };
in svc.build args' ; in
svc.build args';
}; };
config.programs.busybox = { config.programs.busybox = {
applets = ["blkid" "findfs"]; applets = [
"blkid"
"findfs"
];
options = { options = {
FEATURE_BLKID_TYPE = "y"; FEATURE_BLKID_TYPE = "y";
FEATURE_MOUNT_FLAGS = "y"; FEATURE_MOUNT_FLAGS = "y";

19
modules/mount/service.nix
View File

@ -1,15 +1,19 @@
{ {
liminix liminix,
, lib lib,
, svc svc,
}:
{
partlabel,
mountpoint,
options,
fstype,
}: }:
{ partlabel, mountpoint, options, fstype }:
let let
inherit (liminix.services) oneshot; inherit (liminix.services) oneshot;
device = "/dev/disk/by-partlabel/${partlabel}"; device = "/dev/disk/by-partlabel/${partlabel}";
name = "mount.${lib.strings.sanitizeDerivationName (lib.escapeURL mountpoint)}"; name = "mount.${lib.strings.sanitizeDerivationName (lib.escapeURL mountpoint)}";
options_string = options_string = if options == [ ] then "" else "-o ${lib.concatStringsSep "," options}";
if options == [] then "" else "-o ${lib.concatStringsSep "," options}";
controller = svc.uevent-rule.build { controller = svc.uevent-rule.build {
serviceName = name; serviceName = name;
symlink = device; symlink = device;
@ -18,7 +22,8 @@ let
devtype = "partition"; devtype = "partition";
}; };
}; };
in oneshot { in
oneshot {
inherit name; inherit name;
timeout-up = 3600; timeout-up = 3600;
up = "mount -t ${fstype} ${options_string} ${device} ${mountpoint}"; up = "mount -t ${fstype} ${options_string} ${device} ${mountpoint}";

16
modules/network/address.nix
View File

@ -1,9 +1,14 @@
{ {
liminix liminix,
, serviceFns serviceFns,
, lib lib,
}:
{
interface,
family,
address,
prefixLength,
}: }:
{interface, family, address, prefixLength} :
let let
inherit (liminix.services) oneshot; inherit (liminix.services) oneshot;
# rather depending on the assumption that nobody will # rather depending on the assumption that nobody will
@ -20,7 +25,8 @@ let
echo $dev > ifname echo $dev > ifname
) )
''; '';
in oneshot { in
oneshot {
inherit name up; inherit name up;
down = "true"; # this has been broken for ~ ages down = "true"; # this has been broken for ~ ages
dependencies = [ interface ]; dependencies = [ interface ];

22
modules/network/default.nix
View File

@ -4,13 +4,18 @@
## Basic network services for creating hardware ethernet devices ## Basic network services for creating hardware ethernet devices
## and adding addresses ## and adding addresses
{
{ lib, pkgs, config, ...}: lib,
pkgs,
config,
...
}:
let let
inherit (lib) mkOption types; inherit (lib) mkOption types;
inherit (pkgs) liminix; inherit (pkgs) liminix;
inherit (pkgs.liminix.services) bundle; inherit (pkgs.liminix.services) bundle;
in { in
{
options = { options = {
system.service.network = { system.service.network = {
link = mkOption { link = mkOption {
@ -43,7 +48,8 @@ in {
let let
net = config.system.service.network; net = config.system.service.network;
iface = net.link.build { ifname = "lo"; }; iface = net.link.build { ifname = "lo"; };
in bundle { in
bundle {
name = "loopback"; name = "loopback";
contents = [ contents = [
(net.address.build { (net.address.build {
@ -82,7 +88,8 @@ in {
Path to the sysfs node of the device. If you provide this Path to the sysfs node of the device. If you provide this
and the ifname option, the device will be renamed to the and the ifname option, the device will be renamed to the
name given by ifname. name given by ifname.
''; }; '';
};
# other "ip link add" options could go here as well # other "ip link add" options could go here as well
mtu = mkOption { mtu = mkOption {
type = types.nullOr types.int; type = types.nullOr types.int;
@ -94,7 +101,10 @@ in {
type = liminix.lib.types.service; type = liminix.lib.types.service;
}; };
family = mkOption { family = mkOption {
type = types.enum [ "inet" "inet6" ]; type = types.enum [
"inet"
"inet6"
];
}; };
address = mkOption { address = mkOption {
type = types.str; type = types.str;

11
modules/network/dhcpc.nix
View File

@ -1,8 +1,8 @@
{ {
liminix liminix,
, writeAshScript writeAshScript,
, serviceFns serviceFns,
, lib lib,
}: }:
{ interface }: { interface }:
let let
@ -38,7 +38,8 @@ let
;; ;;
esac esac
''; '';
in longrun { in
longrun {
inherit name; inherit name;
run = "exec /bin/udhcpc -f -i $(output ${interface} ifname) -x hostname:$(cat /proc/sys/kernel/hostname) -s ${script}"; run = "exec /bin/udhcpc -f -i $(output ${interface} ifname) -x hostname:$(cat /proc/sys/kernel/hostname) -s ${script}";
notification-fd = 10; notification-fd = 10;

12
modules/network/forward.nix
View File

@ -1,6 +1,6 @@
{ {
liminix liminix,
, lib lib,
}: }:
{ enableIPv4, enableIPv6 }: { enableIPv4, enableIPv6 }:
let let
@ -8,11 +8,9 @@ let
ip4 = "/proc/sys/net/ipv4/conf/all/forwarding"; ip4 = "/proc/sys/net/ipv4/conf/all/forwarding";
ip6 = "/proc/sys/net/ipv6/conf/all/forwarding"; ip6 = "/proc/sys/net/ipv6/conf/all/forwarding";
opt = lib.optionalString; opt = lib.optionalString;
sysctls = b : sysctls = b: "" + opt enableIPv4 "echo ${b} > ${ip4}\n" + opt enableIPv6 "echo ${b} > ${ip6}\n";
"" in
+ opt enableIPv4 "echo ${b} > ${ip4}\n" oneshot {
+ opt enableIPv6 "echo ${b} > ${ip6}\n";
in oneshot {
name = "forwarding${opt enableIPv4 "4"}${opt enableIPv6 "6"}"; name = "forwarding${opt enableIPv4 "4"}${opt enableIPv6 "6"}";
up = sysctls "1"; up = sysctls "1";
down = sysctls "0"; down = sysctls "0";

22
modules/network/link.nix
View File

@ -1,23 +1,27 @@
{ {
liminix liminix,
, lib lib,
}: }:
{ {
ifname ifname,
, devpath ? null devpath ? null,
, mtu} : mtu,
}:
# if devpath is supplied, we rename the interface at that # if devpath is supplied, we rename the interface at that
# path to have the specified name. # path to have the specified name.
let let
inherit (liminix.services) oneshot; inherit (liminix.services) oneshot;
name = "${ifname}.link"; name = "${ifname}.link";
rename = if devpath != null rename =
then '' if devpath != null then
''
oldname=$(cd /sys${devpath} && cd net/ && echo *) oldname=$(cd /sys${devpath} && cd net/ && echo *)
ip link set ''${oldname} name ${ifname} ip link set ''${oldname} name ${ifname}
'' ''
else ""; else
in oneshot { "";
in
oneshot {
inherit name; inherit name;
up = '' up = ''
${rename} ${rename}

20
modules/network/route.nix
View File

@ -1,15 +1,25 @@
{ {
liminix liminix,
, lib lib,
}:
{
target,
via,
interface ? null,
metric,
}: }:
{ target, via, interface ? null, metric }:
let let
inherit (liminix.services) oneshot; inherit (liminix.services) oneshot;
with_dev = if interface != null then "dev $(output ${interface} ifname)" else ""; with_dev = if interface != null then "dev $(output ${interface} ifname)" else "";
target_hash = builtins.substring 0 12 (builtins.hashString "sha256" target); target_hash = builtins.substring 0 12 (builtins.hashString "sha256" target);
via_hash = builtins.substring 0 12 (builtins.hashString "sha256" via); via_hash = builtins.substring 0 12 (builtins.hashString "sha256" via);
in oneshot { in
name = "route-${target_hash}-${builtins.substring 0 12 (builtins.hashString "sha256" "${via_hash}-${if interface!=null then interface.name else ""}")}"; oneshot {
name = "route-${target_hash}-${
builtins.substring 0 12 (
builtins.hashString "sha256" "${via_hash}-${if interface != null then interface.name else ""}"
)
}";
up = '' up = ''
ip route add ${target} via ${via} metric ${toString metric} ${with_dev} ip route add ${target} via ${via} metric ${toString metric} ${with_dev}
''; '';

41
modules/ntp/default.nix
View File

@ -6,12 +6,18 @@
## optionally also provide time service to its peers. The ## optionally also provide time service to its peers. The
## implementation used in Liminix is Chrony ## implementation used in Liminix is Chrony
{ lib, pkgs, config, ...}: {
lib,
pkgs,
config,
...
}:
let let
inherit (lib) mkOption types; inherit (lib) mkOption types;
inherit (pkgs) liminix; inherit (pkgs) liminix;
serverOpts = types.listOf types.str; serverOpts = types.listOf types.str;
in { in
{
options = { options = {
system.service.ntp = mkOption { system.service.ntp = mkOption {
type = liminix.lib.types.serviceDefn; type = liminix.lib.types.serviceDefn;
@ -23,18 +29,31 @@ in {
type = types.str; type = types.str;
default = "ntp"; default = "ntp";
}; };
servers = mkOption { type = types.attrsOf serverOpts; default = {}; }; servers = mkOption {
pools = mkOption { type = types.attrsOf serverOpts; default = {}; }; type = types.attrsOf serverOpts;
peers = mkOption { type = types.attrsOf serverOpts; default = {}; }; default = { };
};
pools = mkOption {
type = types.attrsOf serverOpts;
default = { };
};
peers = mkOption {
type = types.attrsOf serverOpts;
default = { };
};
makestep = mkOption { makestep = mkOption {
default = null; default = null;
type = types.nullOr type = types.nullOr (
(types.submodule { types.submodule {
options = { options = {
threshold = mkOption { type = types.number; default = null;}; threshold = mkOption {
type = types.number;
default = null;
};
limit = mkOption { type = types.number; }; limit = mkOption { type = types.number; };
}; };
}); }
);
}; };
allow = mkOption { allow = mkOption {
description = "subnets from which NTP clients are allowed to access the server"; description = "subnets from which NTP clients are allowed to access the server";
@ -60,7 +79,9 @@ in {
}; };
}; };
users.ntp = { users.ntp = {
uid = 52; gid= 52; gecos = "Unprivileged NTP user"; uid = 52;
gid = 52;
gecos = "Unprivileged NTP user";
dir = "/run/ntp"; dir = "/run/ntp";
shell = "/bin/false"; shell = "/bin/false";
}; };

32
modules/ntp/service.nix
View File

@ -1,25 +1,23 @@
{ {
liminix liminix,
, chrony chrony,
, lib lib,
, writeText writeText,
}: }:
params: params:
let let
name = "ntp"; # bad name, needs to be unique name = "ntp"; # bad name, needs to be unique
inherit (liminix.services) longrun; inherit (liminix.services) longrun;
inherit (lib) concatStringsSep mapAttrsToList; inherit (lib) concatStringsSep mapAttrsToList;
configFile = p: configFile =
(mapAttrsToList (name: opts: "server ${name} ${concatStringsSep "" opts}") p:
p.servers) (mapAttrsToList (name: opts: "server ${name} ${concatStringsSep "" opts}") p.servers)
++ ++ (mapAttrsToList (name: opts: "pool ${name} ${concatStringsSep "" opts}") p.pools)
(mapAttrsToList (name: opts: "pool ${name} ${concatStringsSep "" opts}") ++ (mapAttrsToList (name: opts: "peer ${name} ${concatStringsSep "" opts}") p.peers)
p.pools)
++
(mapAttrsToList (name: opts: "peer ${name} ${concatStringsSep "" opts}")
p.peers)
++ lib.optional (p.user != null) "user ${p.user}" ++ lib.optional (p.user != null) "user ${p.user}"
++ (lib.optional (p.makestep != null) "makestep ${toString p.makestep.threshold} ${toString p.makestep.limit}") ++ (lib.optional (
p.makestep != null
) "makestep ${toString p.makestep.threshold} ${toString p.makestep.limit}")
++ (map (n: "allow ${n}") p.allow) ++ (map (n: "allow ${n}") p.allow)
++ (lib.optional (p.bindaddress != null) "bindaddress ${p.bindaddress}") ++ (lib.optional (p.bindaddress != null) "bindaddress ${p.bindaddress}")
++ (lib.optional (p.binddevice != null) "binddevice ${p.binddevice}") ++ (lib.optional (p.binddevice != null) "binddevice ${p.binddevice}")
@ -30,9 +28,9 @@ let
] ]
++ [ p.extraConfig ]; ++ [ p.extraConfig ];
config = writeText "chrony.conf" config = writeText "chrony.conf" (concatStringsSep "\n" (configFile params));
(concatStringsSep "\n" (configFile params)); in
in longrun { longrun {
inherit name; inherit name;
run = "${chrony}/bin/chronyd -f ${config} -d"; run = "${chrony}/bin/chronyd -f ${config} -d";
} }

17
modules/outputs.nix
View File

@ -105,7 +105,8 @@ in
rootdir = rootdir =
let let
inherit (pkgs.pkgsBuildBuild) runCommand; inherit (pkgs.pkgsBuildBuild) runCommand;
in runCommand "mktree" { } '' in
runCommand "mktree" { } ''
mkdir -p $out/nix/store/ $out/secrets $out/boot mkdir -p $out/nix/store/ $out/secrets $out/boot
cp ${o.systemConfiguration}/bin/activate $out/activate cp ${o.systemConfiguration}/bin/activate $out/activate
ln -s ${pkgs.s6-init-bin}/bin/init $out/init ln -s ${pkgs.s6-init-bin}/bin/init $out/init
@ -115,12 +116,16 @@ in
done done
''; '';
bootablerootdir = bootablerootdir =
let inherit (pkgs.pkgsBuildBuild) runCommand; let
in runCommand "add-slash-boot" { } '' inherit (pkgs.pkgsBuildBuild) runCommand;
in
runCommand "add-slash-boot" { } ''
cp -a ${o.rootdir} $out cp -a ${o.rootdir} $out
${if o.bootfiles != null ${
then "(cd $out && chmod -R +w . && rmdir boot && cp -a ${o.bootfiles} boot)" if o.bootfiles != null then
else "" "(cd $out && chmod -R +w . && rmdir boot && cp -a ${o.bootfiles} boot)"
else
""
} }
''; '';
manifest = writeText "manifest.json" (builtins.toJSON config.filesystem.contents); manifest = writeText "manifest.json" (builtins.toJSON config.filesystem.contents);

19
modules/outputs/boot-extlinux.nix
View File

@ -1,17 +1,24 @@
{ {
config config,
, pkgs pkgs,
, lib lib,
, ... ...
}: }:
let let
inherit (lib) mkIf mkEnableOption mkOption types concatStringsSep; inherit (lib)
mkIf
mkEnableOption
mkOption
types
concatStringsSep
;
inherit (pkgs.pseudofile) dir symlink; inherit (pkgs.pseudofile) dir symlink;
cfg = config.boot.loader.extlinux; cfg = config.boot.loader.extlinux;
o = config.system.outputs; o = config.system.outputs;
cmdline = concatStringsSep " " config.boot.commandLine; cmdline = concatStringsSep " " config.boot.commandLine;
wantsDtb = config.hardware.dts ? src && config.hardware.dts.src != null; wantsDtb = config.hardware.dts ? src && config.hardware.dts.src != null;
in { in
{
options.boot.loader.extlinux.enable = mkEnableOption "extlinux"; options.boot.loader.extlinux.enable = mkEnableOption "extlinux";
config = mkIf cfg.enable { config = mkIf cfg.enable {

19
modules/outputs/boot-fit.nix
View File

@ -1,17 +1,24 @@
{ {
config config,
, pkgs pkgs,
, lib lib,
, ... ...
}: }:
let let
inherit (lib) mkIf mkEnableOption mkOption types concatStringsSep; inherit (lib)
mkIf
mkEnableOption
mkOption
types
concatStringsSep
;
inherit (pkgs.pseudofile) dir symlink; inherit (pkgs.pseudofile) dir symlink;
cfg = config.boot.loader.fit; cfg = config.boot.loader.fit;
o = config.system.outputs; o = config.system.outputs;
cmdline = concatStringsSep " " config.boot.commandLine; cmdline = concatStringsSep " " config.boot.commandLine;
wantsDtb = config.hardware.dts ? src && config.hardware.dts.src != null; wantsDtb = config.hardware.dts ? src && config.hardware.dts.src != null;
in { in
{
options.boot.loader.fit.enable = mkEnableOption "FIT in /boot"; options.boot.loader.fit.enable = mkEnableOption "FIT in /boot";
config = mkIf cfg.enable { config = mkIf cfg.enable {

15
modules/outputs/btrfs.nix
View File

@ -1,8 +1,8 @@
{ {
config config,
, pkgs pkgs,
, lib lib,
, ... ...
}: }:
let let
inherit (lib) mkIf; inherit (lib) mkIf;
@ -21,9 +21,12 @@ in
rootfs = rootfs =
let let
inherit (pkgs.pkgsBuildBuild) runCommand e2fsprogs; inherit (pkgs.pkgsBuildBuild) runCommand e2fsprogs;
in runCommand "mkfs.btrfs" { in
runCommand "mkfs.btrfs"
{
depsBuildBuild = [ e2fsprogs ]; depsBuildBuild = [ e2fsprogs ];
} '' }
''
tree=${o.bootablerootdir} tree=${o.bootablerootdir}
size=$(du -s --apparent-size --block-size 1024 $tree |cut -f1) size=$(du -s --apparent-size --block-size 1024 $tree |cut -f1)
# add 25% for filesystem overhead # add 25% for filesystem overhead

15
modules/outputs/ext4fs.nix
View File

@ -1,8 +1,8 @@
{ {
config config,
, pkgs pkgs,
, lib lib,
, ... ...
}: }:
let let
inherit (lib) mkIf; inherit (lib) mkIf;
@ -23,9 +23,12 @@ in
rootfs = rootfs =
let let
inherit (pkgs.pkgsBuildBuild) runCommand e2fsprogs; inherit (pkgs.pkgsBuildBuild) runCommand e2fsprogs;
in runCommand "mkfs.ext4" { in
runCommand "mkfs.ext4"
{
depsBuildBuild = [ e2fsprogs ]; depsBuildBuild = [ e2fsprogs ];
} '' }
''
tree=${o.bootablerootdir} tree=${o.bootablerootdir}
size=$(du -s --apparent-size --block-size 1024 $tree |cut -f1) size=$(du -s --apparent-size --block-size 1024 $tree |cut -f1)
# add 25% for filesystem overhead # add 25% for filesystem overhead

21
modules/outputs/initramfs.nix
View File

@ -1,11 +1,16 @@
{ {
config config,
, pkgs pkgs,
, lib lib,
, ... ...
}: }:
let let
inherit (lib) mkEnableOption mkOption mkIf types; inherit (lib)
mkEnableOption
mkOption
mkIf
types
;
inherit (pkgs) runCommand; inherit (pkgs) runCommand;
in in
{ {
@ -34,8 +39,10 @@ in
system.outputs = { system.outputs = {
initramfs = initramfs =
let inherit (pkgs.pkgsBuildBuild) gen_init_cpio; let
in runCommand "initramfs.cpio" {} '' inherit (pkgs.pkgsBuildBuild) gen_init_cpio;
in
runCommand "initramfs.cpio" { } ''
cat << SPECIALS | ${gen_init_cpio}/bin/gen_init_cpio /dev/stdin > $out cat << SPECIALS | ${gen_init_cpio}/bin/gen_init_cpio /dev/stdin > $out
dir /proc 0755 0 0 dir /proc 0755 0 0
dir /dev 0755 0 0 dir /dev 0755 0 0

18
modules/outputs/jffs2.nix
View File

@ -1,8 +1,8 @@
{ {
config config,
, pkgs pkgs,
, lib lib,
, ... ...
}: }:
let let
inherit (lib) mkIf; inherit (lib) mkIf;
@ -27,11 +27,13 @@ in
rootfs = rootfs =
let let
inherit (pkgs.pkgsBuildBuild) runCommand mtdutils; inherit (pkgs.pkgsBuildBuild) runCommand mtdutils;
endian = if pkgs.stdenv.isBigEndian endian = if pkgs.stdenv.isBigEndian then "--big-endian" else "--little-endian";
then "--big-endian" else "--little-endian"; in
in runCommand "make-jffs2" { runCommand "make-jffs2"
{
depsBuildBuild = [ mtdutils ]; depsBuildBuild = [ mtdutils ];
} '' }
''
tree=${o.bootablerootdir} tree=${o.bootablerootdir}
(cd $tree && mkfs.jffs2 --compression-mode=size ${endian} -e ${toString config.hardware.flash.eraseBlockSize} --enable-compressor=lzo --pad --root . --output $out --squash --faketime ) (cd $tree && mkfs.jffs2 --compression-mode=size ${endian} -e ${toString config.hardware.flash.eraseBlockSize} --enable-compressor=lzo --pad --root . --output $out --squash --faketime )
''; '';

18
modules/outputs/mbrimage.nix
View File

@ -1,14 +1,15 @@
{ {
config config,
, pkgs pkgs,
, lib lib,
, ... ...
}: }:
let let
inherit (lib) mkOption types; inherit (lib) mkOption types;
o = config.system.outputs; o = config.system.outputs;
phram_address = lib.toHexString (config.hardware.ram.startAddress + 256 * 1024 * 1024); phram_address = lib.toHexString (config.hardware.ram.startAddress + 256 * 1024 * 1024);
in { in
{
options.system.outputs = { options.system.outputs = {
mbrimage = mkOption { mbrimage = mkOption {
type = types.package; type = types.package;
@ -28,9 +29,12 @@ in {
mbrimage = mbrimage =
let let
o = config.system.outputs; o = config.system.outputs;
in pkgs.runCommand "mbrimage" { in
pkgs.runCommand "mbrimage"
{
depsBuildBuild = [ pkgs.pkgsBuildBuild.util-linux ]; depsBuildBuild = [ pkgs.pkgsBuildBuild.util-linux ];
} '' }
''
# leave 4 sectors at start for partition table # leave 4 sectors at start for partition table
# and alignment to 2048 bytes (does that help?) # and alignment to 2048 bytes (does that help?)
dd if=${o.rootfs} of=$out bs=512 seek=4 conv=sync dd if=${o.rootfs} of=$out bs=512 seek=4 conv=sync

24
modules/outputs/mtdimage.nix
View File

@ -1,13 +1,14 @@
{ {
config config,
, pkgs pkgs,
, lib lib,
, ... ...
}: }:
let let
inherit (lib) mkOption types concatStringsSep; inherit (lib) mkOption types concatStringsSep;
inherit (config.boot) tftp; inherit (config.boot) tftp;
in { in
{
options.system.outputs = { options.system.outputs = {
firmware = mkOption { firmware = mkOption {
type = types.package; type = types.package;
@ -60,10 +61,12 @@ in {
config = { config = {
kernel = { kernel = {
config = { config =
{
# this needs to be conditional on "not qemu" # this needs to be conditional on "not qemu"
MTD_SPLIT_UIMAGE_FW = "y"; MTD_SPLIT_UIMAGE_FW = "y";
} // lib.optionalAttrs (pkgs.stdenv.isMips) { }
// lib.optionalAttrs (pkgs.stdenv.isMips) {
# https://stackoverflow.com/questions/26466470/can-the-logical-erase-block-size-of-an-mtd-device-be-increased # https://stackoverflow.com/questions/26466470/can-the-logical-erase-block-size-of-an-mtd-device-be-increased
MTD_SPI_NOR_USE_4K_SECTORS = "n"; MTD_SPI_NOR_USE_4K_SECTORS = "n";
}; };
@ -78,12 +81,15 @@ in {
let let
o = config.system.outputs; o = config.system.outputs;
bs = toString config.hardware.flash.eraseBlockSize; bs = toString config.hardware.flash.eraseBlockSize;
in pkgs.runCommand "firmware" {} '' in
pkgs.runCommand "firmware" { } ''
dd if=${o.uimage} of=$out bs=${bs} conv=sync dd if=${o.uimage} of=$out bs=${bs} conv=sync
dd if=${o.rootfs} of=$out bs=${bs} conv=sync,nocreat,notrunc oflag=append dd if=${o.rootfs} of=$out bs=${bs} conv=sync,nocreat,notrunc oflag=append
''; '';
mtdimage = mtdimage =
let o = config.system.outputs; in let
o = config.system.outputs;
in
# could use trivial-builders.linkFarmFromDrvs here? # could use trivial-builders.linkFarmFromDrvs here?
pkgs.runCommand "mtdimage" { } '' pkgs.runCommand "mtdimage" { } ''
mkdir $out mkdir $out

3
modules/outputs/squashfs.nix
View File

@ -10,8 +10,7 @@ let
in in
{ {
config = mkIf (config.rootfsType == "squashfs") { config = mkIf (config.rootfsType == "squashfs") {
system.outputs.rootfs = system.outputs.rootfs = liminix.builders.squashfs config.filesystem.contents;
liminix.builders.squashfs config.filesystem.contents;
kernel.config = { kernel.config = {
SQUASHFS = "y"; SQUASHFS = "y";
SQUASHFS_XZ = "y"; SQUASHFS_XZ = "y";

18
modules/outputs/system-configuration.nix
View File

@ -1,11 +1,16 @@
{ {
config config,
, pkgs pkgs,
, lib lib,
, ... ...
}: }:
let let
inherit (lib) mkEnableOption mkOption mkIf types; inherit (lib)
mkEnableOption
mkOption
mkIf
types
;
inherit (pkgs) runCommand; inherit (pkgs) runCommand;
in in
{ {
@ -22,7 +27,6 @@ in
}; };
}; };
config = { config = {
system.outputs.systemConfiguration = system.outputs.systemConfiguration = pkgs.systemconfig config.filesystem.contents;
pkgs.systemconfig config.filesystem.contents;
}; };
} }

74
modules/outputs/tftpboot.nix
View File

@ -1,15 +1,16 @@
{ {
config config,
, pkgs pkgs,
, lib lib,
, ... ...
}: }:
let let
inherit (lib) mkOption types concatStringsSep; inherit (lib) mkOption types concatStringsSep;
cfg = config.boot.tftp; cfg = config.boot.tftp;
hw = config.hardware; hw = config.hardware;
arch = pkgs.stdenv.hostPlatform.linuxArch; arch = pkgs.stdenv.hostPlatform.linuxArch;
in { in
{
imports = [ ../ramdisk.nix ]; imports = [ ../ramdisk.nix ];
options.boot.tftp = { options.boot.tftp = {
freeSpaceBytes = mkOption { freeSpaceBytes = mkOption {
@ -17,7 +18,10 @@ in {
default = 0; default = 0;
}; };
kernelFormat = mkOption { kernelFormat = mkOption {
type = types.enum [ "zimage" "uimage" ]; type = types.enum [
"zimage"
"uimage"
];
default = "uimage"; default = "uimage";
}; };
compressRoot = mkOption { compressRoot = mkOption {
@ -61,14 +65,22 @@ in {
assert config.rootfsType != "ubifs"; assert config.rootfsType != "ubifs";
let let
o = config.system.outputs; o = config.system.outputs;
image = let choices = { image =
let
choices = {
uimage = o.uimage; uimage = o.uimage;
zimage = o.kernel.zImage; zimage = o.kernel.zImage;
}; in choices.${cfg.kernelFormat}; };
bootCommand = let choices = { in
choices.${cfg.kernelFormat};
bootCommand =
let
choices = {
uimage = "bootm"; uimage = "bootm";
zimage = "bootz"; zimage = "bootz";
}; in choices.${cfg.kernelFormat}; };
in
choices.${cfg.kernelFormat};
cmdline = concatStringsSep " " config.boot.commandLine; cmdline = concatStringsSep " " config.boot.commandLine;
objcopy = "${pkgs.stdenv.cc.bintools.targetPrefix}objcopy"; objcopy = "${pkgs.stdenv.cc.bintools.targetPrefix}objcopy";
@ -77,7 +89,16 @@ in {
rm -f vmlinux.bin.lzma ; lzma -k -z vmlinux.bin rm -f vmlinux.bin.lzma ; lzma -k -z vmlinux.bin
''; '';
in in
pkgs.runCommand "tftpboot" { nativeBuildInputs = with pkgs.pkgsBuildBuild; [ lzma dtc pkgs.stdenv.cc ubootTools ]; } '' pkgs.runCommand "tftpboot"
{
nativeBuildInputs = with pkgs.pkgsBuildBuild; [
lzma
dtc
pkgs.stdenv.cc
ubootTools
];
}
''
mkdir $out mkdir $out
cd $out cd $out
binsize() { local s=$(stat -L -c %s $1); echo $(($s + 0x1000 &(~0xfff))); } binsize() { local s=$(stat -L -c %s $1); echo $(($s + 0x1000 &(~0xfff))); }
@ -97,14 +118,16 @@ in {
# end of the kernel is free # end of the kernel is free
dtbStart=$(($rootfsStart + $rootfsSize)) dtbStart=$(($rootfsStart + $rootfsSize))
${if cfg.compressRoot ${
then '' if cfg.compressRoot then
''
lzma -z9cv ${o.rootfs} > rootfs.lz lzma -z9cv ${o.rootfs} > rootfs.lz
rootfsLzStart=$dtbStart rootfsLzStart=$dtbStart
rootfsLzSize=$(binsize rootfs.lz) rootfsLzSize=$(binsize rootfs.lz)
dtbStart=$(($dtbStart + $rootfsLzSize)) dtbStart=$(($dtbStart + $rootfsLzSize))
'' ''
else '' else
''
ln -s ${o.rootfs} rootfs ln -s ${o.rootfs} rootfs
'' ''
} }
@ -128,7 +151,9 @@ in {
dtbSize=$(binsize ./dtb ) dtbSize=$(binsize ./dtb )
${if cfg.appendDTB then '' ${
if cfg.appendDTB then
''
imageStart=$dtbStart imageStart=$dtbStart
# re-package image with updated dtb # re-package image with updated dtb
cat ${o.kernel} > vmlinux.elf cat ${o.kernel} > vmlinux.elf
@ -138,25 +163,26 @@ in {
# dtc -I dtb -O dts -o /dev/stdout dtb | grep -A10 chosen ; exit 1 # dtc -I dtb -O dts -o /dev/stdout dtb | grep -A10 chosen ; exit 1
tftpcmd="tftpboot $(hex $imageStart) result/image " tftpcmd="tftpboot $(hex $imageStart) result/image "
bootcmd="bootm $(hex $imageStart)" bootcmd="bootm $(hex $imageStart)"
'' else '' ''
else
''
imageStart=$(($dtbStart + $dtbSize)) imageStart=$(($dtbStart + $dtbSize))
tftpcmd="tftpboot $(hex $imageStart) result/image; tftpboot $(hex $dtbStart) result/dtb " tftpcmd="tftpboot $(hex $imageStart) result/image; tftpboot $(hex $dtbStart) result/dtb "
ln -s ${image} image ln -s ${image} image
bootcmd="${bootCommand} $(hex $imageStart) - $(hex $dtbStart)" bootcmd="${bootCommand} $(hex $imageStart) - $(hex $dtbStart)"
''} ''
}
cat > boot.scr << EOF cat > boot.scr << EOF
setenv serverip ${cfg.serverip} setenv serverip ${cfg.serverip}
setenv ipaddr ${cfg.ipaddr} setenv ipaddr ${cfg.ipaddr}
${ ${
if cfg.compressRoot if cfg.compressRoot then
then "tftpboot $(hex $rootfsLzStart) result/rootfs.lz" "tftpboot $(hex $rootfsLzStart) result/rootfs.lz"
else "tftpboot $(hex $rootfsStart) result/rootfs" else
"tftpboot $(hex $rootfsStart) result/rootfs"
}; $tftpcmd }; $tftpcmd
${if cfg.compressRoot ${if cfg.compressRoot then "lzmadec $(hex $rootfsLzStart) $(hex $rootfsStart); " else ""} $bootcmd
then "lzmadec $(hex $rootfsLzStart) $(hex $rootfsStart); "
else ""
} $bootcmd
EOF EOF
''; '';

14
modules/outputs/tplink-safeloader.nix
View File

@ -1,14 +1,15 @@
{ {
config config,
, pkgs pkgs,
, lib lib,
, ... ...
}: }:
let let
inherit (lib) mkOption types; inherit (lib) mkOption types;
o = config.system.outputs; o = config.system.outputs;
cfg = config.tplink-safeloader; cfg = config.tplink-safeloader;
in { in
{
options.tplink-safeloader = { options.tplink-safeloader = {
board = mkOption { board = mkOption {
type = types.str; type = types.str;
@ -53,7 +54,8 @@ in {
config = { config = {
system.outputs = rec { system.outputs = rec {
tplink-safeloader = tplink-safeloader =
pkgs.runCommand "tplink" { nativeBuildInputs = with pkgs.pkgsBuildBuild; [ firmware-utils ]; } '' pkgs.runCommand "tplink" { nativeBuildInputs = with pkgs.pkgsBuildBuild; [ firmware-utils ]; }
''
tplink-safeloader -B "${cfg.board}" -k "${o.uimage}" -r "${o.rootfs}" -o $out tplink-safeloader -B "${cfg.board}" -k "${o.uimage}" -r "${o.rootfs}" -o $out
''; '';
}; };

15
modules/outputs/ubifs.nix
View File

@ -1,8 +1,8 @@
{ {
config config,
, pkgs pkgs,
, lib lib,
, ... ...
}: }:
let let
inherit (lib) mkIf mkOption types; inherit (lib) mkIf mkOption types;
@ -25,9 +25,12 @@ in
let let
inherit (pkgs.pkgsBuildBuild) runCommand mtdutils; inherit (pkgs.pkgsBuildBuild) runCommand mtdutils;
cfg = config.hardware.ubi; cfg = config.hardware.ubi;
in runCommand "mkfs.ubifs" { in
runCommand "mkfs.ubifs"
{
depsBuildBuild = [ mtdutils ]; depsBuildBuild = [ mtdutils ];
} '' }
''
mkdir tmp mkdir tmp
tree=${o.bootablerootdir} tree=${o.bootablerootdir}
mkfs.ubifs -x favor_lzo -c ${cfg.maxLEBcount} -m ${cfg.minIOSize} -e ${cfg.logicalEraseBlockSize} -y -r $tree --output $out --squash-uids -o $out mkfs.ubifs -x favor_lzo -c ${cfg.maxLEBcount} -m ${cfg.minIOSize} -e ${cfg.logicalEraseBlockSize} -y -r $tree --output $out --squash-uids -o $out

15
modules/outputs/ubimage.nix
View File

@ -1,8 +1,8 @@
{ {
config config,
, pkgs pkgs,
, lib lib,
, ... ...
}: }:
let let
inherit (lib) mkIf mkOption types; inherit (lib) mkIf mkOption types;
@ -14,7 +14,8 @@ let
tftpboot $loadaddr result/rootfs tftpboot $loadaddr result/rootfs
ubi write $loadaddr liminix $filesize ubi write $loadaddr liminix $filesize
''; '';
in { in
{
options.system.outputs = { options.system.outputs = {
ubimage = mkOption { ubimage = mkOption {
type = types.package; type = types.package;
@ -110,7 +111,9 @@ variable to change)
config.system.outputs.ubimage = config.system.outputs.ubimage =
assert config.rootfsType == "ubifs"; assert config.rootfsType == "ubifs";
let o = config.system.outputs; in let
o = config.system.outputs;
in
pkgs.runCommand "ubimage" { } '' pkgs.runCommand "ubimage" { } ''
mkdir $out mkdir $out
cd $out cd $out

45
modules/outputs/ubivolume.nix
View File

@ -1,11 +1,17 @@
{ {
config config,
, pkgs pkgs,
, lib lib,
, ... ...
}: }:
let let
inherit (lib) mkIf mkOption types concatStringsSep optionalString; inherit (lib)
mkIf
mkOption
types
concatStringsSep
optionalString
;
in in
{ {
imports = [ imports = [
@ -34,7 +40,13 @@ in
system.outputs.ubivolume = system.outputs.ubivolume =
let let
inherit (pkgs.pkgsBuildBuild) runCommand; inherit (pkgs.pkgsBuildBuild) runCommand;
ubiVolume = ({ name, volumeId, image, flags ? [] }: ubiVolume = (
{
name,
volumeId,
image,
flags ? [ ],
}:
'' ''
[${name}] [${name}]
mode=ubi mode=ubi
@ -51,26 +63,32 @@ in
${optionalString (flags != [ ]) '' ${optionalString (flags != [ ]) ''
vol_flags=${concatStringsSep "," flags} vol_flags=${concatStringsSep "," flags}
''} ''}
''); ''
);
ubiImage = (volumes: ubiImage = (
volumes:
let let
ubinizeConfig = pkgs.writeText "ubinize.conf" (concatStringsSep "\n" volumes); ubinizeConfig = pkgs.writeText "ubinize.conf" (concatStringsSep "\n" volumes);
inherit (pkgs.pkgsBuildBuild) mtdutils; inherit (pkgs.pkgsBuildBuild) mtdutils;
in in
runCommand "ubinize" { runCommand "ubinize"
{
depsBuildBuild = [ mtdutils ]; depsBuildBuild = [ mtdutils ];
# block size := 128kb # block size := 128kb
# page size := 2048 # page size := 2048
# ubninize opts := -E 5 # ubninize opts := -E 5
} '' }
''
ubinize -Q "$SOURCE_DATE_EPOCH" -o $out \ ubinize -Q "$SOURCE_DATE_EPOCH" -o $out \
-p ${config.hardware.ubi.physicalEraseBlockSize} -m ${config.hardware.ubi.minIOSize} \ -p ${config.hardware.ubi.physicalEraseBlockSize} -m ${config.hardware.ubi.minIOSize} \
-e ${config.hardware.ubi.logicalEraseBlockSize} \ -e ${config.hardware.ubi.logicalEraseBlockSize} \
${ubinizeConfig} ${ubinizeConfig}
''); ''
);
ubiDisk = ({ initramfs }: ubiDisk = (
{ initramfs }:
let let
initramfsUbi = ubiVolume { initramfsUbi = ubiVolume {
name = "rootfs"; name = "rootfs";
@ -81,7 +99,8 @@ in
in in
ubiImage [ ubiImage [
initramfsUbi initramfsUbi
]); ]
);
disk = ubiDisk { disk = ubiDisk {
initramfs = config.system.outputs.rootfs; # ??? initramfs = config.system.outputs.rootfs; # ???

11
modules/outputs/updater/default.nix
View File

@ -1,8 +1,8 @@
{ {
config config,
, pkgs pkgs,
, lib lib,
, ... ...
}: }:
let let
inherit (lib) mkIf; inherit (lib) mkIf;
@ -25,8 +25,7 @@ in
''; '';
}; };
config.system.outputs.updater = config.system.outputs.updater = runCommand "buildUpdater" { } ''
runCommand "buildUpdater" { } ''
mkdir -p $out/bin $out/etc mkdir -p $out/bin $out/etc
cp ${o.kernel.config} $out/etc/kconfig cp ${o.kernel.config} $out/etc/kconfig
substitute ${./update.sh} $out/bin/update.sh \ substitute ${./update.sh} $out/bin/update.sh \

21
modules/outputs/vmroot.nix
View File

@ -1,8 +1,8 @@
{ {
config config,
, pkgs pkgs,
, lib lib,
, ... ...
}: }:
let let
inherit (lib) mkOption types concatStringsSep; inherit (lib) mkOption types concatStringsSep;
@ -49,12 +49,15 @@ in
let let
inherit (config.system.outputs) rootfs kernel manifest; inherit (config.system.outputs) rootfs kernel manifest;
cmdline = builtins.toJSON (concatStringsSep " " config.boot.commandLine); cmdline = builtins.toJSON (concatStringsSep " " config.boot.commandLine);
makeBootableImage = pkgs.runCommandCC "objcopy" {} makeBootableImage = pkgs.runCommandCC "objcopy" { } (
(if pkgs.stdenv.hostPlatform.isAarch if pkgs.stdenv.hostPlatform.isAarch then
then "${pkgs.stdenv.cc.targetPrefix}objcopy -O binary -R .comment -S ${kernel} $out" "${pkgs.stdenv.cc.targetPrefix}objcopy -O binary -R .comment -S ${kernel} $out"
else "cp ${kernel} $out"); else
"cp ${kernel} $out"
);
phram_address = lib.toHexString (config.hardware.ram.startAddress + 256 * 1024 * 1024); phram_address = lib.toHexString (config.hardware.ram.startAddress + 256 * 1024 * 1024);
in pkgs.runCommand "vmroot" {} '' in
pkgs.runCommand "vmroot" { } ''
mkdir $out mkdir $out
cd $out cd $out
ln -s ${rootfs} rootfs ln -s ${rootfs} rootfs

22
modules/outputs/zyxel-nwa-fit.nix
View File

@ -1,13 +1,14 @@
{ {
config config,
, pkgs pkgs,
, lib lib,
, ... ...
}: }:
let let
inherit (lib) mkIf mkOption types; inherit (lib) mkIf mkOption types;
models = "6b e1 6f e1 ff ff ff ff ff ff"; models = "6b e1 6f e1 ff ff ff ff ff ff";
in { in
{
options.system.outputs = { options.system.outputs = {
zyxel-nwa-fit = mkOption { zyxel-nwa-fit = mkOption {
type = types.package; type = types.package;
@ -62,9 +63,14 @@ on a system with pre-existing firmware and OS.
}; };
''; '';
in in
pkgs.runCommand "zyxel-nwa-fit-${config.boot.imageType}" { pkgs.runCommand "zyxel-nwa-fit-${config.boot.imageType}"
nativeBuildInputs = [ pkgs.pkgsBuildBuild.ubootTools pkgs.pkgsBuildBuild.dtc ]; {
} '' nativeBuildInputs = [
pkgs.pkgsBuildBuild.ubootTools
pkgs.pkgsBuildBuild.dtc
];
}
''
mkimage -f ${dts} $out mkimage -f ${dts} $out
''; '';
}; };

89
modules/ppp/common.nix
View File

@ -1,16 +1,28 @@
{ writeAshScript, liminix, svc, lib, serviceFns, output-template }: {
writeAshScript,
liminix,
svc,
lib,
serviceFns,
output-template,
}:
{ {
command, command,
name, name,
debug debug,
, username, username,
password, password,
lcpEcho, lcpEcho,
ppp-options, ppp-options,
dependencies ? [] dependencies ? [ ],
}: }:
let let
inherit (lib) optional optionals escapeShellArgs concatStringsSep; inherit (lib)
optional
optionals
escapeShellArgs
concatStringsSep
;
inherit (liminix.services) longrun; inherit (liminix.services) longrun;
inherit (builtins) toJSON toString typeOf; inherit (builtins) toJSON toString typeOf;
@ -37,34 +49,60 @@ let
test -e ifname && echo >/proc/self/fd/10 test -e ifname && echo >/proc/self/fd/10
''; '';
literal_or_output = literal_or_output =
let v = o: ({ let
v =
o:
(
{
string = toJSON; string = toJSON;
int = toJSON; int = toJSON;
lambda = (o: "output(${toJSON (o "service")}, ${toJSON (o "path")})"); lambda = (o: "output(${toJSON (o "service")}, ${toJSON (o "path")})");
}.${typeOf o}) o; }
in o: "{{ ${v o} }}"; .${typeOf o}
)
o;
in
o: "{{ ${v o} }}";
ppp-options' = ppp-options' =
["+ipv6" "noauth"] [
"+ipv6"
"noauth"
]
++ optional debug "debug" ++ optional debug "debug"
++ optionals (username != null) ["name" (literal_or_output username)] ++ optionals (username != null) [
++ optionals (password != null) ["password" (literal_or_output password)] "name"
(literal_or_output username)
]
++ optionals (password != null) [
"password"
(literal_or_output password)
]
++ optional lcpEcho.adaptive "lcp-echo-adaptive" ++ optional lcpEcho.adaptive "lcp-echo-adaptive"
++ optionals (lcpEcho.interval != null) ++ optionals (lcpEcho.interval != null) [
["lcp-echo-interval" (toString lcpEcho.interval)] "lcp-echo-interval"
++ optionals (lcpEcho.failure != null) (toString lcpEcho.interval)
["lcp-echo-failure" (toString lcpEcho.failure)] ]
++ optionals (lcpEcho.failure != null) [
"lcp-echo-failure"
(toString lcpEcho.failure)
]
++ ppp-options ++ ppp-options
++ ["ip-up-script" ip-up ++ [
"ipv6-up-script" ip6-up "ip-up-script"
"ipparam" name ip-up
"ipv6-up-script"
ip6-up
"ipparam"
name
"nodetach" "nodetach"
# usepeerdns requests DNS servers from peer (which is good), # usepeerdns requests DNS servers from peer (which is good),
# then attempts to write them to /nix/store/xxxx/ppp/resolv.conf # then attempts to write them to /nix/store/xxxx/ppp/resolv.conf
# which causes an unsightly but inconsequential error message # which causes an unsightly but inconsequential error message
"usepeerdns" "usepeerdns"
"nodefaultroute" "nodefaultroute"
"logfd" "2" "logfd"
"2"
]; ];
service = longrun { service = longrun {
inherit name; inherit name;
@ -77,12 +115,15 @@ let
${command} ${command}
''; '';
notification-fd = 10; notification-fd = 10;
timeout-up = if lcpEcho.failure != null timeout-up =
then (10 + lcpEcho.failure * lcpEcho.interval) * 1000 if lcpEcho.failure != null then (10 + lcpEcho.failure * lcpEcho.interval) * 1000 else 60 * 1000;
else 60 * 1000;
inherit dependencies; inherit dependencies;
}; };
in svc.secrets.subscriber.build { in
watch = lib.filter (n: typeOf n=="lambda") [ username password ]; svc.secrets.subscriber.build {
watch = lib.filter (n: typeOf n == "lambda") [
username
password
];
inherit service; inherit service;
} }

14
modules/ppp/default.nix
View File

@ -13,18 +13,24 @@
## conjunction with a DHCP uplink, or other more creative forms of ## conjunction with a DHCP uplink, or other more creative forms of
## network connection ## network connection
{
{ lib, pkgs, config, ...}: lib,
pkgs,
config,
...
}:
let let
inherit (lib) mkOption types; inherit (lib) mkOption types;
inherit (pkgs) liminix; inherit (pkgs) liminix;
mkStringOption = mkStringOption =
description: mkOption { description:
mkOption {
type = types.nullOr types.str; type = types.nullOr types.str;
default = null; default = null;
inherit description; inherit description;
}; };
in { in
{
imports = [ ../secrets ]; imports = [ ../secrets ];
options = { options = {
system.service.pppoe = mkOption { system.service.pppoe = mkOption {

19
modules/ppp/l2tp.nix
View File

@ -7,14 +7,15 @@
writeAshScript, writeAshScript,
writeText, writeText,
xl2tpd, xl2tpd,
callPackage callPackage,
}: }:
{ lns, {
lns,
ppp-options, ppp-options,
lcpEcho, lcpEcho,
username, username,
password, password,
debug debug,
}: }:
let let
name = "${lns}.l2tp"; name = "${lns}.l2tp";
@ -31,8 +32,16 @@ let
max redials = 2 # this gives 1 actual retry, as xl2tpd can't count max redials = 2 # this gives 1 actual retry, as xl2tpd can't count
''; '';
control = "/run/${name}/control"; control = "/run/${name}/control";
in common { in
inherit name debug username password lcpEcho ppp-options; common {
inherit
name
debug
username
password
lcpEcho
ppp-options
;
command = '' command = ''
touch ${control} touch ${control}
exec ${xl2tpd}/bin/xl2tpd -D -p /run/${name}/${name}.pid -c ${conf} -C ${control} exec ${xl2tpd}/bin/xl2tpd -D -p /run/${name}/${name}.pid -c ${conf} -C ${control}

22
modules/ppp/pppoe.nix
View File

@ -7,22 +7,32 @@
serviceFns, serviceFns,
svc, svc,
writeAshScript, writeAshScript,
callPackage callPackage,
}: }:
{ interface, {
interface,
ppp-options, ppp-options,
lcpEcho, lcpEcho,
username, username,
password, password,
debug debug,
}: }:
let let
name = "${interface.name}.pppoe"; name = "${interface.name}.pppoe";
common = callPackage ./common.nix { inherit svc; }; common = callPackage ./common.nix { inherit svc; };
timeoutOpt = if lcpEcho.interval != null then "-T ${builtins.toString (4 * lcpEcho.interval)}" else ""; timeoutOpt =
in common { if lcpEcho.interval != null then "-T ${builtins.toString (4 * lcpEcho.interval)}" else "";
inherit name debug username password lcpEcho ppp-options; in
common {
inherit
name
debug
username
password
lcpEcho
ppp-options
;
command = '' command = ''
exec ${ppp}/bin/pppd pty "${pppoe}/bin/pppoe ${timeoutOpt} -I $(output ${interface} ifname)" file /run/${name}/ppp-options exec ${ppp}/bin/pppd pty "${pppoe}/bin/pppoe ${timeoutOpt} -I $(output ${interface} ifname)" file /run/${name}/ppp-options
''; '';

62
modules/profiles/gateway.nix
View File

@ -1,8 +1,18 @@
{ config, pkgs, lib, ... } : {
config,
pkgs,
lib,
...
}:
let let
svc = config.system.service; svc = config.system.service;
cfg = config.profile.gateway; cfg = config.profile.gateway;
inherit (lib) mkOption mkEnableOption mkIf types; inherit (lib)
mkOption
mkEnableOption
mkIf
types
;
inherit (pkgs) liminix serviceFns; inherit (pkgs) liminix serviceFns;
inherit (liminix.services) bundle oneshot; inherit (liminix.services) bundle oneshot;
hostaps = hostaps =
@ -14,18 +24,21 @@ let
wpa_pairwise = "TKIP CCMP"; # auth for wpa (may not need this?) wpa_pairwise = "TKIP CCMP"; # auth for wpa (may not need this?)
rsn_pairwise = "CCMP"; # auth for wpa2 rsn_pairwise = "CCMP"; # auth for wpa2
}; };
in lib.mapAttrs' in
(name : value : lib.mapAttrs' (
name: value:
let let
attrs = defaults // { ssid = name; } // value; attrs = defaults // { ssid = name; } // value;
in lib.nameValuePair in
"hostap-${name}" lib.nameValuePair "hostap-${name}" (
(svc.hostapd.build { svc.hostapd.build {
interface = attrs.interface; interface = attrs.interface;
params = lib.filterAttrs (k: v: k != "interface") attrs; params = lib.filterAttrs (k: v: k != "interface") attrs;
})) }
cfg.wireless.networks; )
in { ) cfg.wireless.networks;
in
{
options.profile.gateway = { options.profile.gateway = {
lan = { lan = {
@ -82,9 +95,12 @@ in {
]; ];
config = { config = {
services.int = svc.network.address.build ({ services.int = svc.network.address.build (
{
interface = svc.bridge.primary.build { ifname = "int"; }; interface = svc.bridge.primary.build { ifname = "int"; };
} // cfg.lan.address); }
// cfg.lan.address
);
services.bridge = svc.bridge.members.build { services.bridge = svc.bridge.members.build {
primary = config.services.int; primary = config.services.int;
@ -113,12 +129,15 @@ in {
}) })
]; ];
}; };
in mkIf cfg.wan.dhcp6.enable bundl; in
mkIf cfg.wan.dhcp6.enable bundl;
services.dns = services.dns =
let interface = config.services.int; let
interface = config.services.int;
dcfg = cfg.lan.dhcp; dcfg = cfg.lan.dhcp;
in svc.dnsmasq.build { in
svc.dnsmasq.build {
resolvconf = config.services.resolvconf; resolvconf = config.services.resolvconf;
inherit interface; inherit interface;
ranges = [ ranges = [
@ -147,11 +166,12 @@ in {
interface = config.services.wan; interface = config.services.wan;
}; };
services.firewall = mkIf cfg.firewall.enable services.firewall = mkIf cfg.firewall.enable (
(svc.firewall.build { svc.firewall.build {
extraRules = cfg.firewall.rules; extraRules = cfg.firewall.rules;
inherit (cfg.firewall) zones; inherit (cfg.firewall) zones;
}); }
);
services.resolvconf = oneshot rec { services.resolvconf = oneshot rec {
dependencies = [ config.services.wan ]; dependencies = [ config.services.wan ];
@ -166,8 +186,10 @@ in {
}; };
filesystem = filesystem =
let inherit (pkgs.pseudofile) dir symlink; let
in dir { inherit (pkgs.pseudofile) dir symlink;
in
dir {
etc = dir { etc = dir {
"resolv.conf" = symlink "${config.services.resolvconf}/.outputs/resolv.conf"; "resolv.conf" = symlink "${config.services.resolvconf}/.outputs/resolv.conf";
}; };

22
modules/profiles/wap.nix
View File

@ -3,7 +3,8 @@
pkgs, pkgs,
lib, lib,
... ...
}: let }:
let
inherit (pkgs) liminix; inherit (pkgs) liminix;
inherit (lib) mkOption types; inherit (lib) mkOption types;
@ -22,19 +23,22 @@
wpa_pairwise = "TKIP CCMP"; # auth for wpa (may not need this?) wpa_pairwise = "TKIP CCMP"; # auth for wpa (may not need this?)
rsn_pairwise = "CCMP"; # auth for wpa2 rsn_pairwise = "CCMP"; # auth for wpa2
}; };
in lib.mapAttrs' in
(name : value : lib.mapAttrs' (
name: value:
let let
attrs = defaults // { ssid = name; } // value; attrs = defaults // { ssid = name; } // value;
in lib.nameValuePair in
"hostap-${name}" lib.nameValuePair "hostap-${name}" (
(svc.hostapd.build { svc.hostapd.build {
interface = attrs.interface; interface = attrs.interface;
params = lib.filterAttrs (k: v: k != "interface") attrs; params = lib.filterAttrs (k: v: k != "interface") attrs;
})) }
cfg.wireless.networks; )
) cfg.wireless.networks;
in { in
{
imports = [ imports = [
../wlan.nix ../wlan.nix
../network ../network

3
modules/ramdisk.nix
View File

@ -1,7 +1,8 @@
{ config, lib, ... }: { config, lib, ... }:
let let
inherit (lib) mkIf mkEnableOption; # types concatStringsSep; inherit (lib) mkIf mkEnableOption; # types concatStringsSep;
in { in
{
options = { options = {
boot = { boot = {
ramdisk = { ramdisk = {

11
modules/round-robin/default.nix
View File

@ -3,13 +3,18 @@
## Given a list of services, run each in turn until it exits, then ## Given a list of services, run each in turn until it exits, then
## runs the next. ## runs the next.
{
{ lib, pkgs, config, ...}: lib,
pkgs,
config,
...
}:
let let
inherit (lib) mkOption types; inherit (lib) mkOption types;
inherit (pkgs) liminix; inherit (pkgs) liminix;
inherit (pkgs.liminix.services) longrun; inherit (pkgs.liminix.services) longrun;
in { in
{
options = { options = {
system.service.round-robin = mkOption { system.service.round-robin = mkOption {
description = "run services one at a time and failover to next"; description = "run services one at a time and failover to next";

25
modules/round-robin/service.nix
View File

@ -1,20 +1,28 @@
{ {
liminix, lib, s6-rc-round-robin liminix,
lib,
s6-rc-round-robin,
}: }:
{ services, name }: { services, name }:
let let
inherit (liminix.services) oneshot longrun; inherit (liminix.services) oneshot longrun;
controlled-services = builtins.map controlled-services = builtins.map (
(s: s.overrideAttrs(o: { inherit controller; })) s:
services; s.overrideAttrs (o: {
controller = let name' = "control-${name}"; in longrun { inherit controller;
})
) services;
controller =
let
name' = "control-${name}";
in
longrun {
name = name'; name = name';
run = '' run = ''
in_outputs ${name'} in_outputs ${name'}
exec ${s6-rc-round-robin}/bin/s6-rc-round-robin \ exec ${s6-rc-round-robin}/bin/s6-rc-round-robin \
-p ${proxy.name} \ -p ${proxy.name} \
${lib.concatStringsSep " " ${lib.concatStringsSep " " (builtins.map (f: f.name) controlled-services)}
(builtins.map (f: f.name) controlled-services)}
''; '';
}; };
proxy = oneshot rec { proxy = oneshot rec {
@ -29,4 +37,5 @@ let
) )
''; '';
}; };
in proxy in
proxy

102
modules/s6/default.nix
View File

@ -1,27 +1,39 @@
{ config, pkgs, lib, lim, ... }: {
config,
pkgs,
lib,
lim,
...
}:
let let
inherit (pkgs) inherit (pkgs)
execline execline
s6 s6
s6-init-bin s6-init-bin
s6-linux-init s6-linux-init
stdenvNoCC; stdenvNoCC
;
inherit (lib.lists) unique concatMap; inherit (lib.lists) unique concatMap;
inherit (lib) concatStrings; inherit (lib) concatStrings;
inherit (builtins) map; inherit (builtins) map;
inherit (pkgs.pseudofile) dir symlink; inherit (pkgs.pseudofile) dir symlink;
inherit (pkgs.liminix.services) oneshot bundle longrun; inherit (pkgs.liminix.services) oneshot bundle longrun;
inherit (lib) mkIf mkEnableOption mkOption types; inherit (lib)
mkIf
mkEnableOption
mkOption
types
;
cfg = config.logging; cfg = config.logging;
logger = logger =
let pipecmds = let
["${s6}/bin/s6-log -bpd3 -- ${cfg.script} 1"] ++ pipecmds =
(lib.optional (cfg ? persistent && cfg.persistent.enable) [ "${s6}/bin/s6-log -bpd3 -- ${cfg.script} 1" ]
"/bin/tee /dev/pmsg0") ++ ++ (lib.optional (cfg ? persistent && cfg.persistent.enable) "/bin/tee /dev/pmsg0")
(lib.optional cfg.shipping.enable ++ (lib.optional cfg.shipping.enable "${pkgs.logshipper}/bin/logtap ${cfg.shipping.socket} logshipper-socket-event");
"${pkgs.logshipper}/bin/logtap ${cfg.shipping.socket} logshipper-socket-event"); in
in '' ''
#!${execline}/bin/execlineb -P #!${execline}/bin/execlineb -P
${execline}/bin/redirfd -w 1 /dev/null ${execline}/bin/redirfd -w 1 /dev/null
${execline}/bin/redirfd -rnb 0 fifo ${execline}/bin/redirfd -rnb 0 fifo
@ -41,13 +53,11 @@ let
# dependency # dependency
isControlled = s: s ? controller && s.controller != null; isControlled = s: s ? controller && s.controller != null;
deps = s : s.dependencies ++ deps = s: s.dependencies ++ lib.optional (isControlled s) s.controller;
lib.optional (isControlled s) s.controller;
flatDeps = s: [ s ] ++ concatMap flatDeps (deps s); flatDeps = s: [ s ] ++ concatMap flatDeps (deps s);
allServices = unique (concatMap flatDeps (builtins.attrValues config.services)); allServices = unique (concatMap flatDeps (builtins.attrValues config.services));
isDependentOnControlled = s : isDependentOnControlled =
isControlled s || s: isControlled s || (lib.lists.any isDependentOnControlled s.dependencies);
(lib.lists.any isDependentOnControlled s.dependencies);
# all controlled services depend on this oneshot, which # all controlled services depend on this oneshot, which
# makes a list of them so we can identify them at runtime # makes a list of them so we can identify them at runtime
@ -62,9 +72,7 @@ let
down = "rm -r /run/services/controlled"; down = "rm -r /run/services/controlled";
}; };
defaultStart = defaultStart = builtins.filter (s: !(isDependentOnControlled s)) allServices;
builtins.filter
(s: !(isDependentOnControlled s)) allServices;
defaultDefaultTarget = bundle { defaultDefaultTarget = bundle {
name = "default"; name = "default";
contents = defaultStart ++ [ controlled ]; contents = defaultStart ++ [ controlled ];
@ -79,7 +87,10 @@ let
s6-init-scripts = stdenvNoCC.mkDerivation { s6-init-scripts = stdenvNoCC.mkDerivation {
name = "s6-scripts"; name = "s6-scripts";
src = ./scripts; src = ./scripts;
phases = ["unpackPhase" "installPhase" ]; phases = [
"unpackPhase"
"installPhase"
];
buildInputs = [ ]; buildInputs = [ ];
installPhase = '' installPhase = ''
mkdir $out mkdir $out
@ -89,7 +100,9 @@ let
}; };
service = dir { service = dir {
s6-linux-init-runleveld = dir { s6-linux-init-runleveld = dir {
notification-fd = { file = "3"; }; notification-fd = {
file = "3";
};
run = { run = {
file = '' file = ''
#!${execline}/bin/execlineb -P #!${execline}/bin/execlineb -P
@ -122,8 +135,13 @@ let
type = "i"; type = "i";
mode = "0600"; mode = "0600";
}; };
notification-fd = { file = "3"; }; notification-fd = {
run = { file = logger; mode = "0755"; }; file = "3";
};
run = {
file = logger;
mode = "0755";
};
}; };
getty = dir { getty = dir {
run = { run = {
@ -166,7 +184,8 @@ let
${s6-linux-init}/bin/s6-linux-init-shutdown -a #{action} -- now ${s6-linux-init}/bin/s6-linux-init-shutdown -a #{action} -- now
''; '';
empty = "#!${execline}/bin/execlineb -P\n"; empty = "#!${execline}/bin/execlineb -P\n";
in dir { in
dir {
crash = { crash = {
file = quit "s6-svscan crashed. Rebooting."; file = quit "s6-svscan crashed. Rebooting.";
mode = "0755"; mode = "0755";
@ -212,13 +231,15 @@ let
}; };
}; };
in { in
{
options = { options = {
logging = { logging = {
shipping = { shipping = {
enable = mkEnableOption "unix socket for log shipping"; enable = mkEnableOption "unix socket for log shipping";
socket = mkOption { socket = mkOption {
description = "socket pathname"; type = types.path; description = "socket pathname";
type = types.path;
default = "/run/.log-shipping.sock"; default = "/run/.log-shipping.sock";
}; };
service = mkOption { service = mkOption {
@ -239,12 +260,21 @@ in {
}; };
}; };
imports = [ imports = [
( {config, pkgs, lib, ...}: (
{
config,
pkgs,
lib,
...
}:
let let
cfg = config.logging; cfg = config.logging;
pipeline = shipper: bundle { pipeline =
shipper:
bundle {
name = "log-shipping-pipe"; name = "log-shipping-pipe";
contents = let contents =
let
eat = longrun { eat = longrun {
name = "log-shipping-pipe-eat"; name = "log-shipping-pipe-eat";
run = '' run = ''
@ -258,12 +288,18 @@ in {
spew = shipper.override { spew = shipper.override {
consumer-for = "log-shipping-pipe-eat"; consumer-for = "log-shipping-pipe-eat";
}; };
in [ eat spew ]; in
[
eat
spew
];
}; };
in mkIf cfg.shipping.enable { in
mkIf cfg.shipping.enable {
services.${cfg.shipping.service.name} = pipeline cfg.shipping.service; services.${cfg.shipping.service.name} = pipeline cfg.shipping.service;
} }
)]; )
];
config = { config = {
filesystem = dir { filesystem = dir {
@ -276,7 +312,9 @@ in {
scripts = symlink "${s6-init-scripts}/scripts"; scripts = symlink "${s6-init-scripts}/scripts";
env = dir { }; env = dir { };
run-image = dir { run-image = dir {
uncaught-logs = (dir {}) // {mode = "2750";}; uncaught-logs = (dir { }) // {
mode = "2750";
};
inherit service; inherit service;
}; };
}; };

23
modules/secrets/default.nix
View File

@ -3,12 +3,18 @@
## various ways to manage secrets without writing them to the ## various ways to manage secrets without writing them to the
## nix store ## nix store
{ lib, pkgs, config, ...}: {
lib,
pkgs,
config,
...
}:
let let
inherit (lib) mkOption types; inherit (lib) mkOption types;
inherit (pkgs) liminix; inherit (pkgs) liminix;
inherit (pkgs.liminix.services) longrun; inherit (pkgs.liminix.services) longrun;
in { in
{
options.system.service.secrets = { options.system.service.secrets = {
outboard = mkOption { outboard = mkOption {
description = "fetch secrets from external vault with https"; description = "fetch secrets from external vault with https";
@ -76,9 +82,16 @@ in {
description = "how do we notify the service to regenerate its config"; description = "how do we notify the service to regenerate its config";
default = "restart-all"; default = "restart-all";
type = types.enum [ type = types.enum [
"restart" "restart-all" "restart"
"hup" "int" "quit" "kill" "term" "restart-all"
"winch" "usr1" "usr2" "hup"
"int"
"quit"
"kill"
"term"
"winch"
"usr1"
"usr2"
]; ];
}; };
}; };

16
modules/secrets/outboard.nix
View File

@ -1,11 +1,21 @@
{ {
liminix, lib, json-to-fstree, serviceFns liminix,
lib,
json-to-fstree,
serviceFns,
}:
{
name,
url,
interval,
username,
password,
}: }:
{ name, url, interval, username, password } :
let let
inherit (liminix.services) oneshot longrun; inherit (liminix.services) oneshot longrun;
inherit (lib) optionalString; inherit (lib) optionalString;
in longrun { in
longrun {
inherit name; inherit name;
buildInputs = [ json-to-fstree ]; buildInputs = [ json-to-fstree ];
run = '' run = ''

51
modules/secrets/subscriber.nix
View File

@ -1,7 +1,16 @@
{ {
liminix, lib, lim, s6, s6-rc, watch-outputs liminix,
lib,
lim,
s6,
s6-rc,
watch-outputs,
}:
{
watch,
service,
action,
}: }:
{ watch, service, action } :
let let
inherit (liminix.services) oneshot longrun; inherit (liminix.services) oneshot longrun;
inherit (builtins) length head toString; inherit (builtins) length head toString;
@ -11,7 +20,8 @@ let
watched-services = unique (map (f: f "service") watch); watched-services = unique (map (f: f "service") watch);
paths = unique (map (f: f "path") watch); paths = unique (map (f: f "path") watch);
restart-flag = { restart-flag =
{
restart = "-r"; restart = "-r";
restart-all = "-R"; restart-all = "-R";
"hup" = "-s 1"; "hup" = "-s 1";
@ -22,16 +32,22 @@ let
"winch" = "-s 28"; "winch" = "-s 28";
"usr1" = "-s 10"; "usr1" = "-s 10";
"usr2" = "-s 12"; "usr2" = "-s 12";
}.${action}; }
.${action};
watched-service = watched-service =
if length watched-services == 0 if length watched-services == 0 then
then null null
else if length watched-services == 1 else if length watched-services == 1 then
then head watched-services head watched-services
else throw "cannot subscribe to more than one source service for secrets"; else
throw "cannot subscribe to more than one source service for secrets";
watcher = let name' = "restart-${name}"; in longrun { watcher =
let
name' = "restart-${name}";
in
longrun {
name = name'; name = name';
run = '' run = ''
dir=/run/service/${name} dir=/run/service/${name}
@ -42,10 +58,13 @@ let
${watch-outputs}/bin/watch-outputs ${restart-flag} ${name} ${watched-service.name} ${lib.concatStringsSep " " paths} ${watch-outputs}/bin/watch-outputs ${restart-flag} ${name} ${watched-service.name} ${lib.concatStringsSep " " paths}
''; '';
}; };
in service.overrideAttrs(o: { in
buildInputs = (lim.orEmpty o.buildInputs) ++ service.overrideAttrs (o: {
optional (watched-service != null) watcher; buildInputs = (lim.orEmpty o.buildInputs) ++ optional (watched-service != null) watcher;
dependencies = (lim.orEmpty o.dependencies) ++ dependencies =
optionals (watched-service != null) (lim.orEmpty o.dependencies)
[ watcher watched-service ]; ++ optionals (watched-service != null) [
watcher
watched-service
];
}) })

15
modules/secrets/tang.nix
View File

@ -1,11 +1,20 @@
{ {
liminix, lib, json-to-fstree, serviceFns, tangc liminix,
lib,
json-to-fstree,
serviceFns,
tangc,
}:
{
name,
path,
interval,
}: }:
{ name, path, interval } :
let let
inherit (liminix.services) longrun; inherit (liminix.services) longrun;
inherit (lib) optionalString; inherit (lib) optionalString;
in longrun { in
longrun {
inherit name; inherit name;
buildInputs = [ json-to-fstree ]; buildInputs = [ json-to-fstree ];
notification-fd = 10; notification-fd = 10;

Some files were not shown because too many files have changed in this diff Show More