This commit is contained in:
mjallen18
2026-01-14 18:00:52 -06:00
parent 59b4729636
commit 7306b08762
23 changed files with 197 additions and 155 deletions

View File

@@ -153,7 +153,7 @@ with lib;
extraConfig = mkOption {
type = with types; str;
default = '''';
default = "";
description = "Any extra configuration options";
};

View File

@@ -115,8 +115,8 @@ in
tarnow = "${getExe pkgs.gnutar} -acf ";
untar = "${getExe pkgs.gnutar} -zxvf ";
wget = "${getExe pkgs.wget} -c ";
remove-empty = ''${getExe' pkgs.findutils "find"} . -type d --empty --delete'';
print-empty = ''${getExe' pkgs.findutils "find"} . -type d --empty --print'';
remove-empty = "${getExe' pkgs.findutils "find"} . -type d --empty --delete";
print-empty = "${getExe' pkgs.findutils "find"} . -type d --empty --print";
dfh = "${getExe' pkgs.coreutils "df"} -h";
duh = "${getExe' pkgs.coreutils "du"} -h";
usage = "${getExe' pkgs.coreutils "du"} -ah -d1 | sort -rn 2>/dev/null";

View File

@@ -1,4 +1,9 @@
{ config, lib, namespace, ... }:
{
config,
lib,
namespace,
...
}:
let
hasDestopEnvironment =
config.${namespace}.desktop.cosmic.enable
@@ -11,4 +16,4 @@ in
enable = true;
};
};
}
}

View File

@@ -153,7 +153,10 @@ let
uefiBuilder = import ./uefi-builder.nix {
inherit pkgs;
uefiPackage = (
if (cfg.variant == "5") then pkgs.${namespace}.uefi-rpi5 else pkgs.${namespace}.edk2.override { MODEL = "4"; }
if (cfg.variant == "5") then
pkgs.${namespace}.uefi-rpi5
else
pkgs.${namespace}.edk2.override { MODEL = "4"; }
);
firmwareBuilder = firmwarePopulateCmd;
};

View File

@@ -19,9 +19,9 @@ in
{
options.${namespace}.hardware = {
raspberry-pi.leds = {
eth.disable = mkDisableOption ''ethernet LEDs.'';
act.disable = mkDisableOption ''activity LED.'';
pwr.disable = mkDisableOption ''power LED.'';
eth.disable = mkDisableOption "ethernet LEDs.";
act.disable = mkDisableOption "activity LED.";
pwr.disable = mkDisableOption "power LED.";
};
};

View File

@@ -1,6 +1,5 @@
{
config,
system,
lib,
namespace,
...

View File

@@ -1,10 +1,19 @@
{ inputs, config, namespace, lib, pkgs, ... }:
{
inputs,
config,
namespace,
lib,
pkgs,
...
}:
let
inherit (lib.${namespace}) mkModule mkOpt mkBoolOpt;
inherit (lib.${namespace}) mkOpt;
name = "otbr";
cfg = config.${namespace}.services.${name};
otbrPackage = pkgs.callPackage "${inputs.nixpkgs-otbr}/pkgs/by-name/op/openthread-border-router/package.nix" { };
otbrPackage =
pkgs.callPackage "${inputs.nixpkgs-otbr}/pkgs/by-name/op/openthread-border-router/package.nix"
{ };
otbrConfig = lib.${namespace}.mkModule {
inherit config name;
@@ -25,7 +34,7 @@ let
listenAddress = cfg.listenAddress;
listenPort = cfg.port;
};
radio = {
radio = {
device = "/dev/serial/by-id/usb-dresden_elektronik_Thread_RCP__ConBee_II__DE2475318-if00";
baudRate = 460800;
flowControl = true;