feat: add the slides site

2023-09-28 00:26:32 +01:00 · 2023-09-28 00:26:32 +01:00 · 48c271cf3f
commit 48c271cf3f
parent d8df11dcf1
3 changed files with 289 additions and 128 deletions
--- a/applications/skynet.ie.nix
+++ b/applications/skynet.ie.nix
@ -29,6 +29,7 @@ in {
      # the root one is already covered by teh certificate
      "2016.skynet.ie"
      "discord.skynet.ie"
+      "slides.skynet.ie"
    ];

    skynet_dns.records = [
@ -48,6 +49,11 @@ in {
        r_type = "CNAME";
        value = cfg.host.name;
      }
+      {
+        record = "slides";
+        r_type = "CNAME";
+        value = cfg.host.name;
+      }
    ];

    networking.firewall.allowedTCPPorts = [80 443];
@ -70,12 +76,18 @@ in {
          root = "${inputs.skynet_website_2016.defaultPackage."x86_64-linux"}";
        };

-        # archive of teh site as it was ~2012 to 2016
+        # a custom discord url, because we are too cheap otehrwise
        "discord.skynet.ie" = {
          forceSSL = true;
          useACMEHost = "skynet";
          locations."/".return = "307 https://discord.gg/mkuKJkCuyM";
        };
+
+        "slides.skynet.ie" = {
+          forceSSL = true;
+          useACMEHost = "skynet";
+          root = "${inputs.compsoc_slides.packages.x86_64-linux.default}";
+        };
      };
    };
  };
--- a/flake.lock
+++ b/flake.lock
@ -63,6 +63,26 @@
        "type": "github"
      }
    },
+    "bfom": {
+      "inputs": {
+        "naersk": "naersk",
+        "nixpkgs": "nixpkgs_4",
+        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1695591744,
+        "narHash": "sha256-3gbqM5smCXV/MrEO9frmc/cJbKHFoUW/eOfFu88Dg9w=",
+        "owner": "silver_rust",
+        "repo": "bfom",
+        "rev": "12301d7e8dca2312c2e7db9760b953458b43b076",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "silver_rust",
+        "repo": "bfom",
+        "type": "gitlab"
+      }
+    },
    "blobs": {
      "flake": false,
      "locked": {
@ -79,6 +99,28 @@
        "type": "gitlab"
      }
    },
+    "compsoc_slides": {
+      "inputs": {
+        "bfom": "bfom",
+        "nixpkgs": "nixpkgs_5",
+        "utils": "utils_2"
+      },
+      "locked": {
+        "host": "gitlab.skynet.ie",
+        "lastModified": 1695856541,
+        "narHash": "sha256-DUz7mZRFm0BCj6jJo+pUzML4vlVsP0Xgppozvp0uiZU=",
+        "owner": "compsoc1%2Fcompsoc",
+        "repo": "presentations",
+        "rev": "d93a8e0a8d0e596b3c8c0fdf98bfa194faea2027",
+        "type": "gitlab"
+      },
+      "original": {
+        "host": "gitlab.skynet.ie",
+        "owner": "compsoc1%2Fcompsoc",
+        "repo": "presentations",
+        "type": "gitlab"
+      }
+    },
    "darwin": {
      "inputs": {
        "nixpkgs": [
@ -162,7 +204,7 @@
    },
    "flake-utils": {
      "inputs": {
-        "systems": "systems"
+        "systems": "systems_2"
      },
      "locked": {
        "lastModified": 1689068808,
@ -233,7 +275,25 @@
    },
    "naersk": {
      "inputs": {
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1652722411,
+        "narHash": "sha256-FxzNgYiH9c91hUVAntcjrqY//KOTUPP2a4e8Wyuysxg=",
+        "owner": "nix-community",
+        "repo": "naersk",
+        "rev": "94beb7a3edfeb3bcda65fa3f2ebc48ec6b40bf72",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "naersk",
+        "type": "github"
+      }
+    },
+    "naersk_2": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_8"
      },
      "locked": {
        "lastModified": 1692351612,
@ -249,9 +309,9 @@
        "type": "github"
      }
    },
-    "naersk_2": {
+    "naersk_3": {
      "inputs": {
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": "nixpkgs_10"
      },
      "locked": {
        "lastModified": 1686572087,
@ -314,6 +374,49 @@
      }
    },
    "nixpkgs_10": {
+      "locked": {
+        "lastModified": 1687011986,
+        "narHash": "sha256-ZNSi/wBw12d7LO8YcZ4aehIlPp4lgSkKbrHaoF80IKI=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "2c09e8eb8717e240ef9c5727c1cc9186db9fb309",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_11": {
+      "locked": {
+        "lastModified": 1686921029,
+        "narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-23.05",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_12": {
+      "locked": {
+        "lastModified": 1687274257,
+        "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_13": {
      "locked": {
        "lastModified": 1689935543,
        "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=",
@ -327,7 +430,7 @@
        "type": "indirect"
      }
    },
-    "nixpkgs_11": {
+    "nixpkgs_14": {
      "locked": {
        "lastModified": 1690026219,
        "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=",
@ -358,6 +461,48 @@
      }
    },
    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1652840887,
+        "narHash": "sha256-gEK4NNa4GwIgTZE63kt/4WTFAWRTJVSa30+h4ZjFh9U=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "52dc75a4fee3fdbcb792cb6fba009876b912bfe0",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1652840887,
+        "narHash": "sha256-gEK4NNa4GwIgTZE63kt/4WTFAWRTJVSa30+h4ZjFh9U=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "52dc75a4fee3fdbcb792cb6fba009876b912bfe0",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1691371061,
+        "narHash": "sha256-BxPbPVlBIoneaXIBiHd0LVzA+L4nmvFCNBU6TmQAiMM=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5068bc8fe943bde3c446326da8d0ca9c93d5a682",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_6": {
      "locked": {
        "lastModified": 1691276849,
        "narHash": "sha256-RNnrzxhW38SOFIF6TY/WaX7VB3PCkYFEeRE5YZU+wHw=",
@ -372,7 +517,7 @@
        "type": "indirect"
      }
    },
-    "nixpkgs_4": {
+    "nixpkgs_7": {
      "locked": {
        "lastModified": 1670751203,
        "narHash": "sha256-XdoH1v3shKDGlrwjgrNX/EN8s3c+kQV7xY6cLCE8vcI=",
@ -387,7 +532,7 @@
        "type": "indirect"
      }
    },
-    "nixpkgs_5": {
+    "nixpkgs_8": {
      "locked": {
        "lastModified": 1693060755,
        "narHash": "sha256-KNsbfqewEziFJEpPR0qvVz4rx0x6QXxw1CcunRhlFdk=",
@ -401,7 +546,7 @@
        "type": "indirect"
      }
    },
-    "nixpkgs_6": {
+    "nixpkgs_9": {
      "locked": {
        "lastModified": 1693087214,
        "narHash": "sha256-Kn1SSqRfPpqcI1MDy82JXrPT1WI8c03TA2F0xu6kS+4=",
@ -416,56 +561,14 @@
        "type": "indirect"
      }
    },
-    "nixpkgs_7": {
-      "locked": {
-        "lastModified": 1687011986,
-        "narHash": "sha256-ZNSi/wBw12d7LO8YcZ4aehIlPp4lgSkKbrHaoF80IKI=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2c09e8eb8717e240ef9c5727c1cc9186db9fb309",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_8": {
-      "locked": {
-        "lastModified": 1686921029,
-        "narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-23.05",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_9": {
-      "locked": {
-        "lastModified": 1687274257,
-        "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
    "root": {
      "inputs": {
        "agenix": "agenix",
        "alejandra": "alejandra",
        "arion": "arion",
+        "compsoc_slides": "compsoc_slides",
        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_6",
        "simple-nixos-mailserver": "simple-nixos-mailserver",
        "skynet_discord_bot": "skynet_discord_bot",
        "skynet_ldap_backend": "skynet_ldap_backend",
@ -495,10 +598,10 @@
      "inputs": {
        "blobs": "blobs",
        "flake-compat": "flake-compat",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_7",
        "nixpkgs-22_11": "nixpkgs-22_11",
        "nixpkgs-23_05": "nixpkgs-23_05",
-        "utils": "utils"
+        "utils": "utils_3"
      },
      "locked": {
        "lastModified": 1689976554,
@ -516,9 +619,9 @@
    },
    "skynet_discord_bot": {
      "inputs": {
-        "naersk": "naersk",
-        "nixpkgs": "nixpkgs_6",
-        "utils": "utils_2"
+        "naersk": "naersk_2",
+        "nixpkgs": "nixpkgs_9",
+        "utils": "utils_4"
      },
      "locked": {
        "host": "gitlab.skynet.ie",
@ -538,9 +641,9 @@
    },
    "skynet_ldap_backend": {
      "inputs": {
-        "naersk": "naersk_2",
-        "nixpkgs": "nixpkgs_8",
-        "utils": "utils_3"
+        "naersk": "naersk_3",
+        "nixpkgs": "nixpkgs_11",
+        "utils": "utils_5"
      },
      "locked": {
        "host": "gitlab.skynet.ie",
@ -560,8 +663,8 @@
    },
    "skynet_ldap_frontend": {
      "inputs": {
-        "nixpkgs": "nixpkgs_9",
-        "utils": "utils_4"
+        "nixpkgs": "nixpkgs_12",
+        "utils": "utils_6"
      },
      "locked": {
        "host": "gitlab.skynet.ie",
@ -581,8 +684,8 @@
    },
    "skynet_website": {
      "inputs": {
-        "nixpkgs": "nixpkgs_10",
-        "utils": "utils_5"
+        "nixpkgs": "nixpkgs_13",
+        "utils": "utils_7"
      },
      "locked": {
        "host": "gitlab.skynet.ie",
@ -602,8 +705,8 @@
    },
    "skynet_website_2016": {
      "inputs": {
-        "nixpkgs": "nixpkgs_11",
-        "utils": "utils_6"
+        "nixpkgs": "nixpkgs_14",
+        "utils": "utils_8"
      },
      "locked": {
        "host": "gitlab.skynet.ie",
@ -711,13 +814,28 @@
        "type": "github"
      }
    },
+    "systems_7": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
    "utils": {
      "locked": {
-        "lastModified": 1605370193,
-        "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=",
+        "lastModified": 1652776076,
+        "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "5021eac20303a61fafe17224c087f5519baed54d",
+        "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8",
        "type": "github"
      },
      "original": {
@ -728,61 +846,7 @@
    },
    "utils_2": {
      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1692799911,
-        "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "utils_3": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1685518550,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "utils_4": {
-      "inputs": {
-        "systems": "systems_4"
-      },
-      "locked": {
-        "lastModified": 1687171271,
-        "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "utils_5": {
-      "inputs": {
-        "systems": "systems_5"
+        "systems": "systems"
      },
      "locked": {
        "lastModified": 1689068808,
@ -798,7 +862,76 @@
        "type": "github"
      }
    },
+    "utils_3": {
+      "locked": {
+        "lastModified": 1605370193,
+        "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "5021eac20303a61fafe17224c087f5519baed54d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "utils_4": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1692799911,
+        "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "utils_5": {
+      "inputs": {
+        "systems": "systems_4"
+      },
+      "locked": {
+        "lastModified": 1685518550,
+        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
    "utils_6": {
+      "inputs": {
+        "systems": "systems_5"
+      },
+      "locked": {
+        "lastModified": 1687171271,
+        "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "utils_7": {
      "inputs": {
        "systems": "systems_6"
      },
@ -815,6 +948,24 @@
        "repo": "flake-utils",
        "type": "github"
      }
+    },
+    "utils_8": {
+      "inputs": {
+        "systems": "systems_7"
+      },
+      "locked": {
+        "lastModified": 1689068808,
+        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@ -15,17 +15,15 @@
    };

    # email
-    # simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.05";
    simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver";

    # account.skynet.ie
    skynet_ldap_backend.url = "gitlab:compsoc1%2Fskynet%2Fldap/backend?host=gitlab.skynet.ie";
    skynet_ldap_frontend.url = "gitlab:compsoc1%2Fskynet%2Fldap/frontend?host=gitlab.skynet.ie";
-
    skynet_website.url = "gitlab:compsoc1%2Fskynet%2Fwebsite/2023?host=gitlab.skynet.ie";
    skynet_website_2016.url = "gitlab:compsoc1%2Fskynet%2Fwebsite/2016?host=gitlab.skynet.ie";
-
    skynet_discord_bot.url = "gitlab:compsoc1%2Fskynet/discord-bot?host=gitlab.skynet.ie";
+    compsoc_slides.url = "gitlab:compsoc1%2Fcompsoc/presentations?host=gitlab.skynet.ie";
  };

  nixConfig.bash-prompt-suffix = "[Skynet Dev] ";