From 60f1cff5d7ff5a2dd65da5d185251369d60593a3 Mon Sep 17 00:00:00 2001 From: emily Date: Thu, 9 May 2024 16:41:01 +0200 Subject: [PATCH] add sops-nix module by default --- config/services/forgejo.nix | 5 +---- config/services/vaultwarden.nix | 5 +---- lib/shinyflakes/default.nix | 1 + 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/config/services/forgejo.nix b/config/services/forgejo.nix index 79b43b5..e2c5d12 100644 --- a/config/services/forgejo.nix +++ b/config/services/forgejo.nix @@ -1,7 +1,4 @@ -{ config, inputs, pkgs, ... }: { - imports = [ - inputs.sops-nix.nixosModules.sops - ]; +{ config, pkgs, ... }: { sops.secrets."services/forgejo/mailerPassword" = { sopsFile = ../../secrets/services/forgejo.yaml; owner = "forgejo"; diff --git a/config/services/vaultwarden.nix b/config/services/vaultwarden.nix index eefce6b..03d36a3 100644 --- a/config/services/vaultwarden.nix +++ b/config/services/vaultwarden.nix @@ -1,7 +1,4 @@ -{ config, inputs, pkgs, ... }: { - imports = [ - inputs.sops-nix.nixosModules.sops - ]; +{ config, pkgs, ... }: { sops.secrets."services/vaultwarden/environmentFile" = { sopsFile = ../../secrets/services/vaultwarden.yaml; owner = "vaultwarden"; diff --git a/lib/shinyflakes/default.nix b/lib/shinyflakes/default.nix index 97d02cc..1f4c208 100644 --- a/lib/shinyflakes/default.nix +++ b/lib/shinyflakes/default.nix @@ -28,6 +28,7 @@ specialArgs = { inherit inputs; }; modules = [ ../../config/hosts/${hostname}/configuration.nix + inputs.sops-nix.nixosModules.sops ({ ... }: { nixpkgs.overlays = [ self.overlays.kyouma ]; nixpkgs.hostPlatform = system;