From 65258870584f6e79bf1bcce329b325c6d6728f4c Mon Sep 17 00:00:00 2001 From: asyncnomi Date: Thu, 31 Jul 2025 16:42:42 +0200 Subject: [PATCH] update agenix shell pinning as a workaround for agenix las version not being properly push to nixpkgs --- mapping.nix | 10 ++++++++++ shared/mail.nix | 7 +++++++ shared/mail/maddy.nix | 21 +++++++++++++++++++++ shell.nix | 3 ++- 4 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 shared/mail.nix create mode 100644 shared/mail/maddy.nix diff --git a/mapping.nix b/mapping.nix index 33f02aa..fc641cc 100644 --- a/mapping.nix +++ b/mapping.nix @@ -26,4 +26,14 @@ ./shared/dns.nix ]; }; + + mail = { + hosts = [ + "mail-mtz-lasuite-federez" + "mail-ren-lasuite-federez" + ]; + _inherit = [ + ./shared/mail.nix + ]; + }; } \ No newline at end of file diff --git a/shared/mail.nix b/shared/mail.nix new file mode 100644 index 0000000..a26809f --- /dev/null +++ b/shared/mail.nix @@ -0,0 +1,7 @@ +{ ... }: +{ + # Import dependencies + imports = [ + ./mail/maddy.nix + ]; +} \ No newline at end of file diff --git a/shared/mail/maddy.nix b/shared/mail/maddy.nix new file mode 100644 index 0000000..409749a --- /dev/null +++ b/shared/mail/maddy.nix @@ -0,0 +1,21 @@ +{ config, lib, pkgs, ... }: + +let + # Import nodes + nodes = import ./../../nodes.nix; + myName = config.hostName; + myNode = nodes."${myName}"; + + # And mapping + mapping = import ./../../mapping.nix; + +in +{ + age.secrets = { + "tsig" = { + file = ./../../secrets/mail/tsig.age; + owner = "knot"; + group = "knot"; + }; + }; +} \ No newline at end of file diff --git a/shell.nix b/shell.nix index de2cada..c67ffd2 100644 --- a/shell.nix +++ b/shell.nix @@ -1,8 +1,9 @@ { pkgs ? import {} }: let + agenixCommit = "531beac616433bac6f9e2a19feb8e99a22a66baf"; agenixSrc = fetchTarball { - url = "https://github.com/ryantm/agenix/archive/main.tar.gz"; + url = "https://github.com/ryantm/agenix/archive/${agenixCommit}.tar.gz"; sha256 = "103slb8xy5sb68zxjjbb9d0svq8xz751a7yrg6vrz5rh4374bzgl"; }; in