1 files changed, 20 insertions, 26 deletions
diff --git a/host/Rory-nginx/configuration.nix b/host/Rory-nginx/configuration.nix
index 3f0bcc4..9448569 100755..100644
--- a/host/Rory-nginx/configuration.nix
+++ b/host/Rory-nginx/configuration.nix
@@ -18,13 +18,15 @@
     ../../modules/users/Alice.nix
 
     ./services/postgres.nix
-    ./services/matrix/root.nix
     ./services/nginx/nginx.nix
     #./services/jitsi.nix
     ./services/cgit.nix
-    #./services/ollama.nix
+    ./services/ollama.nix
+    ./services/deluge.nix
     ./services/prometheus.nix
   ];
+
+  boot.loader.grub.devices = [ "/dev/vda" ];
   users.groups.ocp = { };
   networking = {
     hostName = "Rory-nginx";
@@ -51,27 +53,25 @@
       enableIPv6 = false;
     };
     enableIPv6 = lib.mkForce false;
-    nameservers = lib.mkOverride [ "192.168.1.1" ];
+    nameservers = lib.mkForce [ "192.168.1.1" ];
   };
 
-#  environment.etc."resolv.conf" = lib.mkOverride {
-#    text = ''
-#      nameserver 192.168.1.1
-#    '';
-#  };
-
   monitoring = {
     monitorAll = true;
     localPrometheus = true;
     exposePrometheus = true;
     localGrafana = true;
     exposeGrafana = true;
-    nginxHost = "monitoring.rory.gay";
+    nginxHost = "monitoring.old.rory.gay";
     nginxSsl = true;
   };
 
-  nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" ];
-
+  nixpkgs.config.permittedInsecurePackages = [
+    "olm-3.2.16"
+    "dotnet-runtime-wrapped-7.0.20"
+    "dotnet-runtime-7.0.20"
+    "dotnet-sdk-7.0.20"
+  ];
   services.irqbalance.enable = true;
 
   environment.memoryAllocator.provider = "jemalloc";
@@ -81,23 +81,17 @@
   #  conduit = grapevine;
   #};
 
-  containers."matrixunittests" = import ./services/containers/matrixunittests/container.nix { inherit pkgs lib grapevine; };
-
-  containers."matrixunittests-conduit" = import ./services/containers/matrixunittests-conduit/container.nix {
-    inherit pkgs lib;
-    conduit = conduit;
+  containers."matrixunittests" = import ./services/containers/matrixunittests/container.nix {
+    inherit pkgs lib grapevine;
   };
-
-  services.pgadmin = {
-    enable = true;
-    initialEmail = "root@localhost.localdomain";
-    initialPasswordFile = "/etc/matrix-user-pass";
-  };
-  containers."draupnir-cme" = import ./services/containers/draupnir-cme/container.nix { inherit pkgs lib nixpkgs-Draupnir; };
-
-  #containers."draupnir-linux-mint" = import ./services/containers/draupnir-linux-mint/container.nix { inherit pkgs lib nixpkgs-Draupnir; };
+  #
+  #containers."matrixunittests-conduit" = import ./services/containers/matrixunittests-conduit/container.nix {
+  #  inherit pkgs lib;
+  #  conduit = conduit;
+  #};
 
   system.stateVersion = "22.11"; # DO NOT EDIT!
 
   environment.systemPackages = with pkgs; [ waypipe ];
+  nix.nrBuildUsers = 128;
 }