Server config cleanup

5 files changed, 9 insertions, 81 deletions

diff --git a/host/Rory-nginx/services/containers/matrixunittests-conduit/container.nix b/host/Rory-nginx/services/containers/matrixunittests-conduit/container.nix
index 08e6760..987348e 100755
--- a/host/Rory-nginx/services/containers/matrixunittests-conduit/container.nix
+++ b/host/Rory-nginx/services/containers/matrixunittests-conduit/container.nix
@@ -1,9 +1,4 @@
-{
-  pkgs,
-  lib,
-  conduit,
-  ...
-}:
+{ conduit, ... }:
 
 {
   privateNetwork = true;
@@ -19,7 +14,11 @@
       ...
     }:
     {
-      imports = [ ./root.nix ];
+      imports = [
+        ../shared.nix
+        ./services/nginx.nix
+        ./services/conduit.nix
+      ];
       environment.etc."resolv.conf".text = ''
         nameserver 8.8.8.8
         nameserver 8.4.4.8
@@ -28,14 +27,9 @@
       '';
       networking.firewall = {
         enable = true;
-        allowedTCPPorts = [
-          80
-          5432
-        ];
+        allowedTCPPorts = [ 80 ];
       };
     };
   hostAddress = "192.168.100.14";
   localAddress = "192.168.100.15";
-  hostAddress6 = "fc00::5";
-  localAddress6 = "fc00::6";
 }
diff --git a/host/Rory-nginx/services/containers/matrixunittests-conduit/root.nix b/host/Rory-nginx/services/containers/matrixunittests-conduit/root.nix
deleted file mode 100755
index a9929d2..0000000
--- a/host/Rory-nginx/services/containers/matrixunittests-conduit/root.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  conduit,
-  ...
-}:
-
-{
-  imports = [
-    ./services/nginx.nix
-    ./services/conduit.nix
-    ./services/pantalaimon.nix
-  ];
-
-  environment.systemPackages = with pkgs; [
-    wget
-    neofetch
-    lnav
-    zsh
-    git
-    lsd
-    htop
-    btop
-    duf
-    kitty.terminfo
-    neovim
-    tmux
-    jq
-    yq
-    pv
-    dig
-    cloud-utils
-  ];
-}
diff --git a/host/Rory-nginx/services/containers/matrixunittests-conduit/services/conduit.nix b/host/Rory-nginx/services/containers/matrixunittests-conduit/services/conduit.nix
index 6713b26..3df71be 100755
--- a/host/Rory-nginx/services/containers/matrixunittests-conduit/services/conduit.nix
+++ b/host/Rory-nginx/services/containers/matrixunittests-conduit/services/conduit.nix
@@ -1,10 +1,4 @@
-{
-  config,
-  pkgs,
-  lib,
-  conduit,
-  ...
-}:
+{ pkgs, conduit, ... }:
 
 {
   services.matrix-conduit = {
diff --git a/host/Rory-nginx/services/containers/matrixunittests-conduit/services/nginx.nix b/host/Rory-nginx/services/containers/matrixunittests-conduit/services/nginx.nix
index 0678047..0d7874e 100755
--- a/host/Rory-nginx/services/containers/matrixunittests-conduit/services/nginx.nix
+++ b/host/Rory-nginx/services/containers/matrixunittests-conduit/services/nginx.nix
@@ -1,9 +1,4 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
+{ pkgs, ... }:
 
 {
   services = {
diff --git a/host/Rory-nginx/services/containers/matrixunittests-conduit/services/pantalaimon.nix b/host/Rory-nginx/services/containers/matrixunittests-conduit/services/pantalaimon.nix
deleted file mode 100755
index da95e76..0000000
--- a/host/Rory-nginx/services/containers/matrixunittests-conduit/services/pantalaimon.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-
-{
-  services.pantalaimon-headless = {
-    instances."localhost" = {
-      homeserver = "http://localhost:6167";
-      ssl = false;
-      extraSettings = {
-        "DropOldKeys" = true;
-        "UseKeyring" = false;
-      };
-    };
-  };
-
-}