From 9eaf02b32c8817f38662e1e49290452869d0aef3 Mon Sep 17 00:00:00 2001 From: James Shiffer Date: Wed, 3 Apr 2024 00:08:31 -0700 Subject: [PATCH 1/6] Add links to content --- content/about.md | 4 ++-- content/constitution.md | 5 +++++ content/description.md | 7 ++++++- content/directory.md | 3 ++- content/eduroam.md | 4 ++++ content/emails.md | 6 +++++- content/linux.md | 8 ++++---- content/posts.md | 12 +++++++++++- content/{join.md => rules.md} | 4 +--- content/ucla-vpn.md | 4 ++++ 10 files changed, 44 insertions(+), 13 deletions(-) rename content/{join.md => rules.md} (96%) diff --git a/content/about.md b/content/about.md index aafd2d5..026f7af 100644 --- a/content/about.md +++ b/content/about.md @@ -4,7 +4,7 @@ date: 2022-10-03 type: "page" --- -**Linux Users Group at UCLA (LUG@UCLA)** goal is to promote computer users freedom with Linux and other Free/Open Source software. +The goal of the **Linux Users Group at UCLA (LUG@UCLA)** is to promote computer users' freedom with Linux and other Free/Open Source Software (FOSS). ## Activities @@ -23,4 +23,4 @@ If you want help installing Linux or just want to eat and hang out, come to ins There is a makerspace on the floor below us, where you can go and 3D print things (as well as lasercut them). -There is also a trash heap outside the first floor (next to the Engineering IV building), where you can sometimes find old monitors/computers and old networking equipment. \ No newline at end of file +You might also find LUG members at the trash heap outside the first floor, next to the Engineering IV building, digging around for old monitors, computers, or networking equipment. We're just gearing up for the next installfest... \ No newline at end of file diff --git a/content/constitution.md b/content/constitution.md index 3938e52..ace951e 100644 --- a/content/constitution.md +++ b/content/constitution.md @@ -1,3 +1,8 @@ +--- +title: Club Constitution +--- + + ## Article 1. Name This organization shall be referred to as the Linux Users Group at the University of California, Los Angeles (LUG@UCLA). The University of California, Los Angeles will hereafter in this document be referred to as "UCLA," or "the University." diff --git a/content/description.md b/content/description.md index bbf8574..3c39298 100644 --- a/content/description.md +++ b/content/description.md @@ -1,6 +1,11 @@ +--- +title: Description +--- + + **Please give a brief, but detailed summary of your organization. Be sure to include any history of the group, a mission statement and a brief account of the student population that the organization represent.** -The Linux Users Group (LUG) facilitates learning and advancement of computer science and free software by promoting the use of the open source GNU/Linux operating system and providing a support network for Linux users. There is no barrier to becoming a member; consequently, the LUG consists of students, non-students, inexperienced, and experienced alike. The LUG has been a group at UCLA for over 17 years, during which time it has helped expose free software to many people. +The Linux Users Group (LUG) facilitates learning and advancement of computer science and free software by promoting the use of the open source GNU/Linux operating system and providing a support network for Linux users. There is no barrier to becoming a member; consequently, the LUG consists of students, non-students, inexperienced, and experienced alike. The LUG has been a group at UCLA for over 25 years, during which time it has helped expose free software to many people. **Please explain the benefit students may derive from your organization. Include how your group stimulates discussion, benefits education, or provides enrichment of any kind.** diff --git a/content/directory.md b/content/directory.md index 612ec5d..4e2e406 100644 --- a/content/directory.md +++ b/content/directory.md @@ -3,7 +3,8 @@ title: Directory --- Some of our "internal" websites: -- [Git](https://linux.ucla.edu/gitea) +- [Gitea](https://linux.ucla.edu/gitea) - includes the Git repository for the website you're viewing right now! +- [cgit](https://linux.ucla.edu/git) - an older Git server - [Booru](https://booru.linux.ucla.edu) - [Orwell](https://orwell.linux.ucla.edu) diff --git a/content/eduroam.md b/content/eduroam.md index 434f297..2f96ec7 100644 --- a/content/eduroam.md +++ b/content/eduroam.md @@ -1,3 +1,7 @@ +--- +title: Eduroam WiFi Guide +--- + Connecting to the eduroam WiFi network (on the UCLA campus) is easy with Linux. eduroam is available almost everywhere on campus, so this is probably the most convenient WiFi network. ## Using NetworkManager diff --git a/content/emails.md b/content/emails.md index 3388361..48d22c6 100644 --- a/content/emails.md +++ b/content/emails.md @@ -1,4 +1,8 @@ - **IMPORTANT: PLEASE CHOOSE A STRONG PASSWORD FOR YOUR EMAIL ACCOUNT** +--- +title: Email Account Guide +--- + +**IMPORTANT: PLEASE CHOOSE A STRONG PASSWORD FOR YOUR EMAIL ACCOUNT** [![img](https://linux.ucla.edu/wiki/images/thumb/3/34/Image.png/300px-Image.png)](https://linux.ucla.edu/wiki/index.php/File:Image.png) diff --git a/content/linux.md b/content/linux.md index 8d10a94..3633a98 100644 --- a/content/linux.md +++ b/content/linux.md @@ -2,20 +2,20 @@ So what's this Linux thing all about? What does Linux look like? What software r ## What is Linux about? -You can find a good introduction to Linux here, here, and here. +You can find a good introduction to Linux [here](https://www.geeksforgeeks.org/introduction-to-linux-operating-system/). ## What does Linux look like? Over the last few years, Linux graphic user interfaces (GUI) have greatly improved. Click to view screenshots of the current desktop environments offered by the Gnome and KDE Project. -- GNOME Overview -- KDE Overview +- [GNOME Overview](https://release.gnome.org/46/) +- [KDE Overview](https://kde.org/announcements/megarelease/6/) ## How about software? There is a large selection of software for Linux. For quick selection and comparison, see the fossfor.us site. -According to 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. +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 diff --git a/content/posts.md b/content/posts.md index 0fd57ac..f705ec1 100644 --- a/content/posts.md +++ b/content/posts.md @@ -1 +1,11 @@ -Nothing here yet! \ No newline at end of file +--- +title: Articles +--- + + +- [Club Description](https://linux.ucla.edu/description) +- [Club Constitution](https://linux.ucla.edu/constitution) +- [Email Account Guide](https://linux.ucla.edu/emails) +- [Rules](https://linux.ucla.edu/rules) +- [UCLA VPN Guide](https://linux.ucla.edu/ucla-vpn) +- [Eduroam WiFi Guide](https://linux.ucla.edu/eduroam) diff --git a/content/join.md b/content/rules.md similarity index 96% rename from content/join.md rename to content/rules.md index f08b079..323a834 100644 --- a/content/join.md +++ b/content/rules.md @@ -1,11 +1,9 @@ --- -title: Join +title: Rules --- -## Rules - I. Account Rules 0. No illegal activity diff --git a/content/ucla-vpn.md b/content/ucla-vpn.md index a7e5faf..2426745 100644 --- a/content/ucla-vpn.md +++ b/content/ucla-vpn.md @@ -1,3 +1,7 @@ +--- +title: UCLA VPN Guide +--- + The UCLA VPN allows you to access campus resources even when you are away from campus. This is useful for downloading scientific journals, for example. Connecting to the UCLA VPN is easy. From 793f722c66798d355064a68c7b95308efde0e267 Mon Sep 17 00:00:00 2001 From: James Shiffer Date: Wed, 3 Apr 2024 00:23:23 -0700 Subject: [PATCH 2/6] Readme --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..cf29d8a --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ +# UCLA Linux Users Group Website + +This is the code for the website hosted at https://linux.ucla.edu. + +The whole website is static, and it's easy to edit: just change the markdown files and build it with [Hugo](https://gohugo.io/). + +Protip: run the `hugo server` command to preview your changes more quickly. + +## Contributing + +Make your own branch and submit a pull request if there's something you think we should change! We are open to suggestions. From f363cec1f909994c971b8e8be5f927ad38259c4c Mon Sep 17 00:00:00 2001 From: James Shiffer Date: Wed, 3 Apr 2024 00:23:31 -0700 Subject: [PATCH 3/6] Remove google botnet --- themes/ezhil/layouts/partials/footer.html | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/themes/ezhil/layouts/partials/footer.html b/themes/ezhil/layouts/partials/footer.html index 4959ee0..6a1edf4 100644 --- a/themes/ezhil/layouts/partials/footer.html +++ b/themes/ezhil/layouts/partials/footer.html @@ -1,12 +1,9 @@
-{{ if not .Site.IsServer }} -{{ template "_internal/google_analytics_async.html" . }} -{{ end }} {{- with .Site.Params.Social -}} {{- end -}} From 9737fea9e34d5fb689a184b58fdfb58f7ab326f6 Mon Sep 17 00:00:00 2001 From: James Shiffer Date: Wed, 3 Apr 2024 00:23:51 -0700 Subject: [PATCH 4/6] Formatting and links --- content/about.md | 2 +- content/description.md | 2 +- content/directory.md | 1 + content/eduroam.md | 1 + content/posts.md | 12 ++++++------ content/rules.md | 1 - content/ucla-vpn.md | 1 + 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/content/about.md b/content/about.md index 026f7af..e6146cb 100644 --- a/content/about.md +++ b/content/about.md @@ -8,7 +8,7 @@ The goal of the **Linux Users Group at UCLA (LUG@UCLA)** is to promote computer ## Activities -1. **[Linux installfests](https://linux.ucla.edu/installfest.html)**: on the 2nd Friday of every quarter. +1. **[Linux installfests](/installfest.html)**: on the 2nd Friday of every quarter. 1. **Linux Help & Advice**: in office hours and Discord. 1. **Tech Talks**. 1. **[Edit-a-thons](https://en.wikipedia.org/wiki/Edit-a-thon)**: Bi-quarterly group editing events aimed to contribute to free knowledge on Wikipedia, and other Linux Wikis. diff --git a/content/description.md b/content/description.md index 3c39298..2436f84 100644 --- a/content/description.md +++ b/content/description.md @@ -1,5 +1,5 @@ --- -title: Description +title: Club Description --- diff --git a/content/directory.md b/content/directory.md index 4e2e406..c0fbe5c 100644 --- a/content/directory.md +++ b/content/directory.md @@ -2,6 +2,7 @@ title: Directory --- + Some of our "internal" websites: - [Gitea](https://linux.ucla.edu/gitea) - includes the Git repository for the website you're viewing right now! - [cgit](https://linux.ucla.edu/git) - an older Git server diff --git a/content/eduroam.md b/content/eduroam.md index 2f96ec7..fc1c63f 100644 --- a/content/eduroam.md +++ b/content/eduroam.md @@ -2,6 +2,7 @@ title: Eduroam WiFi Guide --- + Connecting to the eduroam WiFi network (on the UCLA campus) is easy with Linux. eduroam is available almost everywhere on campus, so this is probably the most convenient WiFi network. ## Using NetworkManager diff --git a/content/posts.md b/content/posts.md index f705ec1..90915d6 100644 --- a/content/posts.md +++ b/content/posts.md @@ -3,9 +3,9 @@ title: Articles --- -- [Club Description](https://linux.ucla.edu/description) -- [Club Constitution](https://linux.ucla.edu/constitution) -- [Email Account Guide](https://linux.ucla.edu/emails) -- [Rules](https://linux.ucla.edu/rules) -- [UCLA VPN Guide](https://linux.ucla.edu/ucla-vpn) -- [Eduroam WiFi Guide](https://linux.ucla.edu/eduroam) +- [Club Description](/description) +- [Club Constitution](/constitution) +- [Email Account Guide](/emails) +- [Rules](/rules) +- [UCLA VPN Guide](/ucla-vpn) +- [Eduroam WiFi Guide](/eduroam) diff --git a/content/rules.md b/content/rules.md index 323a834..39cc3a4 100644 --- a/content/rules.md +++ b/content/rules.md @@ -3,7 +3,6 @@ title: Rules --- - I. Account Rules 0. No illegal activity diff --git a/content/ucla-vpn.md b/content/ucla-vpn.md index 2426745..c411743 100644 --- a/content/ucla-vpn.md +++ b/content/ucla-vpn.md @@ -2,6 +2,7 @@ title: UCLA VPN Guide --- + The UCLA VPN allows you to access campus resources even when you are away from campus. This is useful for downloading scientific journals, for example. Connecting to the UCLA VPN is easy. From 1ad9b84dd4d296660690288005fb351ba5291743 Mon Sep 17 00:00:00 2001 From: James Shiffer Date: Wed, 3 Apr 2024 00:54:45 -0700 Subject: [PATCH 5/6] Spring 2024 installfest info --- content/about.md | 2 +- content/directory.md | 2 +- content/events/installfest-f22.md | 23 +++++++++++++++++++++++ content/events/installfest.md | 28 ++++++++++++++++++---------- layouts/partials/now.html | 3 +-- 5 files changed, 44 insertions(+), 14 deletions(-) create mode 100644 content/events/installfest-f22.md diff --git a/content/about.md b/content/about.md index e6146cb..4c218b3 100644 --- a/content/about.md +++ b/content/about.md @@ -8,7 +8,7 @@ The goal of the **Linux Users Group at UCLA (LUG@UCLA)** is to promote computer ## Activities -1. **[Linux installfests](/installfest.html)**: on the 2nd Friday of every quarter. +1. **[Linux installfests](/events/installfest)**: on the 2nd Friday of every quarter. 1. **Linux Help & Advice**: in office hours and Discord. 1. **Tech Talks**. 1. **[Edit-a-thons](https://en.wikipedia.org/wiki/Edit-a-thon)**: Bi-quarterly group editing events aimed to contribute to free knowledge on Wikipedia, and other Linux Wikis. diff --git a/content/directory.md b/content/directory.md index c0fbe5c..ca23970 100644 --- a/content/directory.md +++ b/content/directory.md @@ -21,7 +21,7 @@ Here's a list of member-run websites: - [IDKYTM](https://linux.ucla.edu/idkytm.html) - [Holy Hell!](https://linux.ucla.edu/holyhell.html) - [Crafting for Cancer](https://linux.ucla.edu/craftingforcancer) -- [Installfests](https://linux.ucla.edu/installfest.html) +- [Installfests](/events/installfest) - [Taylor Swift Guessing Game](https://linux.ucla.edu/tswift) Here's a list of test websites: diff --git a/content/events/installfest-f22.md b/content/events/installfest-f22.md new file mode 100644 index 0000000..0a62ca2 --- /dev/null +++ b/content/events/installfest-f22.md @@ -0,0 +1,23 @@ +--- +title: "2022 Fall Installfest" +date: 2022-10-03 +tags: [events] +author: LUG Board +--- + +(Free Pizza will be provided)! + +Linux Users Group (LUG) at UCLA, invites you to attend the quarterly Linux Installfest! Please fill out the RSVP form. + +* Date: 2022-10-07 Friday +* Time: 18:00-21:00 +* Location: Mong Auditorium in Engineering 6 +* RSVP: link + +## General Info + +LUG hosts a quarterly installfest on Friday of 2nd week. Attendees will be provided a USB drive and guide to dual booting their computers with Linux (most likely Debian or Arch Linux). However, attendees are welcome to bring their own flash drives and install any distro of their choice as well. Or if attendants do not feel comfortable with the possibility of losing their data, they can set up a Virtual Machine instead. + +## Note on M1 and M2 Macs + +We will not be able to install Linux on M1 and M2 Macs since they use custom Apple cores, however you can still set up a Virtual Machine to run Linux so feel free to come and chat with us! We plan on hosting a seperate event later about installing Asahi Linux, an Arch clone that works on M1 and M2 Macs. diff --git a/content/events/installfest.md b/content/events/installfest.md index eef9a48..82cef39 100644 --- a/content/events/installfest.md +++ b/content/events/installfest.md @@ -1,23 +1,31 @@ --- -title: "2022 Fall Installfest" -date: 2022-10-03 -tags: events +title: "Spring 2024 Installfest" +date: 2024-04-03 +tags: [events] author: LUG Board --- -(Free Pizza will be provided)! +Free Pizza will be provided!!! -Linux Users Group (LUG) at UCLA, invites you to attend the quarterly Linux Installfest! Please fill out the RSVP form. +The Linux Users Group (LUG) at UCLA invites you to attend the quarterly Linux Installfest! Please fill out the [RSVP form](https://docs.google.com/forms/d/e/1FAIpQLSfnZdiENvHqAs4xtx6kEqtkstL4GVClOlzo-Gq_wiswHkGQtQ/viewform?usp=sf_link) to indicate your pizza preferences. -* Date: 2022-10-07 Friday -* Time: 18:00-21:00 -* Location: Mong Auditorium in Engineering 6 (Pending Approval) -* RSVP: link +* Date: 2024-04-12, Friday +* Time: 6-9 PM +* Location: Engineering IV (exact room TBD) +* RSVP: [link](https://docs.google.com/forms/d/e/1FAIpQLSfnZdiENvHqAs4xtx6kEqtkstL4GVClOlzo-Gq_wiswHkGQtQ/viewform?usp=sf_link) ## General Info LUG hosts a quarterly installfest on Friday of 2nd week. Attendees will be provided a USB drive and guide to dual booting their computers with Linux (most likely Debian or Arch Linux). However, attendees are welcome to bring their own flash drives and install any distro of their choice as well. Or if attendants do not feel comfortable with the possibility of losing their data, they can set up a Virtual Machine instead. +The officers will also be doing a show-and-tell of their own obscure hardware which they have installed Linux on. + +At the end, we'll have a SuperTuxKart LAN party with our freshly installed Linux machines. + +## Past Installfests + +You can view pictures from past installfests [here](https://linux.ucla.edu/zenphoto/). + ## Note on M1 and M2 Macs -We will not be able to install Linux on M1 and M2 Macs since they use custom Apple cores, however you can still set up a Virtual Machine to run Linux so feel free to come and chat with us! We plan on hosting a seperate event later about installing Asahi Linux, an Arch clone that works on M1 and M2 Macs. +Due to their custom Apple silicon, the only Linux distro which works on M1/M2/M3 Macs is the experimental Asahi Linux. You also have the option of setting up a Virtual Machine to run Linux so feel free to come and chat with us! diff --git a/layouts/partials/now.html b/layouts/partials/now.html index 3ba94a8..b330e07 100644 --- a/layouts/partials/now.html +++ b/layouts/partials/now.html @@ -13,6 +13,5 @@ }
    -
  1. 10-07: Installfest, Friday 18:00-19:00 in Mong Auditorium in Engineering 6
    2. -
  2. TBD: General meeting
    3. +
  3. April 12, 2024: SPRING 2024 INSTALLFEST, 6-9 PM in Engineering IV
From 0523cb13f4337bf88eee77268e6b71474fd2bc33 Mon Sep 17 00:00:00 2001 From: James Shiffer Date: Wed, 3 Apr 2024 00:54:49 -0700 Subject: [PATCH 6/6] Metadata --- config.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.toml b/config.toml index 8f53e8d..b456ede 100644 --- a/config.toml +++ b/config.toml @@ -1,10 +1,10 @@ baseURL = "/" languageCode = "en-us" -title = "UCLA LUG" +title = "UCLA Linux Users Group" theme = "ezhil" paginate = 5 -copyright = "© 2022 Copyright" +copyright = "© Copyright 2024" pygmentsstyle = "solarized-dark" pygmentscodefences = true