From d6e9f9786d54c0b4076b1e3e010e37f86c8a7c73 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sun, 27 Jun 2021 19:48:26 +0200 Subject: [PATCH 1/3] secrets: use more specific type I will amend it if I need more types, but for now this is fine. --- secrets/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/secrets/default.nix b/secrets/default.nix index 754483d..4a4aa68 100644 --- a/secrets/default.nix +++ b/secrets/default.nix @@ -14,7 +14,15 @@ let in throwOnCanary { options.my.secrets = mkOption { - type = types.attrs; + type = + let + valueType = with types; oneOf [ + int + str + (attrsOf valueType) + ]; + in + valueType; }; config.my.secrets = { From 2232062fd9267090867bda083a9a07051f4b29e4 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sun, 27 Jun 2021 19:48:42 +0200 Subject: [PATCH 2/3] home: secrets: use more specific type I will amend it if I need more types, but for now this is fine. --- home/secrets/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/home/secrets/default.nix b/home/secrets/default.nix index ac0e5b5..76ec2cf 100644 --- a/home/secrets/default.nix +++ b/home/secrets/default.nix @@ -14,7 +14,15 @@ let in throwOnCanary { options.my.secrets = mkOption { - type = types.attrs; + type = + let + valueType = with types; oneOf [ + int + str + (attrsOf valueType) + ]; + in + valueType; }; config.my.secrets = { From 6eb39422705f48864b15223ddd2c6020532f4d5a Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sun, 27 Jun 2021 19:51:04 +0200 Subject: [PATCH 3/3] home: firefox: add sponsorblock --- home/firefox/firefox.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/firefox/firefox.nix b/home/firefox/firefox.nix index d5ecd53..723ecc8 100644 --- a/home/firefox/firefox.nix +++ b/home/firefox/firefox.nix @@ -46,6 +46,7 @@ in https-everywhere i-dont-care-about-cookies reddit-enhancement-suite + sponsorblock ublock-origin ] ++ lib.optional (cfg.tridactyl.enable) tridactyl