Merge branch 'canon' of https://git.qtp2t.club/hazel/etc into canon

machines/kerria/default.nix

@@ -56,6 +56,7 @@
         directory = /var/www/wkd;
       };
     };
+    lemniscation.enable = true;
 
     mailserver.enable = true;
 

modules/services/default.nix

@@ -3,6 +3,7 @@
   imports = [
     ./bitwarden.nix
     ./gitea.nix
+    ./lemniscation.nix
     ./linx.nix
     ./mail.nix
     ./minecraft.nix

modules/services/lemniscation.nix

@@ -0,0 +1,31 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.hazel.services.lemniscation;
+  nginxCfg = config.hazel.services.nginx;
+in
+with lib; {
+  options.hazel.services.lemniscation.enable = mkEnableOption "lemniscation";
+
+  config = mkIf cfg.enable {
+    services.nginx.virtualHosts = if nginxCfg.enable then 
+    let
+      redirect = {
+        forceSSL = nginxCfg.ssl;
+        enableACME = nginxCfg.ssl;
+        locations."/" = {
+          return = "301 http://lemniscation.com";
+        };
+      };
+    in {
+      "lemniscation.com" = {
+        forceSSL = nginxCfg.ssl;
+        enableACME = nginxCfg.ssl;
+
+        serverAliases = [ "www.lemniscation.com" ];
+        root = "/var/www/lemniscation";
+      }; 
+      "lemniscation.qtp2t.club" = redirect;
+      "lemniscation.knightsofthelambdacalcul.us" = redirect;
+    } else {};
+  };
+}

modules/services/mail.nix

@@ -32,7 +32,6 @@ with lib; {
         "hazel@knightsofthelambdacalcul.us" = {
           hashedPasswordFile = /etc/snm-hashed-passwd;
           aliases = [ "postmaster@knightsofthelambdacalcul.us" ];
-          catchAll = [ "knightsofthelambdacalcul.us" ];
         };
       };
 

modules/services/nginx.nix

@@ -126,8 +126,6 @@ with lib; {
            }));
         "blog.knightsofthelambdacalcul.us" =
           (mkVHost [] "${pkgs.hazel.ziodyne-blog}" {});
-        "lemniscation.knightsofthelambdacalcul.us" =
-          (mkVHost [] "/var/www/lemniscation" {});
         "mail.knightsofthelambdacalcul.us" =
           (mkVHost [] "/var/www/notawebsite" {});
 
@@ -142,7 +140,6 @@ with lib; {
         "blog.qtp2t.club" = (mkRedirect "blog");
         "cloud.qtp2t.club" = (mkRedirect "cloud");
         "git.qtp2t.club" = (mkRedirect "git");
-        "lemniscation.qtp2t.club" = (mkRedirect "lemniscation");
         "p.qtp2t.club" = (mkRedirect "p");
         "ring.qtp2t.club" = (mkRedirect "ring");
         "vault.qtp2t.club" = (mkRedirect "vault");

modules/services/perihelion.nix

@@ -19,11 +19,12 @@ with lib; {
     ];
 
     environment.etc."perihelion/users.txt".text = ''
-      hazel https://knightsofthelambdacalcul.us/
-      if https://tilde.club/~if/
-      haskal https://tilde.town/~haskal/
-      alicja https://spinlock.icu/
-      5225225 https://5snb.club/
+      hazel|https://knightsofthelambdacalcul.us/
+      if|https://tilde.club/~if/
+      haskal|https://tilde.town/~haskal/
+      not-haskal|https://awoo.systems/
+      5225225|https://5snb.club/
+      cadence|https://cadence.moe/
     '';
 
     systemd.services.perihelion = {

nix/sources.json

@@ -142,7 +142,7 @@
     "perihelion": {
         "ref": "canon",
         "repo": "https://git.qtp2t.club/hazel/perihelion",
-        "rev": "2945d803b2b411046f01641a8d5687212d4cac4d",
+        "rev": "ff88ce09644addf8610d3a190e8a32f9fd2199fd",
         "type": "git"
     },
     "sha256-simd": {