Skip to content

Generate unbound configuration files from blocklist files #2833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Yethal wants to merge 2 commits into
base: master
Choose a base branch
from
+49 −0
Open

Generate unbound configuration files from blocklist files #2833

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cc50cc
Add generated unbound.conf files as packages
Yethal Mar 11, 2025
f77e0fc
Generate config files for non-combined lists only
Yethal Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,25 @@
nixpkgsFor = forAllSystems (system: import nixpkgs {
inherit system;
});

toUnboundConf = (
file:
nixpkgs.lib.strings.concatMapStringsSep "\n" (
line:
if (nixpkgs.lib.strings.hasPrefix "#" line) || (line == "") then
line
else
let
split_line = (nixpkgs.lib.strings.splitString " " line);
address = builtins.elemAt split_line 0;
domain = builtins.elemAt split_line 1;
in
''
local-zone: "${domain}" redirect
local-data: "${domain} A ${address}"
''
) (nixpkgs.lib.strings.splitString "\n" (builtins.readFile file))
);
in
{
nixosModule = { config, ... }:
Expand Down Expand Up @@ -50,5 +69,35 @@
];
};
});

overlays.default = (
final: prev: {
unboundconfs = prev.lib.makeScope prev.pkgs.newScope (newscope: self.packages.${prev.system});
}
);

packages = forAllSystems (
system:
let
pkgs = nixpkgsFor.${system};
dir = ./alternates;
lists =
Copy link
Contributor

@toastal toastal Mar 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This block would probably run faster as a single fold instead of iterating the whole list 3 times (4 including the post-let mapAttrs). If it isn’t that expensive, I still think lib.pipe would be a lot easier to read this case instead of trying to read the block backwards from lines bottom to top.

Copy link
Author

@Yethal Yethal Mar 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When I originally wrote this I was using the experimental pipe-operator and then converted the code to the original pipe-less nix but lib.pipe does seem like an okay compromise

Copy link
Contributor

@toastal toastal Mar 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotcha. The pipe change here I think is a lot easier for the reader to follow.

Copy link
Author

@Yethal Yethal Mar 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I completely agree but I wasn't sure what's the consensus regarding usage of lib.pipe. In my own nix code I just use pipe operator everywhere but I understand this is not common practice

pkgs.lib.trivial.pipe (builtins.readDir ./alternates) [
(pkgs.lib.attrsets.filterAttrs (k: v: v == "directory"))
(pkgs.lib.attrsets.mapAttrs (k: v: dir + "/${k}/hosts"))
(pkgs.lib.attrsets.filterAttrs (k: v: builtins.pathExists v))
]
// {
all = ./hosts;
};
in
pkgs.lib.attrsets.mapAttrs (
k: v:
pkgs.writeTextFile {
name = k;
text = toUnboundConf v;
}
) lists
);
};
}