diff --git a/.sops.yaml b/.sops.yaml index cec5c89..4f51587 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -6,11 +6,11 @@ creation_rules: - path_regex: targets/nixos-wiki\.nixos\.org/secrets/* key_groups: - age: - - *joerg - - *lassulus - - *nixos-wiki2 + - *joerg + - *lassulus + - *nixos-wiki2 - path_regex: targets/admins/secrets/* key_groups: - age: - - *joerg - - *lassulus + - *joerg + - *lassulus diff --git a/formatter.nix b/formatter.nix index bbc4966..d4e2877 100644 --- a/formatter.nix +++ b/formatter.nix @@ -66,7 +66,8 @@ )) ]; }; - } // (import ./checks/linkcheck/pkgs { inherit pkgs; }); + } + // (import ./checks/linkcheck/pkgs { inherit pkgs; }); devShells.linkcheck = pkgs.mkShell { packages = [ pkgs.lychee diff --git a/modules/nixos-wiki/default.nix b/modules/nixos-wiki/default.nix index ea7c3b9..9adc92f 100644 --- a/modules/nixos-wiki/default.nix +++ b/modules/nixos-wiki/default.nix @@ -85,7 +85,8 @@ in url = "https://github.com/SemanticMediaWiki/Mermaid/archive/refs/tags/3.1.0.zip"; hash = "sha256-tLOdAsXsaP/URvKcl5QWQiyhMy70qn8Fi8g3+ecNOWQ="; }; # Adds diagram generation - } // pkgs.callPackages ./extensions.nix { }; + } + // pkgs.callPackages ./extensions.nix { }; extraConfig = '' # docs https://www.mediawiki.org/wiki/Extension:QuestyCaptcha $wgCaptchaQuestions = [