Merge pull request 'main' (#1) from lug/site:main into main

Reviewed-on: #1

content/directory.md

@@ -5,6 +5,7 @@ title: Directory
 Some of our internal websites:
 - [Gitea](https://git.linux.ucla.edu): includes the Git repository for the
   website you're viewing right now!
+- [cgit](https://linux.ucla.edu/git): a more minimalist git server.
 - [Booru](https://booru.linux.ucla.edu): imageboard
 - [Orwell](https://orwell.linux.ucla.edu): server room security camera
 
@@ -14,7 +15,7 @@ Here's a list of member-run websites:
 - [Maksym](https://linux.ucla.edu/maksym)
 - [Ramsey](https://linux.ucla.edu/ramsey)
 - [Zeke](https://linux.ucla.edu/zeke)
-- [mstf](https://linux.ucla.edu/mstf)
+- [Mstfelg](https://linux.ucla.edu/mstfelg)
 - [Jshiffer](https://linux.ucla.edu/jshiffer)
 - [IDKYTM](https://linux.ucla.edu/idkytm.html)
 - [Holy Hell!](https://linux.ucla.edu/holyhell.html)

content/events/ewaste-s24.md

@@ -1,33 +0,0 @@
----
-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,8 +1,3 @@
----
-title: "Membership"
-author: LUG Board
----
-
 ## Board
 | Name                  | Position             | Contact                 |
 | --------------------- | -------------------- | ----------------------- |

content/news.md

@@ -2,7 +2,6 @@
 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

@@ -4,27 +4,17 @@ 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?title=LUG%20Mumble%20Server&version=1.2.0): Voice chat platform
+- [Mumble](mumble://linux.ucla.edu): Voice chat platform
 
-- [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.
+- [SuperTuxKart](https://supertuxkart.net): Racing video game server, connect to `linux.ucla.edu`
 
-- [SuperTuxKart](https://supertuxkart.net): Racing video game server; connect to `linux.ucla.edu`
+- **XMPP**: coming soon!
 
-- [Invidious](https://yt.linux.ucla.edu/): Privacy-respecting YouTube frontend with no ads
-
-- [Arch Linux Mirror](https://arch.linux.ucla.edu/): Tier 2 mirror which syncs twice a day from [Leaseweb](https://mirror.sfo12.us.leaseweb.net/archlinux/). Add the line `Server = https://arch.linux.ucla.edu/$repo/os/$arch` to your `/etc/pacman.d/mirrorlist` file.
-
-- [SearXNG](https://searx.linux.ucla.edu/): Search engine aggregator with no tracking or ads
-
-- [Mastodon](https://mastodon.linux.ucla.edu/): A self-hosted, federated alternative to Twitter/X.
-
-- **Backups**: our NAS automatically backs up the contents of our members' VMs three times a week.
-
-## Planned
-
-- **More Mirrors**: [EndeavourOS](https://github.com/endeavouros-team/mirrors?tab=readme-ov-file) (only one US mirror!), [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.
+- **Mirrors**: coming soon!

content/wiki/linux.md

@@ -8,8 +8,7 @@ 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?
 
@@ -22,39 +21,12 @@ by the Gnome and KDE Project.
 
 ## How about software?
 
-There is a very large selection of software for Linux. You can
-[look here](https://wiki.archlinux.org/title/List_of_applications) for a start.
+There is a large selection of software for Linux. For quick selection and
+comparison, see the fossfor.us site.
 
-According to the now-defunct freshmeat.net (a large index of software
-for Linux  and other Unices), there are over 23,000 projects in development.
-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.
+According to [freshmeat.net](https://freshmeat.net) (a large index of software
+for Linux  and other Unices), there are currently over 23,000 projects in
+development. Many of these programs are Open Source and/or free.
 
 ## Getting Linux
 
@@ -79,10 +51,10 @@ than you think.)
 Here's a short and incomplete list to help you choose:
 
 ### Debian-based
-1. Debian
-2. Ubuntu
-3. Linux Mint
-4. MX Linux
+1. MX Linux
+2. Mint
+3. Ubuntu
+4. Debian
 5. Pop! OS
 6. Elementary OS
 7. Zorin OS
@@ -107,7 +79,6 @@ 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,

content/wiki/rdp.md

@@ -1,45 +0,0 @@
----
-title: RDP guide
-date: 2024-05-24
-author: David Z
----
-
-Many classes require using the UCLA SEASNet Remote Desktop. For example 115C requires you 
-to use Cadence (yuck). Microsoft's Remote Desktop Protocol is proprietary, but there are
-open source clients which can connect to it. Here are three ways of connecting which work well.
-Please note that you need to be on the UCLA VPN.
-
-## Using FreeRDP (Most reliable)
-In order to use FreeRDP to connect, start by downloading the .rdp file from [here](https://rds.seaslab.seas.ucla.edu/RDWeb/Pages/en-US/Default.aspx)
-
-Then run the following command in terminal:
-```
-xfreerdp <filename>.rdp /u:<username> /p:<password> /gd:rds.seaslab.seas.ucla.edu/RDWeb/Feed/webfeed.aspx /dynamic-resolution
-```
-Do not put `seaslab\` before your username, otherwise you will not be able to log in. 
-## Using Remmina (More user-friendly)
-Remmina is a more user-friendly way of connecting. It has nice features (like being able to fullscreen or resize the window).
-
-To use it, simply download the .rdp file and then enter in your username and password. Nothing else needs to be done.
-
-Sometimes, the rdp file will not work. This may be because the server domain changed. In order to get the correct domain, you
-can use the previous method. Look for the line which looks like this:
-```
-[02:39:22:381] [19509:19510] [WARN][com.freerdp.crypto] - CN = vmsrv07-rdsh01.seaslab.seas.ucla.edu
-```
-In this case, we can see that the server domain is `vmsrv07-rdsh01.seaslab.seas.ucla.edu`, which is different from the
-domain listed in the RDP file (`VMSRV08-RDCB02.SEASLAB.SEAS.UCLA.EDU` in my case). To fix this, right click in Remmina on the 
-connection, select Edit, then replace the domain under "Server" in the Basic tab.
-
-## Using SSH (Most direct way)
-If you are using MobaXTerm, you might have noticed that Cadence actually lives on a RHEL server. You are basically
-connecting to a Windows server, and then using an application on Windows (which implements SSH X forwarding) to connect back
-to a Linux server. It's obvious that Windows is just a "middleman" and that you actually don't need it.
-
-You can take the RHEL server's address straight from MobaXterm (for me, it's `eeapps02.seas.ucla.edu`). Then, type the
-following command: 
-```
-ssh -X -C <username>@eeapps02.seas.ucla.edu
-```
-And you're done!
-

hugo.toml

@@ -16,7 +16,7 @@ summaryLength = 20
 	posts = '/:filename'
 
 [params]
-	subtitle = "UCLA Linux Users Group. Free as in Freedom."
+	subtitle = "UCLA Linux User Group. Free as in Freedom."
 	logo = "lug-ucla-logo.svg"
 	favicon = "/favicon.ico"
 	disableDisqusTypes = ["page"]
@@ -51,45 +51,25 @@ name = "Membership"
 url = "/membership"
 weight = 5
 
-[[menu.main]]
-name = "Events"
-url = "/events"
-weight = 6
-
 [[menu.main]]
 name = "News"
 url = "/news"
-weight = 7
+weight = 6
 
 [[menu.main]]
 name = "Photos"
 url = "/zenphoto"
-weight = 8
+weight = 7
 
 [[menu.main]]
 name = "Switch to Linux 🐧"
 url = "/linux"
-weight = 9
+weight = 8
 
 [[params.social]]
 name = "Discord"
-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 = "Mastodon"
-icon = "at-sign"
-url = "https://mastodon.linux.ucla.edu/@admin"
+url = "https://discord.com/invite/EmGKCa48R6"
 
 [[params.social]]
 name = "Instagram"
@@ -97,9 +77,9 @@ icon = "instagram"
 url = "https://instagram.com/lug.ucla"
 
 [[params.social]]
-name = "Git"
-icon = "git-merge"
-url = "https://git.linux.ucla.edu"
+name = "Github"
+icon = "github"
+url = "https://github.com/lug-ucla"
 
 [[params.social]]
 name = "RSS"

layouts/partials/now.html

@@ -11,16 +11,11 @@
         33% { color: #45e845; }
         66% {color: #4545e8; }
     }
-
-    .invisible {
-        display: none;
-    }
 </style>
-<a class="invisible" rel="me" href="https://mastodon.linux.ucla.edu/@admin">Mastodon</a>
 <ol>
     <li>
-        <a href="/events/ewaste-s24">
-            <span class="magic">May 16, 2024: E-Waste Meetup</span>
+        <a href="#">
+            <span class="magic">Week 7 (TBD): E-Waste Meetup</span>
         </a>
     </li>
 </ol> 

themes/ezhil/static/css/main.css

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