From 02f40a8217f3d0e129d8230c6887cad769f57628 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Mon, 4 Sep 2023 22:09:40 +0200
Subject: [PATCH] Add agenix to all nodes

---
 m/common/agenix.nix     | 9 +++++++++
 m/common/main.nix       | 1 +
 m/hut/configuration.nix | 7 +------
 m/module/ceph.nix       | 4 +---
 4 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 m/common/agenix.nix

diff --git a/m/common/agenix.nix b/m/common/agenix.nix
new file mode 100644
index 0000000..3d5bb65
--- /dev/null
+++ b/m/common/agenix.nix
@@ -0,0 +1,9 @@
+{ agenix, ... }:
+
+{
+  imports = [ agenix.nixosModules.default ];
+
+  environment.systemPackages = [
+    agenix.packages.x86_64-linux.default
+  ];
+}
diff --git a/m/common/main.nix b/m/common/main.nix
index f664ef8..a5f8e45 100644
--- a/m/common/main.nix
+++ b/m/common/main.nix
@@ -2,6 +2,7 @@
 
 {
   imports = [
+    ./agenix.nix
     ./boot.nix
     ./fs.nix
     ./hw.nix
diff --git a/m/hut/configuration.nix b/m/hut/configuration.nix
index c3e72ab..fc4d2ab 100644
--- a/m/hut/configuration.nix
+++ b/m/hut/configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, agenix, ... }:
+{ config, pkgs, ... }:
 
 {
   imports = [
@@ -10,11 +10,6 @@
     ./nfs.nix
     ./slurm-daemon.nix
     #./pxe.nix
-    agenix.nixosModules.default
-  ];
-
-  environment.systemPackages = [
-    agenix.packages.x86_64-linux.default
   ];
 
   boot.binfmt.emulatedSystems = [ "aarch64-linux" "powerpc64le-linux" "riscv64-linux" ];
diff --git a/m/module/ceph.nix b/m/module/ceph.nix
index ac7b3d3..ff3fd22 100644
--- a/m/module/ceph.nix
+++ b/m/module/ceph.nix
@@ -1,9 +1,7 @@
-{ config, pkgs, agenix, ... }:
+{ config, pkgs, ... }:
 
 # Mounts the /ceph filesystem at boot
 {
-  imports = [ agenix.nixosModules.default ];
-
   environment.systemPackages = with pkgs; [
     ceph
     ceph-client