From 5bbc11df7c43ed87df9294af4ade718adf6d8288 Mon Sep 17 00:00:00 2001 From: Alexander Heldt Date: Wed, 29 Nov 2023 15:15:16 +0100 Subject: [PATCH] pinwheel: Move `agenix` input to `agenix` module imports --- flake.nix | 1 - hosts/pinwheel/modules/age/default.nix | 20 ++++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index f02e83c..ca1abdb 100644 --- a/flake.nix +++ b/flake.nix @@ -44,7 +44,6 @@ specialArgs = { inherit inputs; }; modules = [ ./hosts/pinwheel/configuration.nix - inputs.agenix.nixosModules.default inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x1-10th-gen inputs.home-manager.nixosModules.home-manager ./hosts/pinwheel/home.nix diff --git a/hosts/pinwheel/modules/age/default.nix b/hosts/pinwheel/modules/age/default.nix index 6c70fbb..097acaa 100644 --- a/hosts/pinwheel/modules/age/default.nix +++ b/hosts/pinwheel/modules/age/default.nix @@ -1,13 +1,17 @@ { inputs, pkgs, ... }: { - age = { - identityPaths = [ - "/etc/ssh/pinwheel" - "/home/alex/.ssh/alex.pinwheel" + imports = [ inputs.agenix.nixosModules.default ]; + + config = { + age = { + identityPaths = [ + "/etc/ssh/pinwheel" + "/home/alex/.ssh/alex.pinwheel" + ]; + }; + + environment.systemPackages = [ + inputs.agenix.packages."${pkgs.system}".default ]; }; - - environment.systemPackages = [ - inputs.agenix.packages."${pkgs.system}".default - ]; }