diff --git a/host/Rory-nginx/services/discordbots.nix b/host/Rory-nginx/services/discordbots.nix
index b0b9cf2..0775d95 100755
--- a/host/Rory-nginx/services/discordbots.nix
+++ b/host/Rory-nginx/services/discordbots.nix
@@ -3,8 +3,6 @@
{
imports =
[
- ../../modules/base-server.nix
- # ./services.nix
botcore-v4.modules.bots
botcore-v4.modules.frontend
botcore-v4.modules.dataupdater
diff --git a/host/Rory-nginx/services/matrix/conduit.nix b/host/Rory-nginx/services/matrix/conduit.nix
index e3ccc66..2f813ea 100755
--- a/host/Rory-nginx/services/matrix/conduit.nix
+++ b/host/Rory-nginx/services/matrix/conduit.nix
@@ -1,11 +1,6 @@
{ config, pkgs, lib, conduit-flake, ... }:
{
- imports =
- [
- ../../modules/base-server.nix
- ];
-
services.matrix-conduit = {
package = conduit-flake;
enable = true;
diff --git a/host/Rory-nginx/services/matrix/coturn.nix b/host/Rory-nginx/services/matrix/coturn.nix
index 434dd52..090f91d 100755
--- a/host/Rory-nginx/services/matrix/coturn.nix
+++ b/host/Rory-nginx/services/matrix/coturn.nix
@@ -1,7 +1,6 @@
{ config, pkgs, lib, ... }:
{
-
# coturn (WebRTC)
services.coturn = rec {
enable = false; # Alicia - figure out secret first...
diff --git a/host/Rory-nginx/services/matrix/draupnir.nix b/host/Rory-nginx/services/matrix/draupnir.nix
index 19a2f16..29b5168 100755
--- a/host/Rory-nginx/services/matrix/draupnir.nix
+++ b/host/Rory-nginx/services/matrix/draupnir.nix
@@ -1,11 +1,6 @@
{ config, pkgs, lib, ... }:
{
- imports =
- [
- ../../modules/base-server.nix
- ];
-
# Alicia - doesnt work yet... until in nixpkgs...
services.draupnir = {
enable = true;
diff --git a/host/Rory-nginx/services/matrix/synapse.nix b/host/Rory-nginx/services/matrix/synapse.nix
index 7809384..f9b746d 100755
--- a/host/Rory-nginx/services/matrix/synapse.nix
+++ b/host/Rory-nginx/services/matrix/synapse.nix
@@ -1,11 +1,6 @@
{ config, pkgs, lib, ... }:
{
- imports =
- [
- ../../modules/base-server.nix
- ];
-
services.matrix-synapse = {
enable = true;
withJemalloc = true;
diff --git a/host/Rory-nginx/services/nginx.nix b/host/Rory-nginx/services/nginx.nix
index 56b09f4..0aa08bf 100755
--- a/host/Rory-nginx/services/nginx.nix
+++ b/host/Rory-nginx/services/nginx.nix
@@ -1,12 +1,6 @@
{ config, pkgs, lib, ... }:
{
- imports =
- [
- ../../modules/base-server.nix
- #../../modules/packages/gitfs.nix
- ];
-
services = {
nginx = {
enable = true;
diff --git a/host/Rory-nginx/services/postgres.nix b/host/Rory-nginx/services/postgres.nix
index 7b75435..d5acd3c 100755
--- a/host/Rory-nginx/services/postgres.nix
+++ b/host/Rory-nginx/services/postgres.nix
@@ -1,11 +1,6 @@
{ config, pkgs, lib, ... }:
{
- imports =
- [
- ../../modules/base-server.nix
- ];
-
systemd.tmpfiles.rules = [ "d /mnt/postgres/data 0750 postgres postgres" ];
services.postgresql = {
|