Skip to content
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

nix flake refactor: avoid with lib; & use lib.optional* #2813

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −14
Open

nix flake refactor: avoid with lib; & use lib.optional* #2813

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 16 additions & 14 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,32 +10,34 @@
in
{
nixosModule = { config, ... }:
with nixpkgs.lib;
let
inherit (nixpkgs) lib;
cfg = config.networking.stevenBlackHosts;
alternatesList = (if cfg.blockFakenews then [ "fakenews" ] else []) ++
(if cfg.blockGambling then [ "gambling" ] else []) ++
(if cfg.blockPorn then [ "porn" ] else []) ++
(if cfg.blockSocial then [ "social" ] else []);
alternatesList =
(lib.optional cfg.blockFakenews "fakenews")
++ (lib.optional cfg.blockGambling "gambling")
++ (lib.optional cfg.blockPorn "porn")
++ (lib.optional cfg.blockSocial "social");
alternatesPath = "alternates/" + builtins.concatStringsSep "-" alternatesList + "/";
in
{
options.networking.stevenBlackHosts = {
enable = mkEnableOption "Steven Black's hosts file";
enableIPv6 = mkEnableOption "IPv6 rules" // {
enable = lib.mkEnableOption "Steven Black's hosts file";
enableIPv6 = lib.mkEnableOption "IPv6 rules" // {
default = config.networking.enableIPv6;
};
blockFakenews = mkEnableOption "fakenews hosts entries";
blockGambling = mkEnableOption "gambling hosts entries";
blockPorn = mkEnableOption "porn hosts entries";
blockSocial = mkEnableOption "social hosts entries";
blockFakenews = lib.mkEnableOption "fakenews hosts entries";
blockGambling = lib.mkEnableOption "gambling hosts entries";
blockPorn = lib.mkEnableOption "porn hosts entries";
blockSocial = lib.mkEnableOption "social hosts entries";
};
config = mkIf cfg.enable {
config = lib.mkIf cfg.enable {
networking.extraHosts =
let
orig = builtins.readFile ("${self}/" + (if alternatesList != [] then alternatesPath else "") + "hosts");
orig = builtins.readFile ("${self}/" + (lib.optionalString (alternatesList != []) alternatesPath) + "hosts");
ipv6 = builtins.replaceStrings [ "0.0.0.0" ] [ "::" ] orig;
in orig + (optionalString cfg.enableIPv6 ("\n" + ipv6));
in
orig + (lib.optionalString cfg.enableIPv6 ("\n" + ipv6));
};
};

Expand Down
Loading