Merge pull request '#2_switch-to-presenterm' (#3) from #2_switch-to-presenterm into main

Reviewed-on: Computer_Society/presentations_compsoc#3

.gitattributes

@@ -24,6 +24,8 @@
 # Images
 *.png filter=lfs diff=lfs merge=lfs -text
 *.jpg filter=lfs diff=lfs merge=lfs -text
+*.jpeg filter=lfs diff=lfs merge=lfs -text
+*.webp filter=lfs diff=lfs merge=lfs -text
 
 
 # Video

.gitignore

@@ -14,6 +14,8 @@ test.*
 /out
 /build
 /target
+/slides/**/*.html
+/slides/**/*.pdf
 
 # Dealing with BlueJ
 *.bluej

README.md

@@ -15,4 +15,4 @@ You need both nix and flakes enabled.
 
 
 [1]: src/slides/example/Example.md
-[2]: https://gitlab.skynet.ie/compsoc1/skynet/nixos#prep
+[2]: https://forgejo.skynet.ie/Skynet/nixos#prep

config.yaml

@@ -0,0 +1,34 @@
+---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/mfontanini/presenterm/master/config-file-schema.json
+defaults:
+  # override the terminal font size when in windows or when using sixel.
+  terminal_font_size: 20
+
+speaker_notes:
+  always_publish: true
+
+export:
+  pauses: new_slide
+  # works nicely at 1080p, then do a 250% zoom
+  dimensions:
+    rows: 30
+    columns: 100
+
+snippet:
+  exec:
+    # enable code snippet execution. Use at your own risk!
+    enable: true
+    custom:
+      # The keys should be the language identifier you'd use in a code block.
+      racket:
+        # The name of the file that will be created with your snippet's contents.
+        filename: "snippet.rkt"
+
+        # A prefix that indicates a line that starts with it should not be visible but should be executed if the
+        # snippet is marked with `+exec`.
+        hidden_line_prefix: "/// "
+
+        # A list of commands that will be ran one by one in the same directory as the snippet is in.
+        commands:
+          # run the racket program
+          - ["racket", "$pwd/snippet.rkt"]

flake.lock

@@ -7,11 +7,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1723391194,
+        "lastModified": 1723500950,
-        "narHash": "sha256-04UThV4LZNRHg/+GbEl7M2ginWbm8FrQ5jBVmYcroNg=",
+        "narHash": "sha256-t1eApFGI+JzLIW2YToLlDV20n+Nevk1q4fZBYU1m93I=",
         "owner": "silver_rust",
         "repo": "bfom",
-        "rev": "fffd69b6433a2d2fd359b92e3816ae9938b3e99c",
+        "rev": "7f339f28442758ecc3f1697e3f70d441973664b9",
         "type": "gitlab"
       },
       "original": {
@@ -68,15 +68,16 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1715413075,
+        "lastModified": 1756787288,
-        "narHash": "sha256-FCi3R1MeS5bVp0M0xTheveP6hhcCYfW/aghSTPebYL4=",
+        "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e4e7a43a9db7e22613accfeb1005cca1b2b1ee0d",
+        "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
+        "ref": "nixos-unstable",
         "type": "indirect"
       }
     },

flake.nix

@@ -2,6 +2,7 @@
   description = "Skynet Presentations";
 
   inputs = {
+    nixpkgs.url = "nixpkgs/nixos-unstable";
     utils.url = "github:numtide/flake-utils";
 
     # nix flake lock --update-input bfom
@@ -20,30 +21,88 @@
   outputs = {
     self,
     nixpkgs,
+    utils,
     bfom,
     ...
-  } @ inputs: let
+  }: utils.lib.eachDefaultSystem (
-    pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs;
+      system: let
-  in {
+        pkgs = (import nixpkgs) {
-    # nix run
+          inherit system;
-    apps.x86_64-linux.default = {
+        };
-      type = "app";
-      program = "${bfom.defaultPackage.x86_64-linux}/bin/cargo-bfom";
-    };
 
-    # `nix build`
+        dependencies = with pkgs; [
-    packages.x86_64-linux.default = pkgs.stdenv.mkDerivation {
+          # For teh presentations themselves
-      name = "slides.skynet.ie";
+          presenterm
-      src = self;
-      buildPhase = "${bfom.defaultPackage.x86_64-linux}/bin/cargo-bfom";
-      installPhase = "mkdir -p $out; cp -R build/* $out";
-    };
 
-    devShells.x86_64-linux.default = pkgs.mkShell {
+          # for exporting
-      name = "Skynet presentations env";
+          (pkgs.python3.withPackages (python-pkgs: with python-pkgs; [
-      nativeBuildInputs = [
+            # for exporting
-        bfom.defaultPackage.x86_64-linux
+            weasyprint
-      ];
+          ]))
-    };
+          # various languages to embed in it
-  };
+          ## Java
+          # zulu24
+          ## C
+          # gcc
+          ## rust
+          # cargo
+          # rustc
+          ## lua
+          # lua
+          ## racket
+          # racket
+          ## go
+          # go
+        ];
+      in rec {
+        # `nix develop`
+        devShell = pkgs.mkShell {
+          packages = dependencies;
+          PRESENTERM_CONFIG_FILE = "config.yaml";
+        };
+
+         packages.default = pkgs.stdenv.mkDerivation {
+           name = "slides.skynet.ie";
+           src = self;
+         nativeBuildInputs = dependencies;
+         buildInputs = dependencies;
+           buildPhase = ''
+            # first pass through to get teh old files
+            ${bfom.defaultPackage.x86_64-linux}/bin/cargo-bfom
+
+            # then look into ./slides
+            export PRESENTERM_CONFIG_FILE=config.yaml
+            # recursively find each one then --export-html to ./build/slides/
+            shopt -s globstar
+            for source in slides/**/*.md; do
+              echo $source
+              output="$(dirname "$source")/$(basename "$source" .md).html"
+              echo $output
+              presenterm --export-html "$source"
+              mkdir -p "build/$(dirname "$source")"
+              cp "$output" "build/$output"
+            done
+            shopt -u globstar
+           '';
+           installPhase = "mkdir -p $out; cp -R build/* $out";
+         };
+     });
+#  @ inputs: let
+#    pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs;
+#  in {
+#    # `nix build`
+#    packages.x86_64-linux.default = pkgs.stdenv.mkDerivation {
+#      name = "slides.skynet.ie";
+#      src = self;
+#      buildPhase = "${bfom.defaultPackage.x86_64-linux}/bin/cargo-bfom";
+#      installPhase = "mkdir -p $out; cp -R build/* $out";
+#    };
+#
+#    devShells.x86_64-linux.default = pkgs.mkShell {
+#      name = "Skynet presentations env";
+#      nativeBuildInputs = [
+#        bfom.defaultPackage.x86_64-linux
+#      ];
+#    };
+#  };
 }

slides/compsoc/2025-2025/propaganda.md

@@ -0,0 +1,60 @@
+---
+title: "Computer Society"
+sub_title: "Definitely not propaganda"
+author: "Brendan Golden"
+theme:
+  name: catppuccin-latte
+---
+
+About Us
+=================================
+
+<!-- incremental_lists: true -->
+* For anyone Interested in Computers
+  * All skill levels
+* Mix of technical and Social
+* Old Society, 30 years old
+* Have a server room for Skynet
+* We host our own services
+  * Forgejo - Git
+  * Nextcloud
+  * Email
+  * DNS
+  * Discord Bots
+  * Game Servers
+    * Minecraft
+    * CSGO
+    * TF2
+* 25+ unique events a year
+* Weekly Training
+  * Skynet training
+  * Google Interview club
+* Trips
+  * PyCon
+  * SISTEM
+  * EuroTrip
+
+<!-- end_slide -->
+
+
+Join Us
+=================================
+
+<!-- column_layout: [1, 1] -->
+<!-- alignment: center -->
+
+<!-- column: 0 -->
+## Discord
+![image:width:100%](propaganda/discord.png) 
+
+<!-- column: 1 -->
+## UL Wolves
+![image:width:100%](propaganda/wolves.png)
+
+<!-- reset_layout --> 
+
+<!-- end_slide -->
+
+<!-- new_lines: 10 -->
+Questions?
+=================================

slides/skynet/01_intro.md

@@ -0,0 +1,87 @@
+---
+title: "Skynet"
+sub_title: "Introduction to Skynet"
+author: "Brendan Golden"
+theme:
+  name: catppuccin-latte
+---
+
+Skynet: Introduction
+=================================
+
+<!-- alignment: center -->
+<!-- incremental_lists: true -->
+* Skynet is the UL Computer Society's computer cluster.
+* Has a long [history](https://2016.skynet.ie/history.html).
+* Older than the Society. (1992 vs 1994)
+* But alas good things always come to an end.
+* Due to *A Series of Unfortunate Events* we lost internet in Jan 2023
+* Turns out Wordpress got Wordpress'd and we had a *smol* spam problem.
+* ITD also wanted us to have all servers patched and up to date.
+
+<!-- end_slide -->
+
+
+Skynet 3.0
+=================================
+
+
+<!-- column_layout: [2, 1] -->
+<!-- column: 1 -->
+![Delving into Ruins](01_intro/0_intro_img1.png)
+<!-- column: 0 -->
+<!-- incremental_lists: true -->
+* Gave us a chance to do a full rebuild.
+* Servers were delved Indiana Jones style.
+* Backups were made.
+* Returned Summer 2023.
+* Powered by NixOS.
+* [Fully open source](https://forgejo.skynet.ie/Skynet/nixos).
+* Skynet now can compile and update itself.
+* Be not Afraid
+* Automation FTW!
+* Be not Afraid
+
+<!-- end_slide -->
+
+
+What is on Skynet
+=================================
+
+<!-- alignment: center -->
+<!-- incremental_lists: true -->
+* Email
+* DNS
+* Account Management
+* Forgejo + CI/CD runners
+  * We *forge* software
+  * Git host
+* Game Servers
+  * Minecraft
+  * TF2
+  * CSGO
+* Discord Bots
+  * Skynet
+    * Our Discord Role Manager
+  * T-800
+    * Logging and monitoring
+* Clubs & Societies 
+  * Out in UL
+    * https://outinul.ie
+  * ULFM
+    * Now gone
+* Websites
+  * Our own
+    * https://skynet.ie
+    * https://2016.skynet.ie
+    * https://2006.skynet.ie
+    * https://2003.skynet.ie
+    * https://1996.skynet.ie
+  * User sites (https://silver.users.skynet.ie)
+
+
+<!-- end_slide -->
+
+<!-- new_lines: 10 -->
+Always iterating, always improving.
+=================================

src/postmortem/2023-09-27_Signup-failures.md

@@ -74,11 +74,11 @@ CREATE TABLE IF NOT EXISTS accounts_wolves (
 ```
 This also makes it easier to do the migration when teh Wolves API releases.
 
-[Patch that fixed it](https://gitlab.skynet.ie/compsoc1/skynet/ldap/backend/-/commit/9db8a238d2bf7be8bcfa86012b26180c041c13d1)
+[Patch that fixed it](https://forgejo.skynet.ie/Skynet/ldap_backend/commit/9db8a238d2bf7be8bcfa86012b26180c041c13d1)
 
 
 ## Things to improve for the future.
-
+  
 * Verify/test it works before a big event.
 * If its new enough have a dev env on hand.
 * Its not //always// DNS (probally is though)

src/slides/compsoc/1_domains-dns-oh-no.md

@@ -162,12 +162,12 @@ Or say ye wanted to go wild and have an Ogham domain name?
 
 ``ᚁᚏᚓᚅᚇᚐᚅ.com`` for example (brendan in Ogham)
 
-[0]: https://gitlab.skynet.ie/compsoc1/compsoc/presentations/presentations/-/blob/ceb346fe8e8dfc553fff520de7864e96236e887a/src/slides/compsoc/1_domains-dns-oh-no.md#L163
+[0]: https://forgejo.skynet.ie/Computer_Society/presentations_compsoc/src/commit/ceb346fe8e8dfc553fff520de7864e96236e887a/src/slides/compsoc/1_domains-dns-oh-no.md#L163
 
 -------------------------------------------------------------------------
 
 ``ᚁᚏᚓᚅᚇᚐᚅ.com`` becomes ``xn--7ueiah2bis.com``
-
+````
 -------------------------------------------------------------------------
 
 Magic!

src/slides/compsoc/3_git.md

@@ -0,0 +1,269 @@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+title   = "Git"
+date    = 2024-09-18
+slides  = true
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+# Git
+
+-------------------------------------------------------------------------
+
+The 4 Ws of Git
+
+-------------------------------------------------------------------------
+
+WHAT is Git?
+
+-------------------------------------------------------------------------
+
+WHO is Git made for?
+
+-------------------------------------------------------------------------
+
+WHY is Git used?
+
+-------------------------------------------------------------------------
+
+WHEN is Git used?
+
+-------------------------------------------------------------------------
+
+Last but not least, HOW do we use Git?
+
+-------------------------------------------------------------------------
+
+Let's start with the WHAT
+
+-------------------------------------------------------------------------
+
+Git is tool that's used in the programming Industry.
+
+-------------------------------------------------------------------------
+
+Specifically to track project work done, and the changes to files we've made.
+
+-------------------------------------------------------------------------
+
+The more correct term is Source Control.
+
+-------------------------------------------------------------------------
+
+It is NOT a programming language.
+
+-------------------------------------------------------------------------
+
+Now we move onto the WHO.
+
+-------------------------------------------------------------------------
+
+Git is a tool made for (usually) us programmers to track the work we've done.
+
+-------------------------------------------------------------------------
+
+Programmer socks (not) included.
+
+-------------------------------------------------------------------------
+
+Now we need to ask the WHY.
+
+-------------------------------------------------------------------------
+
+Why would we need a tool like this?
+
+-------------------------------------------------------------------------
+
+Why not use Google Drive instead?
+
+-------------------------------------------------------------------------
+
+I will find your IP address.
+
+-------------------------------------------------------------------------
+
+In all honesty,
+
+-------------------------------------------------------------------------
+
+It's to help keep track of who did what.
+
+-------------------------------------------------------------------------
+
+And to work on unique features...
+
+-------------------------------------------------------------------------
+
+without affecting the main area/branch (we'll return to this) of our work.
+
+-------------------------------------------------------------------------
+
+Now finally the WHEN.
+
+-------------------------------------------------------------------------
+
+When DO we use git?
+
+-------------------------------------------------------------------------
+
+Because Git keeps track of the changes we've made to files,
+
+-------------------------------------------------------------------------
+
+We can then use it to commit and stage these files,
+
+-------------------------------------------------------------------------
+
+and push them to a place where we can store them.
+
+-------------------------------------------------------------------------
+
+This place is called a Repository.
+
+-------------------------------------------------------------------------
+
+But, an interesting feature of git, is that it allows you to time-travel.
+
+-------------------------------------------------------------------------
+
+Meaning that if a project breaks, you can go back to before it broke.
+
+-------------------------------------------------------------------------
+
+Now I hear you in the audience asking...
+
+-------------------------------------------------------------------------
+
+Why not use SVN?
+
+-------------------------------------------------------------------------
+
+The answer is simple.
+
+-------------------------------------------------------------------------
+
+![NAH](3_git/NAH.jpg)
+
+-------------------------------------------------------------------------
+
+An actual answer is that Git is Distributed, and SVN in centralized.
+
+-------------------------------------------------------------------------
+
+Simply put, devs can store their changes locally on their machines,
+
+-------------------------------------------------------------------------
+
+where on SVN they're stored on a central system.
+
+-------------------------------------------------------------------------
+
+With a central system you NEED to be connected at all times to work on it.
+
+-------------------------------------------------------------------------
+
+You can work locally on git without having to be connected,
+
+-------------------------------------------------------------------------
+
+and then push once you're reconnected.
+
+-------------------------------------------------------------------------
+
+Back to git.
+
+-------------------------------------------------------------------------
+
+Let's start with the basics.
+
+-------------------------------------------------------------------------
+
+# Live demonstration time
+
+Please get your laptop out
+
+-------------------------------------------------------------------------
+
+How to download git & git LFS
+
+-------------------------------------------------------------------------
+
+## Download
+<<https://git-scm.com/downloads>>
+
+-------------------------------------------------------------------------
+
+![img.png](3_git/git_download_button.png)
+
+-------------------------------------------------------------------------
+
+![img_1.png](3_git/git_installer.png)
+
+-------------------------------------------------------------------------
+
+![img_2.png](3_git/git_installer_notepad_as_default_editor.png)
+
+-------------------------------------------------------------------------
+
+![img_3.png](3_git/git_installer_rename_master_to_main.png)
+
+-------------------------------------------------------------------------
+
+![img_4.png](3_git/git_installer_checkout_unix.png)
+
+-------------------------------------------------------------------------
+
+![img_5.png](3_git/git_installer_default_rebase_pull.png)
+
+-------------------------------------------------------------------------
+
+<<https://forgejo.skynet.ie/Skynet/deploy_user>>
+
+
+-------------------------------------------------------------------------
+Don't do this
+![BAD](3_git/bad_message.png)
+
+-------------------------------------------------------------------------
+
+![img_6.png](3_git/forgejo_template_button.png)
+
+-------------------------------------------------------------------------
+
+![img_7.png](3_git/forgejo_template_repo_creation.png)
+
+-------------------------------------------------------------------------
+
+![img_8.png](3_git/forgejo_repo_link.png)
+
+-------------------------------------------------------------------------
+
+Setup SSH key (see Readme.md))
+
+-------------------------------------------------------------------------
+
+![img_9.png](3_git/forgejo_repo_settings.png)
+
+-------------------------------------------------------------------------
+
+![img_10.png](3_git/forgejo_secrets_location.png)
+
+-------------------------------------------------------------------------
+
+![img_12.png](3_git/forgejo_add_secret.png)
+
+-------------------------------------------------------------------------
+
+![img_11.png](3_git/forgejo_ssh_key_example.png)
+
+-------------------------------------------------------------------------
+
+````bash
+git init
+git remote add origin <repo_url>
+git pull origin <branch_name>
+git add <file_name>
+git commit -m "<commit_message>"
+git push origin <branch_name>
+````
+-------------------------------------------------------------------------
+
+``https://<username>.users.skynet.ie/``

src/slides/compsoc/4_Intro.md

@@ -0,0 +1,128 @@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+title   = "Welcome to Compsoc"
+date    = 2024-09-15
+slides  = true
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+### Welcome, Welcome Welcome
+
+-------------------------------------------------------------------------
+
+//whispers to committee//: lock the door so they cant escape
+
+-------------------------------------------------------------------------
+
+Im joking, we wouldn't do that //watches as the door is welded shut//
+
+-------------------------------------------------------------------------
+
+#### About the Society
+
+-------------------------------------------------------------------------
+
+The Society is roughly 30 years old 
+
+-------------------------------------------------------------------------
+
+This makes us one of teh oldest continuous societies in UL
+
+-------------------------------------------------------------------------
+
+Has changed dramatically over the years
+
+-------------------------------------------------------------------------
+
+#### What we Do
+
+-------------------------------------------------------------------------
+
+At our core we are folks who like any and all aspects of computers
+
+-------------------------------------------------------------------------
+
+From building them, to the software that runs on them to new tech
+
+-------------------------------------------------------------------------
+
+We have weekly meetings, Wednesdays 6-9 in the Courtyard Room
+
+-------------------------------------------------------------------------
+
+![Events](4_intro/events.webp)
+
+-------------------------------------------------------------------------
+
+These are a mix of technical, social and networking
+
+-------------------------------------------------------------------------
+
+We also do trips to conferences when we can, normally once per semester
+
+-------------------------------------------------------------------------
+
+Aside from our planned meetings we are also open to events organised by  
+our members.
+
+-------------------------------------------------------------------------
+
+So if you have any ideas let us know.  
+We try to be as member driven as possible.
+
+-------------------------------------------------------------------------
+
+We also provide services to other Clubs and Societies:
+
+* We provide web hosting
+* Our Skynet bot is used for discord roles
+* We manage teh inter-committee discord server
+
+-------------------------------------------------------------------------
+
+#### Skynet
+
+-------------------------------------------------------------------------
+
+Our computer cluster is called Skynet and is about 32 years old.
+
+-------------------------------------------------------------------------
+
+Yes, Skynet is older than teh Society
+
+-------------------------------------------------------------------------
+
+We solemnly swear that we are not (currently) aiming for world domination
+
+-------------------------------------------------------------------------
+
+You will hear more about it next week in our Skynet event
+
+-------------------------------------------------------------------------
+
+#### Socials
+
+-------------------------------------------------------------------------
+
+We are mostly active on Discord
+
+-------------------------------------------------------------------------
+
+Though we also send out emails often enough.
+
+-------------------------------------------------------------------------
+
+<<https://discord.skynet.ie>>  
+![Discord QR](4_intro/qr_discord.png)
+
+-------------------------------------------------------------------------
+
+To get the ``member`` role (that grants access to a pile of channels)  
+You need to authenticate with the Skynet bot.
+
+-------------------------------------------------------------------------
+
+Use ``/link_wolves`` in the Bot channel  
+Wiki: <<https://wiki.skynet.ie/tutorials/skynet/verify_discord/>>
+
+-------------------------------------------------------------------------
+
+#### Pizza time?

src/slides/compsoc/5_Propaganda.md

@@ -0,0 +1,130 @@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+title   = "Why you should join Compsoc"
+date    = 2024-09-17
+slides  = true
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+## Why you should join UL Computer Society
+
+-------------------------------------------------------------------------
+
+## Hello 1st years!
+
+-------------------------------------------------------------------------
+
+(Or any other year, we arent picky)
+
+-------------------------------------------------------------------------
+
+((Some of your lecturers are even members))
+
+-------------------------------------------------------------------------
+
+(((If you are ISE we are here to help you escape this building))
+
+-------------------------------------------------------------------------
+
+We are UL Computer Society and we are here to ~~kidnap~~ recruit you today!
+
+-------------------------------------------------------------------------
+
+As you might guess we really like computers.
+
+-------------------------------------------------------------------------
+
+Though we would rather say we are in teh business of networking.
+
+------------------------------------------------------------------------
+
+We do the usual networking with switches and cables
+
+-------------------------------------------------------------------------
+
+But we also do Social Networking (aided by free pizza every so often)
+
+-------------------------------------------------------------------------
+
+On top of that we do intra-society networking (like Games Development)
+
+-------------------------------------------------------------------------
+
+Or if brave inter-society networking with other computer societies
+
+-------------------------------------------------------------------------
+
+## What else we do
+
+-------------------------------------------------------------------------
+
+We have a mix of Software, Social and Hardware events
+
+-------------------------------------------------------------------------
+
+And go to Tech Conferences like PyCon or SISTEM
+
+-------------------------------------------------------------------------
+
+We also provide a (long) list of services to our members
+
+-------------------------------------------------------------------------
+
+## Skynet
+
+-------------------------------------------------------------------------
+
+(the good kind)
+
+-------------------------------------------------------------------------
+
+((We swear))
+
+-------------------------------------------------------------------------
+
+(((Though it is self updating.....)))
+
+-------------------------------------------------------------------------
+
+Skynet is our (semi) enterprise grade computer cluster
+
+-------------------------------------------------------------------------
+
+It is ~32 years old now
+
+-------------------------------------------------------------------------
+
+100TB+ of data storage
+
+-------------------------------------------------------------------------
+
+It is also FOSS
+
+-------------------------------------------------------------------------
+
+Can get hands on with the ``root`` team if ye want (?)
+
+-------------------------------------------------------------------------
+
+## Meetups
+We meet every Wendesday at 6pm in teh Courtyard room in Student Life
+
+-------------------------------------------------------------------------
+
+## Wolves
+<<https://ulwolves.ie/society/computer>>  
+![Computer Soc - Ul Wolves ](./4_intro/qr_wolves.png)
+
+-------------------------------------------------------------------------
+
+## Discord
+<<https://discord.skynet.ie>>  
+![Computer Soc - Discord](./4_intro/qr_discord.png)
+
+-------------------------------------------------------------------------
+
+## Any questions?
+This presentation:  
+<<https://public.skynet.ie/slides/compsoc/5_Propaganda.html>>
+
+-------------------------------------------------------------------------
+
+//vanishes in a puff of smoke//

src/slides/compsoc/6_minecraft-onboarding.md

@@ -0,0 +1,83 @@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+title   = "Using our Minecraft servers"
+date   = "2024-09-25"
+slides = true
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+## Welcome (back) everyone!!
+
+--------------------------------------------------------------------
+
+we got a quite a bit of server power here at Skynet
+
+<img src="6_minecraft-onboarding/skynet-server.jpg" alt="Computer Society definitely not evil servers" width="120px" height="160px"></img>
+### so we decided to use some of that for evil (Minecraft servers)*
+<p style="font-size: 10px"> *we are not liable for failing stuff bc you stayed up until 4am to finish building your castle </p> 
+
+-----------------------------------------------------------------------
+
+### soooo, how do you get access to our Minecraft servers?
+there are a few easy steps involved
+
+---------------------------------------------------------------------
+
+### first of all you have to be in the CompSoc discord server
+link here: [discord.skynet.ie](https://discord.skynet.ie/)
+
+or you can find it on the society's page on the UL Wolves website
+
+-----------------------------------------------------------------------
+
+### next you need to have your discord account linked to your ul wolves account
+
+--------------------------------------------------------------------------
+
+### and finally!! you need to link your Minecraft account like this
+
+<img src="6_minecraft-onboarding/link-minecraft.png" alt="Link Minecraft account" width="300px" height="23px"></img>
+
+(you can use the ``#bot-commands`` channel to not spam everyone)
+
+--------------------------------------------------------------------------
+
+## but what's the ip??
+
+------------------------------------------------
+
+### we actually got 2 servers you can play on!
+
+-------------------------------------------------------------------------------
+
+## first one is a vanilla 1.20.4 server, but you can join from most versions past and future even though not all features might work
+
+seriously! i usually play from 1.21 and it also worked when i joined from 1.8.9
+
+the address of the server is **minecraft.compsoc.games.skynet.ie**
+
+if you want to join from bedrock edition: ip is **193.1.99.91** and the port is **19132**
+
+-------------------------------------------------------------------------------
+
+### for this server i made a modpack that enhances the multiplayer experience a bit nothing big AND you DON'T NEED to have it to play
+
+you can find it on [Modrinth.com](https://www.modrinth.com) and search for [CompSoc Vanilla Enhanced](https://modrinth.com/modpack/compsoc-vanilla-enhanced) (or click the links here)
+
+-------------------------------------------------------------------------------
+
+## second server is using the Aged modpack version 2.2.2
+
+will let you know if we update, check the discord server
+
+the address of the server is **minecraft-aged.compsoc.games.skynet.ie**
+
+--------------------------------------------------------------------------
+
+### you can find the modpack for this server by searching for "Aged" on [Modrinth.com](https://www.modrinth.com) 
+
+remember to download the right version of the modpack, which is currently 2.2.2!!
+
+-------------------------------------------------------------------------
+
+## That's it have fun!
+
+you can find these slides on **[public.skynet.ie](https://public.skynet.ie)** > **slides** > **compsoc** > 6_minecraft_onboarding.html

src/slides/compsoc/7_virtualization.md

@@ -0,0 +1,82 @@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+title   = "Virtualization"
+date    = 2024-04-17
+slides  = true
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+# Virtual Machines (and more)
+-------------------------------------------------------------------------
+so what is a virtual machine???
+-------------------------------------------------------------------------
+basically you run another smaller computer in your computer
+-------------------------------------------------------------------------
+*insert inception joke here\*
+-------------------------------------------------------------------------
+### Why would you want this?
+-------------------------------------------------------------------------
+- You can run multiple OSes on one machine
+- You can run software that might not be compatible with your main OS
+- It's helpful for testing and setting up a new OS
+- VMs are used **A LOT** in those big server rooms and professional environments
+-------------------------------------------------------------------------
+### How do I do this on my own laptop then?
+-------------------------------------------------------------------------
+there's a lot of *virtualization* software out there, but we'll be using VirtualBox today
+-------------------------------------------------------------------------
+It's free, and it's pretty easy to use
+-------------------------------------------------------------------------
+you can download it [here](https://www.virtualbox.org/wiki/Downloads)
+-------------------------------------------------------------------------
+if you already know all of this just wait we have more stuff after this
+-------------------------------------------------------------------------
+when you open VirtualBox, create a new VM like this:
+<img src="7_virtualization/new-vm.png" alt="Create a new VM" width="400px" height="187px"></img>
+-------------------------------------------------------------------------
+then choose a name and select the image to use for the OS
+<img src="7_virtualization/select-image.png" alt="Choose an image" width="351px" height="196px"></img>
+I'll be using Ubuntu 24.04, if you want to use another linux distro you probably know how to do this already
+-------------------------------------------------------------------------
+now, select how much memory and CPU you want to allocate to the new VM
+<img src="7_virtualization/memory-cpu.png" alt="Allocate memory and CPU" width="353px" height="196px"></img>
+The defaults you get are fine for this demo
+-------------------------------------------------------------------------
+and finally, choose how much storage you want to give the VM
+<img src="7_virtualization/storage.png" alt="Allocate storage" width="352px" height="196px"></img>
+10GB is enough for now, you can use more if you want
+-------------------------------------------------------------------------
+### Click "Finish" and now you got your new VM!!
+-------------------------------------------------------------------------
+we still need to install the operating system but that's easy enough
+-------------------------------------------------------------------------
+*live demo in progress\*
+-------------------------------------------------------------------------
+### Now on to the next part (it gets better)
+-------------------------------------------------------------------------
+you probably saw how many resources it takes to run a VM
+-------------------------------------------------------------------------
+what if I want to only run a single app without all the overhead??
+-------------------------------------------------------------------------
+### Containers to the rescue!!
+-------------------------------------------------------------------------
+containers are kind of like VMs, but much lighter
+-------------------------------------------------------------------------
+instead of emulating an entire computer, they just run the OS
+-------------------------------------------------------------------------
+### Why use VMs then?
+-------------------------------------------------------------------------
+- VMs are more secure
+- they're more isolated from the host system
+- not limited to running the same OS as the host
+-------------------------------------------------------------------------
+### How do I use containers?
+-------------------------------------------------------------------------
+one of the most popular container platforms is Docker
+-------------------------------------------------------------------------
+rn we will use it on the VM we just created
+-------------------------------------------------------------------------
+the commands we will need to install Docker:
+```
+curl -fsSL https://get.docker.com -o get-docker.sh``
+sudo sh get-docker.sh
+```
+-------------------------------------------------------------------------

src/slides/compsoc/8_aoc.md

@@ -0,0 +1,134 @@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+title   = "Advent of Code"
+date    = 2024-11-27
+slides  = true
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+# Advent of code
+
+-------------------------------------------------------------------------
+
+Advent of Code is an annual programming event
+
+-------------------------------------------------------------------------
+
+Its like an advent calendar
+
+-------------------------------------------------------------------------
+
+But instead of chocolate
+
+-------------------------------------------------------------------------
+
+You can byte into code problems
+
+-------------------------------------------------------------------------
+
+Each day of advent gives you two problems
+
+-------------------------------------------------------------------------
+
+You get Gold Stars!
+
+-------------------------------------------------------------------------
+
+⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐
+
+-------------------------------------------------------------------------
+
+Part one is the easy enough one
+
+-------------------------------------------------------------------------
+
+Can brute force it if you really want
+
+-------------------------------------------------------------------------
+
+Once ye got the part one complete the second one opens
+
+-------------------------------------------------------------------------
+
+Brute forcing may take longer than the heat death of the universe
+
+-------------------------------------------------------------------------
+
+So ye have to get smarter
+
+-------------------------------------------------------------------------
+
+Plenty of algos to be introduced to
+
+-------------------------------------------------------------------------
+
+If you find it easy there are many ways to amp up teh difficulty
+
+-------------------------------------------------------------------------
+
+You can compete to complete it fastest
+
+-------------------------------------------------------------------------
+
+(A classmate was in teh worldwide top 1000 last year)
+
+-------------------------------------------------------------------------
+
+There are global and local leaderboards (we have one)
+
+-------------------------------------------------------------------------
+
+You can do it in a new language (I use rust)
+
+-------------------------------------------------------------------------
+
+You can create your own language for it (if ye are that insane)
+
+-------------------------------------------------------------------------
+
+Some do it in excel
+
+-------------------------------------------------------------------------
+
+Or brainfuck
+
+-------------------------------------------------------------------------
+
+Or by hand
+
+-------------------------------------------------------------------------
+
+You can add [Bad Apple][0] to it (2022 Day 10, make a TV)
+
+[0]: https://www.youtube.com/watch?v=EevY4szGgQI
+
+-------------------------------------------------------------------------
+
+One downside is it hits us right at exam times
+
+-------------------------------------------------------------------------
+
+Another is that the puzzles release at 6am
+
+-------------------------------------------------------------------------
+
+Thankfully all past puzzles are available to do
+
+-------------------------------------------------------------------------
+
+So we tend to run a second one in January for those who are interested
+
+-------------------------------------------------------------------------
+
+<<https://adventofcode.com/>>
+
+-------------------------------------------------------------------------
+
+Sign up with yer: ``[GitHub]`` ``[Google]`` ``[Twitter]`` ``[Reddit]`` Accounts
+
+-------------------------------------------------------------------------
+
+See Discord (<<https://discord.skynet.ie>>) for the daily posts on it.
+
+-------------------------------------------------------------------------
+
+*Now get into doing two days worth of puzzles to get ye started*
+

src/slides/skynet/0_Intro.md

@@ -12,7 +12,7 @@ Skynet is the UL Computer Society's computer cluster.
 
 -------------------------------------------------------------------------
 
-Has a long history: <<https://2016.skynet.ie/history.html>>.   
+Has a long history: <<https://2009.skynet.ie/history.html>>.   
 
 -------------------------------------------------------------------------
 
@@ -65,7 +65,7 @@ Powered by NixOS.
 
 -------------------------------------------------------------------------
 
-Fully open source: <<https://gitlab.skynet.ie/compsoc1/skynet/nixos>> 
+Fully open source: <<https://forgejo.skynet.ie/Skynet/nixos>> 
 
 -------------------------------------------------------------------------
 
@@ -86,7 +86,7 @@ How hosts:
 -------------------------------------------------------------------------
 
 * Email
-* Gitlab + CI/CD runners
+* Forgejo + CI/CD runners
 * Game Servers
   * Minecraft
 * ULFM

src/slides/skynet/1_setup.md

@@ -283,7 +283,7 @@ As part of your Skynet account you have access to our Gitlab Server.
 
 -------------------------------------------------------------------------
 
-1. Go to <<https://gitlab.skynet.ie>>
+1. Go to <<https://forgejo.skynet.ie>>
 2. Login with ``username`` and ``password``
 3. Done
 

src/slides/skynet/3_nix.md

@@ -134,7 +134,7 @@ Making it hard to get a good overview
 
 -------------------------------------------------------------------------
 
-Skynet 3.0 is fully source controlled on [gitlab.skynet.ie][4]
+Skynet 3.0 is fully source controlled on [forgejo.skynet.ie][4]
 
 -------------------------------------------------------------------------
 
@@ -163,4 +163,4 @@ Questions?
 [1]: https://en.wikipedia.org/wiki/Unix_philosophy
 [2]: https://nix.dev/tutorials/first-steps/
 [3]: https://nixos.org/guides/nix-pills/#
-[4]: https://gitlab.skynet.ie/compsoc1/skynet/nixos
+[4]: https://forgejo.skynet.ie/Skynet/nixos

src/slides/skynet/4_dns.md

@@ -114,6 +114,6 @@ host 193.1.99.75
 
 -------------------------------------------------------------------------
 
-* <<https://gitlab.skynet.ie/compsoc1/skynet/nixos/-/issues/21>>
+* <<https://forgejo.skynet.ie/Skynet/nixos/issues/21>>
-* <<https://gitlab.skynet.ie/compsoc1/skynet/nixos/-/issues/33>>
+* <<https://forgejo.skynet.ie/Skynet/nixos/issues/33>>
 

src/slides/skynet/9_email.md

@@ -135,8 +135,9 @@ In this example I would be able to send mail as ``this_is_a_real_email@skynet.ie
 [//Use this time to explore the nixos repo to explain//][0]
 
 
-[0]: https://gitlab.skynet.ie/compsoc1/skynet/nixos/-/blob/26e715b2f62e406deee5e773ebcc3e3c3d200186/applications/email.nix?ref_type=heads
+
+[0]: https://forgejo.skynet.ie/Skynet/nixos/src/commit/26e715b2f62e406deee5e773ebcc3e3c3d200186/applications/email.nix
 [1]: https://www.youtube.com/watch?v=mrGfahzt-4Q
-[2]: https://gitlab.skynet.ie/compsoc1/skynet/nixos/-/blob/26e715b2f62e406deee5e773ebcc3e3c3d200186/applications/email.nix?ref_type=heads#L31-L91
+[2]: https://forgejo.skynet.ie/Skynet/nixos/src/commit/26e715b2f62e406deee5e773ebcc3e3c3d200186/applications/email.nix#L31-L91
 [3]: https://www.thunderbird.net/en-GB/
-[4]: https://gitlab.skynet.ie/compsoc1/skynet/nixos/-/blob/26e715b2f62e406deee5e773ebcc3e3c3d200186/applications/email.nix?ref_type=heads#L314-L343
+[4]: https://forgejo.skynet.ie/Skynet/nixos/src/commit/26e715b2f62e406deee5e773ebcc3e3c3d200186/applications/email.nix#L314-L343

src/templates/powerpoint.html

@@ -20,7 +20,9 @@
       position: absolute;
       top: 50%;
       left: 50%;
-      transform: translate(-50%, -50%) scale(3);
+      transform: translate(-50%, -50%) scale(2);
+      line-height: 2;
+      font-size: 20px;
     }
     ol, ul {
       margin-top: 0;