From a0726ea66d1857eb2e1c9d7dfd2f10d30ac64706 Mon Sep 17 00:00:00 2001 From: seth Date: Sun, 5 Jan 2025 23:24:04 -0500 Subject: treewide: back to flake parts (#539) * treewide: back to flake parts * treewide: drop extra docs these are kind pointless --- openwrt/README.md | 5 ----- openwrt/default.nix | 34 ++++++++++++++++++++++++++++++++++ openwrt/turret.nix | 4 ++-- 3 files changed, 36 insertions(+), 7 deletions(-) delete mode 100644 openwrt/README.md create mode 100644 openwrt/default.nix (limited to 'openwrt') diff --git a/openwrt/README.md b/openwrt/README.md deleted file mode 100644 index 5638da9..0000000 --- a/openwrt/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# ./openwrt/ - -## turret.nix - -My home router diff --git a/openwrt/default.nix b/openwrt/default.nix new file mode 100644 index 0000000..c8971a6 --- /dev/null +++ b/openwrt/default.nix @@ -0,0 +1,34 @@ +{ + lib, + withSystem, + inputs, + ... +}: + +{ + flake.legacyPackages.x86_64-linux = withSystem "x86_64-linux" ( + { pkgs, ... }: + + let + callPackage = lib.callPackageWith (pkgs // { inherit openwrtPackages; }); + openwrtPackages = { + profileFromRelease = + release: (inputs.openwrt-imagebuilder.lib.profiles { inherit pkgs release; }).identifyProfile; + + buildOpenWrtImage = + { profile, ... }@args: + inputs.openwrt-imagebuilder.lib.build ( + openwrtPackages.profileFromRelease args.release profile + // lib.removeAttrs args [ + "profile" + "release" + ] + ); + }; + in + + { + turret = callPackage ./turret.nix { }; + } + ); +} diff --git a/openwrt/turret.nix b/openwrt/turret.nix index 74587bf..ab4ff3e 100644 --- a/openwrt/turret.nix +++ b/openwrt/turret.nix @@ -1,9 +1,9 @@ { - buildOpenWrtImage, + openwrtPackages, runCommand, }: -buildOpenWrtImage { +openwrtPackages.buildOpenWrtImage { release = "23.05.0"; profile = "netgear_wac104"; -- cgit v1.2.3