summaryrefslogtreecommitdiff
path: root/machines
diff options
context:
space:
mode:
Diffstat (limited to 'machines')
-rw-r--r--machines/lapin/default.nix4
-rw-r--r--machines/renard/default.nix4
2 files changed, 3 insertions, 5 deletions
diff --git a/machines/lapin/default.nix b/machines/lapin/default.nix
index f774bea..376c7a4 100644
--- a/machines/lapin/default.nix
+++ b/machines/lapin/default.nix
@@ -7,9 +7,6 @@
./hardware.nix
./devices.nix
- # TODO: migrate to fork.
- # R.I.P. conduwuit :(
- # ../../services/conduwuit.nix
../../services/pds.nix
../../services/akkoma
];
@@ -28,7 +25,6 @@
"base"
"akkoma"
"pds"
- "conduwuit"
];
};
};
diff --git a/machines/renard/default.nix b/machines/renard/default.nix
index 2f9dcb6..c3fb0fe 100644
--- a/machines/renard/default.nix
+++ b/machines/renard/default.nix
@@ -15,6 +15,7 @@
../../services/minecraft.nix
../../services/miniflux.nix
../../services/shiori.nix
+ ../../services/matrix.nix
../../services/irc
];
@@ -42,6 +43,7 @@
"git"
"mel"
"shorest"
+ "matrix"
];
};
};
@@ -53,7 +55,7 @@
return = "301 https://soc.rnrd.eu$request_uri";
};
- # delegate matrix to lapin
+ # delegate matrix to subdomain `matrix.rnrd.eu`
"/.well-known/matrix/server" = {
return = "200 '{ \"m.server\": \"matrix.rnrd.eu:443\" }'";
extraConfig = ''