From 1f5d58f6914babbdcf48ed542d49768a326ca65c Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Wed, 17 Apr 2024 21:04:05 +0200
Subject: [PATCH] Move attic module import

---
 lib/mk_computer.nix                | 1 -
 lib/mk_raspi.nix                   | 1 -
 modules/services/attic/default.nix | 1 +
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/mk_computer.nix b/lib/mk_computer.nix
index 585607d..1d11e50 100644
--- a/lib/mk_computer.nix
+++ b/lib/mk_computer.nix
@@ -47,7 +47,6 @@ inputs.nixpkgs.lib.nixosSystem {
     "${inputs.self}/modules"
 
     inputs.agenix.nixosModules.age
-    inputs.attic.nixosModules.atticd
     {
       environment.systemPackages = [ inputs.agenix.packages.${system}.default ];
       az-username = username;
diff --git a/lib/mk_raspi.nix b/lib/mk_raspi.nix
index 4bb2d11..d93a14f 100644
--- a/lib/mk_raspi.nix
+++ b/lib/mk_raspi.nix
@@ -54,7 +54,6 @@ inputs.nixpkgs.lib.nixosSystem {
     "${inputs.self}/modules"
 
     inputs.agenix.nixosModules.age
-    inputs.attic.nixosModules.atticd
     {
       environment.systemPackages = [ inputs.agenix.packages.${system}.default ];
       az-username = username;
diff --git a/modules/services/attic/default.nix b/modules/services/attic/default.nix
index 8b07a3f..8a819ec 100644
--- a/modules/services/attic/default.nix
+++ b/modules/services/attic/default.nix
@@ -34,6 +34,7 @@ let
   '';
 in
 {
+  imports = [ inputs.attic.nixosModules.atticd ];
   options = {
     services.az-attic-server.enable = lib.mkEnableOption "Enable attic server and related services";
   };