From 9746ffa853f241dbed77ec9a5ca3fc6951a71a5c Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 30 Sep 2024 16:40:00 +1000
Subject: [PATCH] modules/nixos/common: refactor
---
modules/nixos/common/agenix.nix | 6 ++++++
modules/nixos/common/default.nix | 3 +--
modules/nixos/common/sops-nix.nix | 4 ++++
3 files changed, 11 insertions(+), 2 deletions(-)
create mode 100644 modules/nixos/common/agenix.nix
diff --git a/modules/nixos/common/agenix.nix b/modules/nixos/common/agenix.nix
new file mode 100644
index 0000000..339885e
--- /dev/null
+++ b/modules/nixos/common/agenix.nix
@@ -0,0 +1,6 @@
+{ inputs, ... }:
+{
+ imports = [
+ inputs.agenix.nixosModules.age
+ ];
+}
diff --git a/modules/nixos/common/default.nix b/modules/nixos/common/default.nix
index 85b73c1..6a01d5e 100644
--- a/modules/nixos/common/default.nix
+++ b/modules/nixos/common/default.nix
@@ -8,13 +8,12 @@
imports = [
../../shared/known-hosts.nix
../../shared/nix-daemon.nix
+ ./agenix.nix
./security.nix
./sops-nix.nix
./telegraf.nix
./update.nix
./users.nix
- inputs.sops-nix.nixosModules.sops
- inputs.agenix.nixosModules.age
inputs.srvos.nixosModules.server
];
diff --git a/modules/nixos/common/sops-nix.nix b/modules/nixos/common/sops-nix.nix
index 3ad6a72..6858440 100644
--- a/modules/nixos/common/sops-nix.nix
+++ b/modules/nixos/common/sops-nix.nix
@@ -8,5 +8,9 @@ let
defaultSopsPath = "${toString inputs.self}/hosts/${config.networking.hostName}/secrets.yaml";
in
{
+ imports = [
+ inputs.sops-nix.nixosModules.sops
+ ];
+
sops.defaultSopsFile = lib.mkIf (builtins.pathExists defaultSopsPath) defaultSopsPath;
}