From 50880f8cbee81947bf7249d0cd5f67ff5b538d71 Mon Sep 17 00:00:00 2001 From: Cottand Date: Sun, 1 Sep 2024 13:41:50 +0100 Subject: [PATCH] remove outdated blocklist, bump to 1.5.3 --- config.go | 5 ++--- doc/src/Nix.md | 4 ++-- flake.nix | 8 ++++---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/config.go b/config.go index 2966336..be36c5d 100644 --- a/config.go +++ b/config.go @@ -14,10 +14,10 @@ import ( ) // BuildVersion returns the build version of leng, this should be incremented every new release -var BuildVersion = "1.5.1" +var BuildVersion = "1.5.3" // ConfigVersion returns the version of leng, this should be incremented every time the config changes so leng presents a warning -var ConfigVersion = "1.5.1" +var ConfigVersion = "1.5.3" // Config holds the configuration parameters type Config struct { @@ -141,7 +141,6 @@ followCnameDepth = 12 blocklist = [] # list of sources to pull blocklists from, stores them in ./sources sources = [ - "https://mirror1.malwaredomains.com/files/justdomains", "https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts", "https://sysctl.org/cameleon/hosts", "https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt", diff --git a/doc/src/Nix.md b/doc/src/Nix.md index 6451578..9fc6e97 100644 --- a/doc/src/Nix.md +++ b/doc/src/Nix.md @@ -18,7 +18,7 @@ Please refer to [Configuration](./Configuration.md) for the options you can use { inputs = { # pinned version for safety - leng.url = "github:cottand/leng/v1.5.1"; + leng.url = "github:cottand/leng/v1.5.3"; leng.nixpkgs.follows = "nixpkgs"; }; @@ -52,7 +52,7 @@ Add the following inside your configuration.nix: {pkgs, lib, ... }: { imports = [ # import leng module - (builtins.getFlake "github:cottand/leng/v1.5.1").nixosModules.default + (builtins.getFlake "github:cottand/leng/v1.5.3").nixosModules.default ]; # now you can use services.leng! diff --git a/flake.nix b/flake.nix index 2f95d2e..fe905df 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,7 @@ inherit system; vendorHash = null; pname = "leng"; - version = "1.5.1"; + version = "1.5.3"; src = ./.; }; default = leng; @@ -56,7 +56,7 @@ with lib; let cfg = config.services.leng; - toml = pkgs.formats.toml {}; + toml = pkgs.formats.toml { }; in { ## interface @@ -75,7 +75,7 @@ }; configuration = mkOption { type = toml.type; - default = {}; + default = { }; description = "Configuration as Nix attrSet"; example = '' { @@ -124,7 +124,7 @@ { assertion = cfg.configuration.blocking.sourcesStore == "/var/lib/leng-sources"; message = '' - `services.leng.configuration.blocking.sourcesStore` should be set to `var/lib/leng-sources`, but it is set to ${cfg.configuration.blocking.sourcesStore}. + `services.leng.configuration.blocking.sourcesStore` should be set to `var/lib/leng-sources`, but it is set to ${cfg.configuration.blocking.sourcesStore}. ''; } ];