Merge pull request 'Services and Events updates' (#2) from jshiffer/site:may24-services-events into main

Reviewed-on: #2

content/events/ewaste-s24.md

@@ -0,0 +1,33 @@
+---
+title: "E-Waste Meetup"
+date: 2024-05-11
+tags: [events, ewaste]
+author: LUG Board
+---
+
+* Date: Thursday, May 16 2024
+* Time: 18:15
+* Location: Boelter 1st Floor entrance, by the dumpsters
+
+## General Info
+
+This will be a small meetup where the fourth-year students will pass on their knowledge of the best
+spots on campus to find free e-waste.
+
+You might get your hands dirty, since we are going to be dumpster diving, but you might also walk
+away with some new hardware! Be ready to do some walking since the locations are fairly spread out.
+
+Open to all who are interested.
+
+## What to Expect
+
+There are almost always free office-grade monitors and keyboards to be found. It's also fairly
+common to see decade-old PCs with RAM and HDDs, provided that no one else scavenged them first.
+Sometimes, valuable stuff gets thrown away like oscilloscopes, Macs from < 10 years ago, CRTs, NVMe
+SSDs, and PCs from the 1980s (as featured at the [Spring Installfest](/events/installfest-s24)).
+
+The more valuable stuff could require some repairs, but it's not too difficult for a seasoned EE
+student. Actually, it might surprise you how much perfectly working stuff gets thrown out. Lots of
+the hard drives from labs don't even get wiped, and we've found adult content on them before...
+
+Your chances of finding something cool will go up the more regularly you check!

content/membership.md

@@ -1,3 +1,8 @@
+---
+title: "Membership"
+author: LUG Board
+---
+
 ## Board
 | Name                  | Position             | Contact                 |
 | --------------------- | -------------------- | ----------------------- |

content/news.md

@@ -2,6 +2,7 @@
 title: News
 ---
 
+- 2024-05-10: Updated list of services and info for upcoming e-waste event.
 - 2024-05-03: Added the [Services](/services) page.
 - 2024-04-03: Site updates. Gitea moved to https://git.linux.ucla.edu.
 - 2023-12-20: Wow I have not written anything in a while. The booru site has been moved to a seperate subdomain and we have a Gitea with the website source code. If you want to suggest any changes please submit a pull request!

content/services.md

@@ -5,16 +5,22 @@ date: 2024-05-02
 
 Our club hosts various open source web services for the public to use:
  
-- [Invidious](https://yt.linux.ucla.edu): Privacy-respecting YouTube frontend with no ads
-
-- [SearXNG](https://searx.linux.ucla.edu): Search engine aggregator with no tracking or ads
- 
 - [Jitsi Meet](https://meet.linux.ucla.edu): Video conferencing platform
 
-- [Mumble](mumble://linux.ucla.edu): Voice chat platform
+- [Mumble](mumble://linux.ucla.edu?title=LUG%20Mumble%20Server&version=1.2.0): Voice chat platform
 
-- [SuperTuxKart](https://supertuxkart.net): Racing video game server, connect to `linux.ucla.edu`
+- [XMPP](https://xmpp.link/#main@room.linux.ucla.edu): Instant messaging platform, bridged with our Discord chat. Ask an officer for a `linux.ucla.edu` account.
 
-- **XMPP**: coming soon!
+- [SuperTuxKart](https://supertuxkart.net): Racing video game server; connect to `linux.ucla.edu`
 
-- **Mirrors**: coming soon!
+## Planned
+
+- **Mirrors**: [EndeavourOS](https://github.com/endeavouros-team/mirrors?tab=readme-ov-file) (only one US mirror!), [Arch Linux](https://wiki.archlinux.org/title/DeveloperWiki:NewMirrors) (Tier 2), [Artix](https://wiki.artixlinux.org/Main/Mirrors) (normal), [CRAN](https://cran.r-project.org/mirrors.html).
+
+- [Minetest](https://www.minetest.net/): Like Minecraft, but free and open source.
+
+- [Invidious](https://invidious.io/): Privacy-respecting YouTube frontend with no ads
+
+- [SearXNG](https://docs.searxng.org/): Search engine aggregator with no tracking or ads
+
+- **Backups**: once our NAS is online, we will automatically back up the contents of our members' VMs.

content/wiki/linux.md

@@ -8,7 +8,8 @@ runs on Linux?
 
 ## What is Linux about?
 
-You can find a good introduction to Linux [here](https://www.geeksforgeeks.org/introduction-to-linux-operating-system/).
+You can find a good introduction to Linux
+[here](https://www.geeksforgeeks.org/introduction-to-linux-operating-system/).
 
 ## What does Linux look like?
 
@@ -21,12 +22,39 @@ by the Gnome and KDE Project.
 
 ## How about software?
 
-There is a large selection of software for Linux. For quick selection and
+There is a very large selection of software for Linux. You can
-comparison, see the fossfor.us site.
+[look here](https://wiki.archlinux.org/title/List_of_applications) for a start.
 
-According to [freshmeat.net](https://freshmeat.net) (a large index of software
+According to the now-defunct freshmeat.net (a large index of software
-for Linux  and other Unices), there are currently over 23,000 projects in
+for Linux  and other Unices), there are over 23,000 projects in development.
-development. Many of these programs are Open Source and/or free.
+Many of these programs are Open Source and/or free.
+
+## Is it hard to make the switch?
+
+One of the biggest concerns for prospective Linux users is whether they will
+be able to use the same programs they did on Windows/macOS. People might have
+to use particular software for their jobs, after all. Thankfully, this isn't
+such a big problem anymore.
+
+Nowadays, more and more software ships with native Linux support, including
+[most](https://code.visualstudio.com/) [code](https://www.jetbrains.com/ides/)
+[IDEs](https://eclipseide.org/), and even some multimedia programs like
+[DaVinci Resolve](https://www.blackmagicdesign.com/products/davinciresolve) and
+[Synthesizer V](https://dreamtonics.com/synthesizerv/).
+Even if this isn't the case for you, you still have options. Plenty of free
+alternatives to popular proprietary software exist (e.g.
+[GIMP](https://www.gimp.org/) instead of Photoshop for image editing,
+[Krita](https://krita.org/en/) instead of PaintTool SAI
+for drawing, or [LibreOffice](https://www.libreoffice.org/) instead of
+Microsoft Office). These programs are often compatible with the same file
+formats, too. Still, if you absolutely must use the same program that you ran
+on your Windows system, [Wine](https://www.winehq.org/) can be used to run
+.EXEs. [Proton](https://www.protondb.com/) works on top of Wine so you can even
+play many of the same PC games.
+
+Currently, Linux only holds about 4% market share amongst desktop PCs, but as
+the open source software ecosystem continues to evolve, and users get fed up
+with Microsoft and Apple's business practices, this number is sure to climb.
 
 ## Getting Linux
 
@@ -51,10 +79,10 @@ than you think.)
 Here's a short and incomplete list to help you choose:
 
 ### Debian-based
-1. MX Linux
+1. Debian
-2. Mint
+2. Ubuntu
-3. Ubuntu
+3. Linux Mint
-4. Debian
+4. MX Linux
 5. Pop! OS
 6. Elementary OS
 7. Zorin OS
@@ -79,6 +107,7 @@ For advanced users:
 2. Gentoo
 3. OpenBSD
 4. FreeBSD
+5. Slackware
 
 ## Tips for selecting a distro
 If you are a beginner and you don't want to mess with the terminal that  much,

hugo.toml

@@ -16,7 +16,7 @@ summaryLength = 20
 	posts = '/:filename'
 
 [params]
-	subtitle = "UCLA Linux User Group. Free as in Freedom."
+	subtitle = "UCLA Linux Users Group. Free as in Freedom."
 	logo = "lug-ucla-logo.svg"
 	favicon = "/favicon.ico"
 	disableDisqusTypes = ["page"]
@@ -51,35 +51,50 @@ name = "Membership"
 url = "/membership"
 weight = 5
 
+[[menu.main]]
+name = "Events"
+url = "/events"
+weight = 6
+
 [[menu.main]]
 name = "News"
 url = "/news"
-weight = 6
+weight = 7
 
 [[menu.main]]
 name = "Photos"
 url = "/zenphoto"
-weight = 7
+weight = 8
 
 [[menu.main]]
 name = "Switch to Linux 🐧"
 url = "/linux"
-weight = 8
+weight = 9
 
 [[params.social]]
 name = "Discord"
-icon = "users"
+icon = "message-square"
 url = "https://discord.com/invite/EmGKCa48R6"
 
+[[params.social]]
+name = "XMPP"
+icon = "users"
+url = "https://xmpp.link/#main@room.linux.ucla.edu"
+
+[[params.social]]
+name = "X"
+icon = "twitter"
+url = "https://x.com/uclalug"
+
 [[params.social]]
 name = "Instagram"
 icon = "instagram"
 url = "https://instagram.com/lug.ucla"
 
 [[params.social]]
-name = "Github"
+name = "Git"
-icon = "github"
+icon = "git-merge"
-url = "https://github.com/lug-ucla"
+url = "https://git.linux.ucla.edu"
 
 [[params.social]]
 name = "RSS"

layouts/partials/now.html

@@ -14,8 +14,8 @@
 </style>
 <ol>
     <li>
-        <a href="#">
+        <a href="/events/ewaste-s24">
-            <span class="magic">Week 7 (TBD): E-Waste Meetup</span>
+            <span class="magic">May 16, 2024: E-Waste Meetup</span>
         </a>
     </li>
 </ol> 

themes/ezhil/static/css/main.css

@@ -271,6 +271,10 @@ pre code {
     letter-spacing: 1px;
 }
 
+.recent-posts {
+    margin-bottom: 30px;
+}
+
 .recent-posts .posts .post {
     margin-bottom: 30px;
 }