commit 41aff37a7a1275b9687d0a14064aee3bc1b41c1e
parent 73552dc0bd9e3a180a9462637b79e67044b689cb
Author: Jake Bauer <jbauer@paritybit.ca>
Date: Fri, 10 Sep 2021 23:11:25 -0400
Update various pages
Diffstat:
4 files changed, 117 insertions(+), 79 deletions(-)
diff --git a/pages/hardware.md b/pages/hardware.md
@@ -4,7 +4,7 @@
[//]: # "main.min.css"
-[//]: # "My Main PC; Laptops; Tablets; Phone; OPNSense Router; Virtualization Server; Git Server"
+[//]: #
### My Main PC
@@ -18,62 +18,25 @@
- **Boot Drive:** Samsung 970 Evo 250GB NVMe SSD
- **Additional Storage:** HGST Deskstar 5K4000 4.0TB 5700RPM HDD
- **Windows Boot:** Crucial MX300 275GB SATA SSD
- - **Windows Games:** Samsung 860 Evo 250GB SATA SSD
+ - **Windows Games:** Seagate 360GB 7200RPM HDD
* **Monitors:** 2x ASUS VP239H-P 23" 1080 IPS
-You can see the original build that I did, along with the cost for each item in
-Canadian dollars at the time that it was purchased, by clicking this link to [a
-PCPartPicker build list](https://ca.pcpartpicker.com/b/vpLJ7P). RAM prices at
-the time (November, 2017) were absolutely horrendous.
+[PCPartPicker build list](https://ca.pcpartpicker.com/b/vpLJ7P).
### Laptops
-I own a Thinkpad T440s (I don't actually mind the trackpad) which I purchased
-second-hand off of eBay for a grand total of $215 USD after shipping/etc with
-the following specifications:
-
-* **CPU:** Intel i5-4300U
-* **RAM:** 4GB Soldered + 4GB Samsung DDR3L SO-DIMM
-* **GPU:** Intel Integrated Graphics
-* **Storage:** Crucial 250GB SATA SSD
-* **Screen:** 1080p IPS
-
-I also [bought a T420s](/blog/my-new-t420s) which tends to get a bit more use:
+I have a Thinkpad T420s:
* **CPU:** Intel i5-2520M
-* **RAM:** 2x4GB DDR3 SO-DIMM
-* **GPU:** Intel Integrated Graphics
+* **RAM:** 4+8GB DDR3 SO-DIMM
* **Storage:**
- * Crucial 128GB SATA SSD
- * Kingston 120GB SATA SSD
+ * Crucial 250GB SATA SSD
+ * Seagate 500GB 5400RPM HDD
* **Screen:** 1600x900 TN
-### Tablets
-
-* Dell Venue 11 Pro 7130 - Used mostly as a portable display for when I need to
-reference things like datasheets or D&D rulebooks.
- - **CPU:** Intel i5-4300Y
- - **RAM:** 8GB DDR3
- - **GPU:** Intel Integrated Graphics
- - **Storage:** 128GB SATA M.2 SSD
- - **Screen:** 1080p w/ Touch
- - With dock and keyboard
-
-* Samsung Galaxy Tab 3 Lite - Used for reading PDFs; kept entirely offline.
- - 1GB RAM
- - 8GB Storage
- - With protective folding case
-
### Phone
-My daily carry cellphone is a Doro PhoneEasy 612. I describe it in more detail
-in [this blog post about switching to a flip
-phone](https://paritybit.ca/blog/flip-phone-challenge).
-
-I also own an Android phone which I purchased in 2015 and which is still going
-strong more than 5 years later. I haven't even had to swap the battery yet.
-
-* ASUS Zenfone 2 Laser
+* ASUS Zenfone 2 Laser (purchased 2015)
- 3GB RAM
- 16GB Storage
- Runs LineageOS with no Google stuff added
@@ -88,25 +51,27 @@ the specifications:
* HP SFF Desktop PC w/ Proprietary Motherboard/Case/PSU
- **CPU:** Intel Core i3-3220 CPU @ 3.30GHz (4C/4T)
- **RAM:** 2x2GB DDR3
- - **Storage:** 160GB Fujitsu 2.5" SATA-II HDD
-
-### Virtualization Server
+ - **Storage:** 120GB Crucial SSD
-This is one of my old laptops. I've owned it for at least 7 years if not longer
-and I'm pretty sure it was my second laptop ever.
+### Main Home Server
-* Lenovo V570 Laptop (missing display)
- - **CPU:** i5-2450M @ 2.50GHz (2C/4T)
- - **RAM:** 12GB DDR3 SO-DIMM
- - **Storage:** Seagate Momentus 500GB 5400RPM
+* Dell Optiplex 3020 SFF
+ - **CPU:** i5-4590 @ 3.30GHz (4C/4T)
+ - **RAM:** 4+4GB DDR3
+ - **Storage:** ZFS Mirror of Two Samsung 860 EVO 250GB SSDs
- **Backup Storage:** Seagate Expansion 8TB External HDD
-### Git Server
+### Testing/Staging Server
-Purchased for $20 including a case from a local seller.
+* Dell Optiplex 3010 SFF
+ - **CPU:** i5-3470 @ 3.20GHz (4C/4T)
+ - **RAM:** 4+4GB DDR3
+ - **Storage:** Seagate ST3500413AS HDD
-* PineA64+ (Original, not LTS)
- - **CPU:** Allwinner A64
- - **RAM:** 2GB DDR3
- - **Storage:** 32GB SanDisk Ultra SD Card
+### Home NAS
+* Dell Optiplex 3020 MT
+ - **CPU:** i3-4150 @ 3.50GHz (2C/4T)
+ - **RAM:** 2+4GB DDR3
+ - **Boot:** Samsung 870 EVO 250GB SSD
+ - **Storage:** ZFS Mirror of Two HGST HDN726040ALE614 (4TB) HDDs
diff --git a/pages/home.md b/pages/home.md
@@ -45,22 +45,12 @@ License](https://www.isc.org/licenses/). The source code is available on
### Contact
-In no particular order, I can be contacted using:
+Ordered from most to least preferred, I can be contacted using:
* Email: [jbauer@paritybit.ca](mailto:jbauer@paritybit.ca);
-* IRC: `jbauer` on OFTC, Libera.chat, maybe other networks;
-* Fediverse: [@jbauer@bsd.network](https://bsd.network/@jbauer);
* XMPP: Not unless I know you.
-
-The most reliable way to contact me is through email. If you're contacting me
-via email, you can use PGP. My keys are on
-[keys.openpgp.net](https://keys.openpgp.org/) or available via [direct
-download](https://www.paritybit.ca/pubkey.asc). They have the following
-fingerprint:
-
-```
-8A55 347B 2845 6BA7 0E43 B864 C3EB 9CAF 610B B4FB
-```
+* Fediverse: [@jbauer@bsd.network](https://bsd.network/@jbauer);
+* IRC: `jbauer` on OFTC, Libera.chat, maybe other networks;
If you're contacting me using XMPP, please use OMEMO if you can. My device
fingerprints are:
diff --git a/pages/software.md b/pages/software.md
@@ -6,6 +6,9 @@
[//]: #
+<br><p class="note">NOTE: This page is out of date, see the current <a
+href="/uses">uses page</a> for updated information.</p>
+
<figure>
<a href="/img/desktop.png"><img src="/img/desktop-thumb.png" alt="A picture
of my desktop with neofetch open."/></a>
diff --git a/pages/uses.md b/pages/uses.md
@@ -6,11 +6,91 @@
[//]: #
-This page is for those who are curious about the programs and equipment I use
-to get work done. It is inspired by [uses.tech](https://uses.tech/).
+This page is for those who are curious about the programs and equipment I use to
+get work done. It is inspired by [uses.tech](https://uses.tech/). You can also
+check out [how I name my computers](https://www.paritybit.ca/hostnames).
-This page got a little too big so I've split it up into categories:
+### Software
+
+I currently run [Fedora Linux](https://getfedora.org/en/workstation/) with the
+Cinnamon desktop environment on my workstation. I have used OpenBSD, Artix
+Linux, Debian, Ubuntu, and Linux Mint in the past, but I got tired of fiddling
+with things and wanted my system to Just Workâ˘.
+
+I previously used a tiling window manager setup and a bunch of hand-picked
+applications which you can check out on the [old software page](/software). Now
+I just use what comes with the system (for the most part) and I get on with my
+work.
+
+### Hardware
+
+#### My Main PC
+
+* **CPU:** Ryzen 5 1600 w/ Stock Cooler
+* **RAM:** 2x8GB + 2x4GB (24GB) G.Skill Ripjaws V and Ripjaws 4 respectively
+* **GPU:** PowerColor Red Dragon RX 580 4GB
+* **PSU:** EVGA SuperNova G2 Gold 650W
+* **Motherboard:** AsRock AB350M Pro4
+* **Case:** Deepcool Kendomen Black ATX Mid
+* **Storage:**
+ - **Boot Drive:** Samsung 970 Evo 250GB NVMe SSD
+ - **Additional Storage:** HGST Deskstar 5K4000 4.0TB 5700RPM HDD
+ - **Windows Boot:** Crucial MX300 275GB SATA SSD
+ - **Windows Games:** Seagate 360GB 7200RPM HDD
+* **Monitors:** 2x ASUS VP239H-P 23" 1080 IPS
+
+[PCPartPicker build list](https://ca.pcpartpicker.com/b/vpLJ7P).
+
+#### Laptops
+
+I have a Thinkpad T420s:
+
+* **CPU:** Intel i5-2520M
+* **RAM:** 4+8GB DDR3 SO-DIMM
+* **Storage:**
+ * Crucial 250GB SATA SSD
+ * Seagate 500GB 5400RPM HDD
+* **Screen:** 1600x900 TN
+
+#### Phone
+
+* ASUS Zenfone 2 Laser (purchased 2015)
+ - 3GB RAM
+ - 16GB Storage
+ - Runs LineageOS with no Google stuff added
+
+#### OPNSense Router
+
+It has more horsepower than a router typically needs, but it also does more than
+a typical router. For example, it runs intrusion detection software which scans
+every packet. It also typically only draws 15-20W and stays very quiet. Here are
+the specifications:
+
+* HP SFF Desktop PC w/ Proprietary Motherboard/Case/PSU
+ - **CPU:** Intel Core i3-3220 CPU @ 3.30GHz (4C/4T)
+ - **RAM:** 2x2GB DDR3
+ - **Storage:** 120GB Crucial SSD
+
+#### Main Home Server
+
+* Dell Optiplex 3020 SFF
+ - **CPU:** i5-4590 @ 3.30GHz (4C/4T)
+ - **RAM:** 4+4GB DDR3
+ - **Storage:** ZFS Mirror of Two Samsung 860 EVO 250GB SSDs
+ - **Backup Storage:** Seagate Expansion 8TB External HDD
+
+#### Testing/Staging Server
+
+* Dell Optiplex 3010 SFF
+ - **CPU:** i5-3470 @ 3.20GHz (4C/4T)
+ - **RAM:** 4+4GB DDR3
+ - **Storage:** Seagate ST3500413AS HDD
+
+#### Home NAS
+
+* Dell Optiplex 3020 MT
+ - **CPU:** i3-4150 @ 3.50GHz (2C/4T)
+ - **RAM:** 2+4GB DDR3
+ - **Boot:** Samsung 870 EVO 250GB SSD
+ - **Storage:** ZFS Mirror of Two HGST HDN726040ALE614 (4TB) HDDs
-* [The Hardware I Use](https://www.paritybit.ca/hardware)
-* [The Hostnames I Use](https://www.paritybit.ca/hostnames)
-* [The Software I Use](https://www.paritybit.ca/software)
