felschr/nixos-config
1
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

feat(openwrt): update config

Browse source
This commit is contained in:
Felix Schröter 2024-03-07 20:19:06 +01:00
parent 9555a51409
commit 4eab62fe3b
Signed by: felschr
GPG key ID: 671E39E6744C807D
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hosts/doctr.nix
View file

@ -1,10 +1,16 @@
{ self, inputs, ... }: { { self, ... }: {
perSystem = { self', pkgs, lib, ... }: { perSystem = { self', pkgs, lib, ... }: {
packages.doctr = self.lib.mkOpenwrtImage { packages.doctr = self.lib.mkOpenwrtImage {
inherit pkgs; inherit pkgs;
hostname = "doctr"; hostname = "doctr";
timezone = "Europe/Berlin"; timezone = "Europe/Berlin";
ipaddr = "192.168.1.1"; ipaddr = "192.168.1.1";
packages = [
"tang" # for automatic LUKS decryption with clevis
];
uci = ''
uci set tang.config.enabled='1'
'';
}; };
}; };
} }

2
hosts/penguin.nix
View file

@ -1,4 +1,4 @@
{ self, inputs, ... }: { { self, ... }: {
perSystem = { self', pkgs, lib, ... }: { perSystem = { self', pkgs, lib, ... }: {
packages.penguin = self.lib.mkOpenwrtImage { packages.penguin = self.lib.mkOpenwrtImage {
inherit pkgs; inherit pkgs;

9
lib/openwrt.nix
View file

@ -6,19 +6,21 @@ let
release = "snapshot"; release = "snapshot";
}; };
in { in {
flake.lib.mkOpenwrtImage = { pkgs, hostname, timezone, ipaddr }: flake.lib.mkOpenwrtImage =
{ pkgs, hostname, timezone, ipaddr, packages ? [ ], uci ? "" }:
inputs.openwrt-imagebuilder.lib.build inputs.openwrt-imagebuilder.lib.build
((getProfiles pkgs).identifyProfile "glinet_gl-mt6000" // { ((getProfiles pkgs).identifyProfile "glinet_gl-mt6000" // {
packages = [ packages = [
# TODO does this include everything that the web firmware builder includes? # TODO does this include everything that the web firmware builder includes?
"auc" "auc"
"bridger"
"dawn" "dawn"
"luci-app-attendedsysupgrade" "luci-app-attendedsysupgrade"
"luci-app-dawn" "luci-app-dawn"
"luci-app-nextdns"
"luci-ssl" "luci-ssl"
"nextdns"
"tailscale" "tailscale"
]; ] ++ packages;
files = pkgs.runCommand "image-files" { } '' files = pkgs.runCommand "image-files" { } ''
mkdir -p $out/etc/uci-defaults mkdir -p $out/etc/uci-defaults
@ -32,6 +34,7 @@ in {
uci set system.@system[0].timezone="$timezone" uci set system.@system[0].timezone="$timezone"
uci set network.lan.ipaddr="$ipaddr" uci set network.lan.ipaddr="$ipaddr"
uci set uhttpd.main.redirect_https='1' uci set uhttpd.main.redirect_https='1'
${uci}
uci commit uci commit
/etc/init.d/system reload /etc/init.d/system reload