diff options
| -rw-r--r-- | flake.lock | 204 | ||||
| -rw-r--r-- | flake.nix | 10 | ||||
| -rw-r--r-- | modules/common/networking.nix | 4 | ||||
| -rw-r--r-- | modules/garage/default.nix | 2 | ||||
| -rw-r--r-- | modules/hetzner/default.nix | 1 | ||||
| -rw-r--r-- | modules/mailserver/default.nix | 5 | ||||
| -rw-r--r-- | modules/matrix/pkgs/node-env.nix | 2 | ||||
| -rw-r--r-- | modules/powerdns/default.nix | 2 |
8 files changed, 57 insertions, 173 deletions
@@ -14,11 +14,11 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1753369162, - "narHash": "sha256-pSAsUVueht3WyyFJ3K+QJKWqFZNbyvsXijHOAHApeLk=", + "lastModified": 1765971510, + "narHash": "sha256-HdGpVTqPguAvkDbgjWi38sGUaI0MvxJJX2bFVZTKXaE=", "owner": "nix-community", "repo": "authentik-nix", - "rev": "1361d269fe10c527528264185567a053252e22b0", + "rev": "e929253deddb8398c7010b28187d9d43603db950", "type": "github" }, "original": { @@ -30,36 +30,20 @@ "authentik-src": { "flake": false, "locked": { - "lastModified": 1753187012, - "narHash": "sha256-bs/ThY3YixwBObahcS7BrOWj0gsaUXI664ldUQlJul8=", + "lastModified": 1765907481, + "narHash": "sha256-d0pPNE2T30COdFse0T15Mx8XW4BGg8hgPQvmW2dAV9s=", "owner": "goauthentik", "repo": "authentik", - "rev": "23ffad1c6be80bea223caf5f1cf265b984b76328", + "rev": "0d617e4ad1eb9e4540ba5381e6ce06e971affc63", "type": "github" }, "original": { "owner": "goauthentik", - "ref": "version/2025.6.4", + "ref": "version/2025.10.3", "repo": "authentik", "type": "github" } }, - "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" - } - }, "catinator": { "inputs": { "nci": "nci", @@ -165,11 +149,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1765121682, + "narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3", "type": "github" }, "original": { @@ -194,32 +178,16 @@ "type": "github" } }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -233,11 +201,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1753121425, - "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", + "lastModified": 1767609335, + "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", + "rev": "250481aafeb741edfe23d29195671c19b36b6dca", "type": "github" }, "original": { @@ -285,54 +253,6 @@ "type": "github" } }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "nixos-mailserver", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "nixos-mailserver", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "nixos-mailserver", - "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" - } - }, "mk-naked-shell": { "flake": false, "locked": { @@ -464,40 +384,13 @@ "type": "github" } }, - "nixos-mailserver": { - "inputs": { - "blobs": "blobs", - "flake-compat": "flake-compat_3", - "git-hooks": "git-hooks", - "nixpkgs": [ - "nixpkgs-unstable" - ], - "nixpkgs-25_05": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1747965231, - "narHash": "sha256-BW3ktviEhfCN/z3+kEyzpDKAI8qFTwO7+S0NVA0C90o=", - "owner": "simple-nixos-mailserver", - "repo": "nixos-mailserver", - "rev": "53007af63fade28853408370c4c600a63dd97f41", - "type": "gitlab" - }, - "original": { - "owner": "simple-nixos-mailserver", - "ref": "nixos-25.05", - "repo": "nixos-mailserver", - "type": "gitlab" - } - }, "nixpkgs": { "locked": { - "lastModified": 1750776420, - "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", + "lastModified": 1765779637, + "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", + "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "type": "github" }, "original": { @@ -509,11 +402,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1748740939, - "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "656a64127e9d791a334452c6b6606d17539476e2", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", "type": "github" }, "original": { @@ -524,11 +417,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1751159883, - "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", "type": "github" }, "original": { @@ -557,11 +450,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1753953669, - "narHash": "sha256-eT6CpwC12xJLCDYyE1zZ/rI+WaWHz1ki7J/ShtEolAw=", + "lastModified": 1767794651, + "narHash": "sha256-mfH88VDsS2pgH1haDEvJAdx7H/YAXbJfPafbyeXG7ao=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "56beea2a19170efb23d8d9e474ea0d45d2e07bac", + "rev": "36f60e183237e0501409df544e0154184ca9a069", "type": "github" }, "original": { @@ -573,11 +466,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1759831965, - "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=", + "lastModified": 1767640445, + "narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c9b6fb798541223bbb396d287d16f43520250518", + "rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5", "type": "github" }, "original": { @@ -621,16 +514,16 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1753749649, - "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=", + "lastModified": 1767634882, + "narHash": "sha256-2GffSfQxe3sedHzK+sTKlYo/NTIAGzbFCIsNMUPAAnk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a", + "rev": "3c9db02515ef1d9b6b709fc60ba9a540957f661c", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -823,11 +716,11 @@ ] }, "locked": { - "lastModified": 1749519371, - "narHash": "sha256-UJONN7mA2stweZCoRcry2aa1XTTBL0AfUOY84Lmqhos=", + "lastModified": 1763662255, + "narHash": "sha256-4bocaOyLa3AfiS8KrWjZQYu+IAta05u3gYZzZ6zXbT0=", "owner": "pyproject-nix", "repo": "build-system-pkgs", - "rev": "7c06967eca687f3482624250428cc12f43c92523", + "rev": "042904167604c681a090c07eb6967b4dd4dae88c", "type": "github" }, "original": { @@ -844,11 +737,11 @@ ] }, "locked": { - "lastModified": 1750499893, - "narHash": "sha256-ThKBd8XSvITAh2JqU7enOp8AfKeQgf9u7zYC41cnBE4=", + "lastModified": 1764134915, + "narHash": "sha256-xaKvtPx6YAnA3HQVp5LwyYG1MaN4LLehpQI8xEdBvBY=", "owner": "pyproject-nix", "repo": "pyproject.nix", - "rev": "e824458bd917b44bf4c38795dea2650336b2f55d", + "rev": "2c8df1383b32e5443c921f61224b198a2282a657", "type": "github" }, "original": { @@ -903,7 +796,6 @@ "catinator": "catinator", "flake-parts": "flake-parts_2", "nixinate": "nixinate", - "nixos-mailserver": "nixos-mailserver", "nixpkgs": "nixpkgs_4", "nixpkgs-master": "nixpkgs-master", "nixpkgs-unstable": "nixpkgs-unstable", @@ -952,11 +844,11 @@ "secrets": { "flake": false, "locked": { - "lastModified": 1748949914, - "narHash": "sha256-ZMhFWEHYSw9nRprh3GunZ3mD3y/mVmLuPkpO4quRJqY=", + "lastModified": 1761000377, + "narHash": "sha256-xaPyk/q6K3ALk8K3Wrf8FZALIO1jEQPGsSTqFoJwn04=", "ref": "refs/heads/main", - "rev": "15d23f245d068c92500decd8d93f6436f72b7e4d", - "revCount": 31, + "rev": "6bd4e1f8275697747cc71c4858196129dc7de2bf", + "revCount": 40, "type": "git", "url": "ssh://git@gitlab.com/cocainefarm/k8s/secrets" }, @@ -1084,11 +976,11 @@ ] }, "locked": { - "lastModified": 1750987094, - "narHash": "sha256-GujDElxLgYatnNvuL1U6qd18lcuG6anJMjpfYRScV08=", + "lastModified": 1765631794, + "narHash": "sha256-90d//IZ4GXipNsngO4sb2SAPbIC/a2P+IAdAWOwpcOM=", "owner": "pyproject-nix", "repo": "uv2nix", - "rev": "4b703d851b61e664a70238711a8ff0efa1aa2f52", + "rev": "4cca323a547a1aaa9b94929c4901bed5343eafe8", "type": "github" }, "original": { @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-master.url = "github:NixOS/nixpkgs/master"; flake-parts.url = "github:hercules-ci/flake-parts"; @@ -15,12 +15,6 @@ pastor.url = "gitlab:cocainefarm/pastor/feature/nix"; authentik-nix.url = "github:nix-community/authentik-nix"; - - nixos-mailserver = { - url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; - inputs.nixpkgs-25_05.follows = "nixpkgs"; - }; }; outputs = @@ -32,7 +26,6 @@ flake-parts, nixinate, authentik-nix, - nixos-mailserver, ... }: flake-parts.lib.mkFlake { inherit inputs; } { @@ -142,7 +135,6 @@ hetzner acme - nixos-mailserver.nixosModules.default mailserver ]); }; diff --git a/modules/common/networking.nix b/modules/common/networking.nix index 9829672..38ae467 100644 --- a/modules/common/networking.nix +++ b/modules/common/networking.nix @@ -32,8 +32,8 @@ PrivateNetwork = true; ExecStart = "${pkgs.writers.writeDash "netns-up" '' ${pkgs.iproute2}/bin/ip netns add $1 - ${pkgs.utillinux}/bin/umount /var/run/netns/$1 - ${pkgs.utillinux}/bin/mount --bind /proc/self/ns/net /var/run/netns/$1 + ${pkgs.util-linux}/bin/umount /var/run/netns/$1 + ${pkgs.util-linux}/bin/mount --bind /proc/self/ns/net /var/run/netns/$1 ''} %I"; ExecStop = "${pkgs.iproute2}/bin/ip netns del %I"; PrivateMounts = false; diff --git a/modules/garage/default.nix b/modules/garage/default.nix index 56a38c2..4395299 100644 --- a/modules/garage/default.nix +++ b/modules/garage/default.nix @@ -10,7 +10,7 @@ with self.lib.nginx; { services.garage = { enable = true; - package = pkgs.garage_2_0_0; + package = pkgs.garage_2; settings = { replication_factor = 3; consistency_mode = "consistent"; diff --git a/modules/hetzner/default.nix b/modules/hetzner/default.nix index af44deb..ffef1ca 100644 --- a/modules/hetzner/default.nix +++ b/modules/hetzner/default.nix @@ -8,4 +8,5 @@ boot.loader.grub.device = "/dev/sda"; fileSystems."/" = { device = "/dev/sda1"; fsType = "ext4"; }; + fileSystems."/boot" = { device = "/dev/sda15"; fsType = "vfat"; }; } diff --git a/modules/mailserver/default.nix b/modules/mailserver/default.nix index 30e4506..3d0360e 100644 --- a/modules/mailserver/default.nix +++ b/modules/mailserver/default.nix @@ -2,13 +2,12 @@ config, lib, pkgs, - nixpkgs-unstable, ... }: { - disabledModules = [ "services/mail/stalwart-mail.nix" ]; - imports = [ "${nixpkgs-unstable}/nixos/modules/services/mail/stalwart-mail.nix" ]; + # disabledModules = [ "services/mail/stalwart-mail.nix" ]; + # imports = [ "${nixpkgs-unstable}/nixos/modules/services/mail/stalwart-mail.nix" ]; services.stalwart-mail = { enable = true; diff --git a/modules/matrix/pkgs/node-env.nix b/modules/matrix/pkgs/node-env.nix index bc1e366..38f3e35 100644 --- a/modules/matrix/pkgs/node-env.nix +++ b/modules/matrix/pkgs/node-env.nix @@ -4,7 +4,7 @@ let # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master - utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; + utillinux = pkgs.util-linux; python = if nodejs ? python then nodejs.python else python2; diff --git a/modules/powerdns/default.nix b/modules/powerdns/default.nix index ae2f31e..b2f6993 100644 --- a/modules/powerdns/default.nix +++ b/modules/powerdns/default.nix @@ -60,7 +60,7 @@ in }; config = { - environment.systemPackages = [ pkgs.powerdns ]; + environment.systemPackages = [ pkgs.pdns ]; services.powerdns = { enable = true; extraConfig = |