desktop changes

3 files changed, 77 insertions, 0 deletions

diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix

index 744dfb2..c8f6ea5 100644
--- a/host/Rory-desktop/configuration.nix
+++ b/host/Rory-desktop/configuration.nix
@@ -177,6 +177,7 @@ args@{
     #(callPackage ../../packages/mc/server/modpack/curseforge/techopolis-2/5.4.nix { })
 
     #vesktop
+    discord-development
     virt-viewer
 
     # (dwarf-fortress-packages.dwarf-fortress-full.override { enableStoneSense = true; enableFPS = true; theme = dwarf-fortress-packages.themes.spacefox; })
diff --git a/host/Rory-desktop/nginx.nix b/host/Rory-desktop/nginx.nix

index 297afcf..e69f15b 100644
--- a/host/Rory-desktop/nginx.nix
+++ b/host/Rory-desktop/nginx.nix
@@ -32,6 +32,7 @@
       virtualHosts = {
         "discord.localhost" = import ./nginx/discord.localhost.nix { inherit pkgs; };
         "hse.localhost" = import ./nginx/hse.localhost.nix { inherit pkgs; };
+        "matrix.opensuse.localhost" = import ./nginx/matrix.opensuse.localhost.nix { inherit pkgs; };
       };
     };
   };
diff --git a/host/Rory-desktop/nginx/matrix.opensuse.localhost.nix b/host/Rory-desktop/nginx/matrix.opensuse.localhost.nix
new file mode 100644

index 0000000..87287a4
--- /dev/null
+++ b/host/Rory-desktop/nginx/matrix.opensuse.localhost.nix
@@ -0,0 +1,75 @@
+{pkgs, ...}:
+{
+  enableACME = false;
+  addSSL = true;
+  # We don't care about certificates around here...
+  sslCertificate = "${pkgs.path}/nixos/tests/common/acme/server/acme.test.cert.pem";
+  sslCertificateKey = "${pkgs.path}/nixos/tests/common/acme/server/acme.test.key.pem";
+  locations."/" = {
+    #proxyPass = "http://127.0.0.1:9001";
+    proxyPass = "http://localhost:8008";
+    extraConfig = ''
+      if ($request_method = 'OPTIONS') {
+        more_set_headers 'Access-Control-Allow-Origin: *';
+        more_set_headers 'Access-Control-Allow-Methods: *';
+        #
+        # Custom headers and headers various browsers *should* be OK with but aren't
+        #
+        more_set_headers 'Access-Control-Allow-Headers: *, Authorization';
+        #
+        # Tell client that this pre-flight info is valid for 20 days
+        #
+        more_set_headers 'Access-Control-Max-Age: 1728000';
+        more_set_headers 'Content-Type: text/plain; charset=utf-8';
+        more_set_headers 'Content-Length: 0';
+        return 204;
+      }
+    '';
+  };
+
+#  locations."= /.well-known/matrix/server".extraConfig = ''
+#    more_set_headers 'Content-Type application/json';
+#    more_set_headers 'Access-Control-Allow-Origin *';
+#    return 200 '${builtins.toJSON { "m.server" = "hse.localhost:5298"; }}';
+#  '';
+#  locations."= /.well-known/matrix/client".extraConfig = ''
+#    more_set_headers 'Content-Type application/json';
+#    more_set_headers 'Access-Control-Allow-Origin *';
+#    return 200 '${
+#      builtins.toJSON {
+#        "m.homeserver".base_url = "http://hse.localhost:5298";
+#        "org.matrix.msc3575.proxy".url = "https://matrix.rory.gay";
+#      }
+#    }';
+#  '';
+  locations."= /.well-known/matrix/support".extraConfig = ''
+    more_set_headers 'Content-Type application/json';
+    more_set_headers 'Access-Control-Allow-Origin *';
+    return 200 '${
+      builtins.toJSON {
+        admins = [
+          {
+            matrix_id = "@emma:rory.gay";
+            role = "admin";
+          }
+          {
+            matrix_id = "@alicia:rory.gay";
+            role = "admin";
+          }
+          {
+            matrix_id = "@root:rory.gay";
+            role = "admin";
+          }
+          {
+            matrix_id = "@rory:rory.gay";
+            role = "admin";
+          }
+        ];
+      }
+    }';
+  '';
+
+  locations."~ ^/(client/|_matrix/client/unstable/org.matrix.msc3575/sync)" = {
+    proxyPass = "http://localhost:8100";
+  };
+}