Feat: Introductory git commands

.gitattributes

@@ -24,8 +24,6 @@
 # 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

README.md

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

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

@@ -74,7 +74,7 @@ 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://forgejo.skynet.ie/Skynet/ldap_backend/commit/9db8a238d2bf7be8bcfa86012b26180c041c13d1)
+[Patch that fixed it](https://gitlab.skynet.ie/compsoc1/skynet/ldap/backend/-/commit/9db8a238d2bf7be8bcfa86012b26180c041c13d1)
 
 
 ## Things to improve for the future.

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://forgejo.skynet.ie/Computer_Society/presentations_compsoc/src/commit/ceb346fe8e8dfc553fff520de7864e96236e887a/src/slides/compsoc/1_domains-dns-oh-no.md#L163
+[0]: https://gitlab.skynet.ie/compsoc1/compsoc/presentations/presentations/-/blob/ceb346fe8e8dfc553fff520de7864e96236e887a/src/slides/compsoc/1_domains-dns-oh-no.md#L163
 
 -------------------------------------------------------------------------
 
 ``ᚁᚏᚓᚅᚇᚐᚅ.com`` becomes ``xn--7ueiah2bis.com``
-````
+
 -------------------------------------------------------------------------
 
 Magic!

src/slides/compsoc/3_git.md

@@ -176,94 +176,43 @@ Let's start with the basics.
 
 -------------------------------------------------------------------------
 
-# Live demonstration time
+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)
+-------------------------------------------------------------------------
+
+Please do this
+````git pull <remote_name> <branch_name>````
 
 -------------------------------------------------------------------------
 
-![img_6.png](3_git/forgejo_template_button.png)
+````git init````
 
 -------------------------------------------------------------------------
 
-![img_7.png](3_git/forgejo_template_repo_creation.png)
+````git remote add origin <repo_url>````
 
 -------------------------------------------------------------------------
 
-![img_8.png](3_git/forgejo_repo_link.png)
+````git add <file_name>````
 
 -------------------------------------------------------------------------
 
-Setup SSH key (see Readme.md))
+````git commit -m <Commit message>````
 
 -------------------------------------------------------------------------
 
-![img_9.png](3_git/forgejo_repo_settings.png)
+````git pull origin <branch_name>````
 
 -------------------------------------------------------------------------
 
-![img_10.png](3_git/forgejo_secrets_location.png)
+````git push origin <branch_name>````
 
 -------------------------------------------------------------------------
-
-![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

@@ -1,128 +0,0 @@
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-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

@@ -1,130 +0,0 @@
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-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

@@ -1,83 +0,0 @@
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-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

@@ -1,82 +0,0 @@
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-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/skynet/0_Intro.md

@@ -12,7 +12,7 @@ Skynet is the UL Computer Society's computer cluster.
 
 -------------------------------------------------------------------------
 
-Has a long history: <<https://2009.skynet.ie/history.html>>.   
+Has a long history: <<https://2016.skynet.ie/history.html>>.   
 
 -------------------------------------------------------------------------
 
@@ -65,7 +65,7 @@ Powered by NixOS.
 
 -------------------------------------------------------------------------
 
-Fully open source: <<https://forgejo.skynet.ie/Skynet/nixos>> 
+Fully open source: <<https://gitlab.skynet.ie/compsoc1/skynet/nixos>> 
 
 -------------------------------------------------------------------------
 
@@ -86,7 +86,7 @@ How hosts:
 -------------------------------------------------------------------------
 
 * Email
-* Forgejo + CI/CD runners
+* Gitlab + 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://forgejo.skynet.ie>>
+1. Go to <<https://gitlab.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 [forgejo.skynet.ie][4]
+Skynet 3.0 is fully source controlled on [gitlab.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://forgejo.skynet.ie/Skynet/nixos
+[4]: https://gitlab.skynet.ie/compsoc1/skynet/nixos

src/slides/skynet/4_dns.md

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

src/slides/skynet/9_email.md

@@ -135,9 +135,8 @@ 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://forgejo.skynet.ie/Skynet/nixos/src/commit/26e715b2f62e406deee5e773ebcc3e3c3d200186/applications/email.nix
+[0]: https://gitlab.skynet.ie/compsoc1/skynet/nixos/-/blob/26e715b2f62e406deee5e773ebcc3e3c3d200186/applications/email.nix?ref_type=heads
 [1]: https://www.youtube.com/watch?v=mrGfahzt-4Q
-[2]: https://forgejo.skynet.ie/Skynet/nixos/src/commit/26e715b2f62e406deee5e773ebcc3e3c3d200186/applications/email.nix#L31-L91
+[2]: https://gitlab.skynet.ie/compsoc1/skynet/nixos/-/blob/26e715b2f62e406deee5e773ebcc3e3c3d200186/applications/email.nix?ref_type=heads#L31-L91
 [3]: https://www.thunderbird.net/en-GB/
-[4]: https://forgejo.skynet.ie/Skynet/nixos/src/commit/26e715b2f62e406deee5e773ebcc3e3c3d200186/applications/email.nix#L314-L343
+[4]: https://gitlab.skynet.ie/compsoc1/skynet/nixos/-/blob/26e715b2f62e406deee5e773ebcc3e3c3d200186/applications/email.nix?ref_type=heads#L314-L343

src/templates/powerpoint.html

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