Merge branch 'main' into stickers
This commit is contained in:
commit
efe79ff639
4 files changed
+78
-119
No files matched your search
+23
-12
@@ -47,7 +47,7 @@ layout: base.njk
|
||||
|
||||
<div class="job">
|
||||
<div class="two-col job-details">
|
||||
<h3>Freelance Web Developer</h3>
|
||||
<h3 id="freelance-web-developer">Freelance Web Developer</h3>
|
||||
<p class="col2"><time datetime="2026-01">January 2026</time> – Present</p>
|
||||
</div>
|
||||
|
||||
@@ -64,6 +64,17 @@ layout: base.njk
|
||||
a clean and minimalist homepage for the District Dharma collective,
|
||||
built in Eleventy with a Mattrbld content management system to allow
|
||||
for easy editing by the client.
|
||||
<blockquote class="testimonial">
|
||||
Being of a generation that didn't grow up with technology, I was a little
|
||||
nervous going into this project, but Lee made it easy. He was patient and
|
||||
completely non-judgmental with my simple questions, quick to respond by
|
||||
email, and open to my feedback throughout. He built exactly what I
|
||||
envisioned for our meditation group's website, and his estimate was the
|
||||
final cost. When he asked what he could improve, I honestly couldn't come
|
||||
up with anything. He delivered what he promised and was easy to reach the
|
||||
whole way through. If you want someone skilled who will also make the
|
||||
process feel comfortable, I can't recommend him highly enough.
|
||||
</blockquote>
|
||||
</li>
|
||||
<li>
|
||||
<strong>My Liberation Work Has Been Damn Ableist: A Landworker Memoir
|
||||
@@ -147,7 +158,7 @@ layout: base.njk
|
||||
datetime="2025-07">July 2025</time></p>
|
||||
</div>
|
||||
|
||||
<h3>Software Development Engineer I & II</h3>
|
||||
<h3 id="software-development-engineer-i-ii">Software Development Engineer I & II</h3>
|
||||
|
||||
<p>
|
||||
Worked on green- and brown-field projects with customers, solving emerging
|
||||
@@ -184,7 +195,7 @@ layout: base.njk
|
||||
<p class="col2"><time datetime="2023-10">October 2023</time> – Present</p>
|
||||
</div>
|
||||
|
||||
<h3>Co-owner and artist</h3>
|
||||
<h3 id="co-owner-and-artist">Co-owner and artist</h3>
|
||||
|
||||
<p>
|
||||
Maintains website, storefront, and inventory for a diverse set of artistic
|
||||
@@ -210,7 +221,7 @@ layout: base.njk
|
||||
datetime="2017-12">December 2017</time></p>
|
||||
</div>
|
||||
|
||||
<h3>Undergraduate Programming Mentor</h3>
|
||||
<h3 id="undergraduate-programming-mentor">Undergraduate Programming Mentor</h3>
|
||||
|
||||
<p>
|
||||
Helped students debug and develop in Python and learn core programming
|
||||
@@ -227,7 +238,7 @@ layout: base.njk
|
||||
datetime="2017-08">August 2017</time></p>
|
||||
</div>
|
||||
|
||||
<h3>Software Development Engineering Intern</h3>
|
||||
<h3 id="software-development-engineering-intern">Software Development Engineering Intern</h3>
|
||||
<p>
|
||||
Developed a chatbot add-on for the Azure Android application.
|
||||
</p>
|
||||
@@ -239,7 +250,7 @@ layout: base.njk
|
||||
|
||||
<div class="job">
|
||||
<div class="two-col job-details">
|
||||
<h3>FediLearns (<a
|
||||
<h3 id="fedilearns">FediLearns (<a
|
||||
href="https://fedilearns.fyi" target="_blank">fedilearns.fyi</a>)</h3>
|
||||
<p class="col2"><time datetime="2026-04">April 2026</time> – Present
|
||||
</p>
|
||||
@@ -254,7 +265,7 @@ layout: base.njk
|
||||
|
||||
<div class="job">
|
||||
<div class="two-col job-details">
|
||||
<h3>Siblinghood of the Traveling Greeting Card (<a
|
||||
<h3 id="siblinghood-of-the-traveling-greeting-card">Siblinghood of the Traveling Greeting Card (<a
|
||||
href="https://siblinghood.quest"
|
||||
target="_blank">siblinghood.quest</a>)</h3>
|
||||
<p class="col2"><time datetime="2025-11">November 2025</time> – Present
|
||||
@@ -269,13 +280,13 @@ layout: base.njk
|
||||
|
||||
<div class="job">
|
||||
<div class="two-col job-details">
|
||||
<h3>FediZineFest (<a href="https://fedizinefest.fyi"
|
||||
<h3 id="fedizinefest">FediZineFest (<a href="https://fedizinefest.fyi"
|
||||
target="_blank">fedizinefest.fyi</a>)</h3>
|
||||
<p class="col2"><time datetime="2023-12">December 2023</time> – Present</p>
|
||||
</div>
|
||||
|
||||
<p>Creates and runs a global event for zine artists on the fediverse, now kicking
|
||||
off its third year. Coordinates website, physical material shipping and
|
||||
<p>Creates and runs a global event for zine artists on the fediverse, now in its
|
||||
third year. Coordinates website, physical material shipping and
|
||||
logistics, payment, and marketing for a 40–50 person project. Leads a small team
|
||||
and delegates appropriate responsibilities.</p>
|
||||
</div>
|
||||
@@ -295,7 +306,7 @@ layout: base.njk
|
||||
|
||||
<div class="job">
|
||||
<div class="two-col job-details">
|
||||
<h3>Rescue Trans Rescue (<a href="https://rescue-trans-rescue.quest"
|
||||
<h3 id="rescue-trans-rescue">Rescue Trans Rescue (<a href="https://rescue-trans-rescue.quest"
|
||||
target="_blank">rescue-trans-rescue.quest</a>)</h3>
|
||||
<p class="col2"><time datetime="2024">2024</time></p>
|
||||
</div>
|
||||
@@ -307,7 +318,7 @@ layout: base.njk
|
||||
|
||||
<hr>
|
||||
|
||||
<h2 class="centered upper">Education</h2>
|
||||
<h2 class="centered upper" id="education">Education</h2>
|
||||
|
||||
<p class="centered">
|
||||
<b>Bachelor of Science — Computer Science</b>
|
||||
|
||||
@@ -11,6 +11,8 @@ tags:
|
||||
|
||||
alrighty, this one's a real doozy. Strap in.
|
||||
|
||||
and as always, if you find an error or have feedback, please [let me know](/contact).
|
||||
|
||||
## versioning
|
||||
|
||||
have you ever tried to revert to a previous version of a document in MS Office or Google Docs and found that your revision history is cluttered with small changes that by all rights should be grouped into one set of edits, but they aren't, and it's tedious to pick through all the versions?
|
||||
@@ -30,7 +32,7 @@ this walkthrough is best suited for people who want to use `git` in single-perso
|
||||
|
||||
this walkthrough also focuses on the "happy path," without much discussion of troubleshooting. I may write more on the topic in the future, but we're already over *4,500 words*, so we're calling it a day.
|
||||
|
||||
finally, I wrote this walkthrough primarily with knowledge from using **WSL** [more on this later] on **Windows** and with **Zed** as my text editor. While I've tried to cover my bases with other OSes and options, there's a solid chance I'm missing things!
|
||||
finally, I wrote this walkthrough primarily with knowledge from using **WSL** [more on this later] on **Windows** and with **Zed** as my text editor, and I've since lightly reviewed from **Linux Mint** with **Gram** as my text editor. While I've tried to cover my bases with other OSes and options, there's a solid chance I'm missing things!
|
||||
|
||||
that all said, let's get (git?) into it!
|
||||
|
||||
@@ -58,10 +60,10 @@ a CLI a way to interact with your computer and with software in text-only form.
|
||||
|
||||
if you want to use the `git` CLI, you'll need a terminal. You've got a couple options here:
|
||||
|
||||
- on Linux or Mac, you should have one built in! This is the easy path, congrats :) Even better, `git` generally ships with these systems, so there's no installation required. Search for an application called 'Terminal' or similar
|
||||
- on Linux or Mac, you should have one built in! This is the easy path, congrats :) Even better, `git` generally ships with these systems (or is a one-liner install such as `apt install git`). Search for an application called 'Terminal' or similar
|
||||
- note that I don't have a Mac and have never used one. I can't guarantee that everything operates the same over there - there may be discrepancies I don't know about
|
||||
- on Windows, there's two options
|
||||
- [`git` for Windows](https://gitforwindows.org/) packages a Linux-like terminal with a `git` GUI. This may be slightly friendlier for people who aren't at all familiar with Linux. If choosing `git` for Windows, [see my installation instructions below](#git-for-windows)
|
||||
- [`git` for Windows](https://gitforwindows.org/) packages a Linux-like terminal with a `git` GUI. This is probably the friendlier option to get started with. If choosing `git` for Windows, [see my installation instructions below](#git-for-windows)
|
||||
- I use [Windows Subsystem for Linux, or WSL](https://learn.microsoft.com/en-us/windows/wsl/install), which gives you a Linux distribution within Windows. It's pretty smooth sailing at this point, but there's some idiosyncracies to conquer - like the fact that your *Windows* files and your *Linux* files are stored in different places. If choosing WSL, [see my usage notes below](#wsl)
|
||||
- both of the Windows options listed work with [Windows Terminal](https://apps.microsoft.com/detail/9n0dx20hk701) which offers a nicer-looking terminal experience than the basic command prompt. If you're going to keep working with what you set up today, I recommend it!
|
||||
|
||||
@@ -83,7 +85,7 @@ you can open `git` for Windows via the start menu by searching for 'git bash.' I
|
||||
while *installing* WSL is a single command, here's a couple notes about getting started once *inside* WSL:
|
||||
|
||||
- don't be concerned that you can't see anything when you type or paste your password! Since it's sensitive information, this is intentional. You'll notice this pattern a couple of times while following this walkthrough
|
||||
- `Ctrl+C` and `Ctrl+V` won't work like they do on Windows. If you want to copy/paste, right-click (there won't be a context menu, it'll just happen)
|
||||
- `Ctrl+C` and `Ctrl+V` won't work like they do on Windows. If you want to copy/paste, use `Shift+Ctrl+C` and `Shift+Ctrl+V`
|
||||
- if you're downloading a text editor like the ones mentioned above, you'll still follow the *Windows* instructions
|
||||
|
||||
you'll also need to be careful of a few things regarding text editors to make them work with WSL:
|
||||
@@ -354,14 +356,16 @@ let's head on over to [Codeberg](https://codeberg.org/) First off, we'll make an
|
||||
|
||||
now we'll make a new project using the `+` in the upper right. Choose 'New repository,' then pick a repository name. You can leave the other settings be.
|
||||
|
||||
with the project created, Codeberg will tell us three things we can do: clone the repository, create a new repository, or push an existing repository. We'll push an existing one.
|
||||
with the project created, Codeberg will tell us three things we can do: clone the repository, create a new repository, or push an existing repository. We'll push an existing one. Codeberg says we can do this:
|
||||
|
||||
```sh
|
||||
git remote add origin https://codeberg.org/inherentlee/testing.git
|
||||
git remote add origin https://codeberg.org/inherentlee/git-intro.git
|
||||
git push -u origin main
|
||||
```
|
||||
|
||||
first, we'll add a remote. Across from the project title, we should see a button that says `Code` with a dropdown indicator. It'll offer a few choices, the first two being SSH and HTTPS. I'll talk about SSH in a bit, but let's try HTTPS first. Copy that URL; we're about to use it in a command.
|
||||
ok, let's break that down.
|
||||
|
||||
first, we'll add a remote. Across from the project title, we should see a button that says `Code` with a dropdown indicator. It'll offer a few choices, the first two being SSH and HTTPS. I'll talk about SSH in a bit, but let's try HTTPS first. Copy that URL; we're about to use it in a command. (You can also directly copy from the instructions we read above, but those won't be available after you've added code to the Codeberg project.)
|
||||
|
||||
> tip: the remote can be named whatever you want! Traditionally, it's called `origin`, but if it's easier for you to remember, you might call it `codeberg` or maybe `remote`
|
||||
|
||||
@@ -432,7 +436,7 @@ running `ssh-keygen` will take us through a series of prompts. Assuming we don't
|
||||
|
||||
when you choose a passphrase, *write it down*. If you lose it, there is no recourse. You will have to generate a new SSH key.
|
||||
|
||||
after generation, we will have two files at the location specified by the tool (or the custom location we chose). Generally, that's the folder `.ssh` in our home directory. If we navigate to that directory (`cd $HOME/.ssh`) and look at the files (`ls`), we'll see files named `id_rsa` and `id_rsa.pub`. The one that ends with `.pub` is the *public* key.
|
||||
after generation, we will have two files at the location specified by the tool (or the custom location we chose). Generally, that's the folder `.ssh` in our home directory. If we navigate to that directory (`cd $HOME/.ssh`) and look at the files (`ls`), we'll see files named `id_rsa` and `id_rsa.pub` (or maybe `id_ed25519` and `id_ed25519.pub` or something else). The one that ends with `.pub` is the *public* key.
|
||||
|
||||
#### an alias...
|
||||
|
||||
@@ -488,7 +492,7 @@ in order for all this to be useful, we need to tell Codeberg about our SSH key.
|
||||
|
||||
### `git push`, take two
|
||||
|
||||
we can now call `git push` again and again now without having to repeat our credentials every time. We can also call `git pull` for our private repositories.
|
||||
whether we're using HTTPS or SSH, we can now call `git push` again and again now without having to repeat our credentials every time. We can also call `git pull` for our private repositories.
|
||||
|
||||
## summary
|
||||
|
||||
|
||||
Reference in new issue
Block a user