summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--flake.lock115
-rw-r--r--flake.nix9
-rw-r--r--host/software/server/mail.nix7
3 files changed, 123 insertions, 8 deletions
diff --git a/flake.lock b/flake.lock
index 5a268b8..ddbadf3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,17 +1,97 @@
{
"nodes": {
+ "blobs": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1604995301,
+ "narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=",
+ "owner": "simple-nixos-mailserver",
+ "repo": "blobs",
+ "rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265",
+ "type": "gitlab"
+ },
+ "original": {
+ "owner": "simple-nixos-mailserver",
+ "repo": "blobs",
+ "type": "gitlab"
+ }
+ },
+ "flake-compat": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1767039857,
+ "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+ "type": "github"
+ },
+ "original": {
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "type": "github"
+ }
+ },
+ "git-hooks": {
+ "inputs": {
+ "flake-compat": [
+ "snm",
+ "flake-compat"
+ ],
+ "gitignore": "gitignore",
+ "nixpkgs": [
+ "snm",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1772893680,
+ "narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=",
+ "owner": "cachix",
+ "repo": "git-hooks.nix",
+ "rev": "8baab586afc9c9b57645a734c820e4ac0a604af9",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "repo": "git-hooks.nix",
+ "type": "github"
+ }
+ },
+ "gitignore": {
+ "inputs": {
+ "nixpkgs": [
+ "snm",
+ "git-hooks",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1709087332,
+ "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "type": "github"
+ }
+ },
"nixpkgs": {
"locked": {
- "lastModified": 1752308619,
- "narHash": "sha256-pzrVLKRQNPrii06Rm09Q0i0dq3wt2t2pciT/GNq5EZQ=",
+ "lastModified": 1782847189,
+ "narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "650e572363c091045cdbc5b36b0f4c1f614d3058",
+ "rev": "b6018f87da91d19d0ab4cf979885689b469cdd41",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-25.05",
+ "ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
}
@@ -54,7 +134,32 @@
"root": {
"inputs": {
"nixpkgs": "nixpkgs",
- "pkgs-personal": "pkgs-personal"
+ "pkgs-personal": "pkgs-personal",
+ "snm": "snm"
+ }
+ },
+ "snm": {
+ "inputs": {
+ "blobs": "blobs",
+ "flake-compat": "flake-compat",
+ "git-hooks": "git-hooks",
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1773912645,
+ "narHash": "sha256-QHzRqq6gh+t3F/QU9DkP7X63dDDcuIQmaDz12p7ANTg=",
+ "owner": "simple-nixos-mailserver",
+ "repo": "nixos-mailserver",
+ "rev": "25e6dbb8fca3b6e779c5a46fd03bd760b2165bb5",
+ "type": "gitlab"
+ },
+ "original": {
+ "owner": "simple-nixos-mailserver",
+ "ref": "nixos-25.11",
+ "repo": "nixos-mailserver",
+ "type": "gitlab"
}
}
},
diff --git a/flake.nix b/flake.nix
index d2de617..f13e326 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,16 +2,21 @@
description = "System environment of Adrian Kummerlaender";
inputs = {
- nixpkgs.url = github:NixOS/nixpkgs/nixos-25.05;
+ nixpkgs.url = github:NixOS/nixpkgs/nixos-25.11;
pkgs-personal.url = github:KnairdA/pkgs/master;
+ snm = {
+ url = gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.11;
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
};
- outputs = { self, nixpkgs, pkgs-personal, ... }: let
+ outputs = { self, nixpkgs, pkgs-personal, snm, ... }: let
config = hostname: nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
inherit pkgs-personal;
inherit hostname;
+ inherit snm;
};
modules = [ ./configuration.nix ];
};
diff --git a/host/software/server/mail.nix b/host/software/server/mail.nix
index c58c879..55255b2 100644
--- a/host/software/server/mail.nix
+++ b/host/software/server/mail.nix
@@ -1,8 +1,13 @@
-{ config, pkgs, ... }:
+{ config, pkgs, snm, ... }:
{
+ imports = [ snm.nixosModules.default ];
+
mailserver = {
enable = true;
+ # Requires the snm maildir migration (#3) to have been run on /var/vmail
+ # before activating this generation. See snm migration docs.
+ stateVersion = 3;
fqdn = "mx.kummerlaender.eu";
domains = [ "kummerlaender.eu" ];