From d03b0e285cb09dc3437bef908727fa5f9c448561 Mon Sep 17 00:00:00 2001 From: Julian Mutter Date: Fri, 29 Nov 2024 21:51:13 +0100 Subject: [PATCH] Make sops use disabled by default --- modules/nixos/sops/default.nix | 7 ++++--- systems/aarch64-linux/pianonix/default.nix | 1 + systems/x86_64-linux/aspi/default.nix | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/nixos/sops/default.nix b/modules/nixos/sops/default.nix index 085a873..db7261d 100644 --- a/modules/nixos/sops/default.nix +++ b/modules/nixos/sops/default.nix @@ -24,9 +24,11 @@ let cfg = config.modules.sops; in { - options.modules.sops = { }; + options.modules.sops = { + enable = lib.mkOption { default = false; }; + }; - config = { + config = lib.mkIf cfg.enable { sops.defaultSopsFile = ../../../secrets/secrets.yaml; sops.defaultSopsFormat = "yaml"; @@ -52,6 +54,5 @@ in sops.secrets."syncthing/pianonix/cert" = { }; sops.secrets."syncthing/public-keys/aspi-nix" = { }; sops.secrets."syncthing/public-keys/pianonix" = { }; - }; } diff --git a/systems/aarch64-linux/pianonix/default.nix b/systems/aarch64-linux/pianonix/default.nix index dab2f7c..a5d1c18 100644 --- a/systems/aarch64-linux/pianonix/default.nix +++ b/systems/aarch64-linux/pianonix/default.nix @@ -26,6 +26,7 @@ time.timeZone = "Europe/Berlin"; modules = { + sops.enable = true; nix-settings.enable = true; xserver-defaults.enable = true; keymap.enable = true; diff --git a/systems/x86_64-linux/aspi/default.nix b/systems/x86_64-linux/aspi/default.nix index 11d21c4..d3ce3fd 100644 --- a/systems/x86_64-linux/aspi/default.nix +++ b/systems/x86_64-linux/aspi/default.nix @@ -35,6 +35,7 @@ time.timeZone = "Europe/Berlin"; modules = { + sops.enable = true; nix-settings.enable = true; xserver-defaults.enable = true; keymap.enable = true;