From 281858ee3896aeae277bb2db6b381a0cab7ab6b3 Mon Sep 17 00:00:00 2001
From: Alexander Heldt <me@alexanderheldt.se>
Date: Wed, 29 Nov 2023 15:17:53 +0100
Subject: [PATCH] sombrero: Move `agenix` input to `agenix` module imports

---
 flake.nix                              |  1 -
 hosts/sombrero/modules/age/default.nix | 16 ++++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/flake.nix b/flake.nix
index 3fe2c88..b227e14 100644
--- a/flake.nix
+++ b/flake.nix
@@ -54,7 +54,6 @@
         specialArgs = { inherit inputs; };
         modules = [
           ./hosts/sombrero/configuration.nix
-          inputs.agenix.nixosModules.default
           inputs.home-manager.nixosModules.home-manager
           ./hosts/sombrero/home.nix
         ];
diff --git a/hosts/sombrero/modules/age/default.nix b/hosts/sombrero/modules/age/default.nix
index 18ae1bd..4576422 100644
--- a/hosts/sombrero/modules/age/default.nix
+++ b/hosts/sombrero/modules/age/default.nix
@@ -1,10 +1,14 @@
 { inputs, pkgs, ... }:
 {
-  age = {
-    identityPaths = [ "/etc/ssh/sombrero" ];
-  };
+  imports = [ inputs.agenix.nixosModules.default ];
 
-  environment.systemPackages = [
-    inputs.agenix.packages."${pkgs.system}".default
-  ];
+  config = {
+    age = {
+      identityPaths = [ "/etc/ssh/sombrero" ];
+    };
+
+    environment.systemPackages = [
+      inputs.agenix.packages."${pkgs.system}".default
+    ];
+  };
 }