bash: fix stress-mem

[sourcephile-nix.git] / hosts / mermet.nix

diff --git a/hosts/mermet.nix b/hosts/mermet.nix
index 895167be27bd43eee4797e24e2363a7d88f4ea11..8625f103bd486e2e34e174bab557af17f57157f5 100644 (file)
--- a/hosts/mermet.nix
+++ b/hosts/mermet.nix
@@ -7,18 +7,6 @@ system = "x86_64-linux";
 extraArgs = rec {
   CPUs = 4;
   ipv4 = "80.67.180.129";
-  wireguard = rec {
-    wg-intra = {
-      ipv4 = "192.168.42.1";
-      listenPort = 43642;
-      persistentKeepalive = null;
-      peer = {
-        publicKey = "XbTEP2X71LBTjmdmySdiOpQJ+uIomcXvg1aiQGUtWBI=";
-        allowedIPs = [ "${wg-intra.ipv4}/32" ];
-        endpoint = "${ipv4}:${toString wg-intra.listenPort}";
-      };
-    };
-  };
 };
 modules = [
   ../nixos/defaults.nix
@@ -38,12 +26,13 @@ modules = [
   mermet/nginx.nix
   mermet/openldap.nix
   mermet/postfix.nix
+  mermet/postgresql.nix
   mermet/prosody.nix
   mermet/public-inbox.nix
-  mermet/redis.nix
   mermet/rspamd.nix
   mermet/sanoid.nix
   mermet/security.nix
+  mermet/sourcehut.nix
   mermet/system.nix
   mermet/unbound.nix
   mermet/users.nix