From 67e8d41b747784427fbcb3454f102dd114fd0922 Mon Sep 17 00:00:00 2001 From: askiiart Date: Sun, 27 Aug 2023 18:24:54 -0500 Subject: [PATCH] fix syntax highlighting classes, minor updates --- blog/marlin-boot-animations.html | 6 +-- resume.html | 6 +-- stack.html | 59 ++++++++++++++++--------- stack.md | 1 + til/using-json-with-docker-compose.html | 2 +- 5 files changed, 47 insertions(+), 27 deletions(-) diff --git a/blog/marlin-boot-animations.html b/blog/marlin-boot-animations.html index b103127..48b6007 100755 --- a/blog/marlin-boot-animations.html +++ b/blog/marlin-boot-animations.html @@ -19,7 +19,7 @@

Here's an example of an animated _Bootscreen.h:

/**
+        class="language-cpp">/**
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
@@ -370,7 +370,7 @@
         
Each array looks like the one below, which is the Linux Mint
         logo.

         
const unsigned char custom_start_bmp[] PROGMEM = {
+        class="language-cpp">const unsigned char custom_start_bmp[] PROGMEM = {
   B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
   B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
   B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
@@ -456,7 +456,7 @@
         Bad Apple (albeit a bit messed up).

         
The end

         
#ifdef CUSTOM_BOOTSCREEN_ANIMATED_FRAME_TIME
+        class="language-cpp">#ifdef CUSTOM_BOOTSCREEN_ANIMATED_FRAME_TIME
 
   // Each frame has its own custom duration
   const boot_frame_t custom_bootscreen_animation[] PROGMEM = {
diff --git a/resume.html b/resume.html
index 35773bf..c0cdf8d 100755
--- a/resume.html
+++ b/resume.html
@@ -11,9 +11,9 @@
         
Resume

         

         Benjamin Zimmerman 

-        resume@askiiart.net 
 This
-        is public, so I'm not going to put my phone number or address
-        here. Please use email as the primary method of contact.
+        resume@askiiart.net
+        
 This is public, so I'm not going to put my phone number or
+        address here. Please use email as the primary method of contact.
         

         
Professional Experience

         
    
diff --git a/stack.html b/stack.html
index cd47813..30ce3cd 100755
--- a/stack.html
+++ b/stack.html
@@ -11,46 +11,65 @@
         
    My Stack
    
         
    Hardware
    
         
      
-        
    • CPU: Ryzen 5 3600
      • 
-        
    • Motherboard: Gigabyte B450M DS3H WIFI
      • 
+        
    • CPU: Intel i5-12400
      • 
+        
    • Motherboard: MSI PRO B660-A
      • 
         
    • RAM: 2x 8GB DDR4-3200
      • 
-        
    • SSD: 500GB ADATA (for boot)
      • 
-        
    • HDDs: 3x 4TB Toshiba X300s (for bulk storage)
      • 
-        
    • PSU: Corsair CX450M (2015)
      • 
+        
    • SSD: 500GB ADATA (for cache)
      • 
+        
    • HDDs:
+        
        
+        
      • 3x 4TB Toshiba X300s (for bulk storage)
        • 
+        
      • 1x 8TB Seagate Barracuda Compute (for parity), would not
+        recommend due to SMR.
        • 
+        
      • 
+        
    • PSU: Corsair RM750x
      • 
         
    • UPS: CyberPower CP1500PFCLCD
      • 
-        
    • Case: Silverstone PS09 (would recommend!)
      • 
-        
    • Fans: One 80mm fan in rear (blows air out, model and details
-        unknown), One AVC 8025 DS08025R12U in front (pulls air in)
      • 
-        
    • GPU: None
      • 
+        
    • Case: Some obscure thing from Cybertron (now CLX
+        Gaming)
      • 
+        
    • GPU: Integrated Intel UHD 750
      • 
         
    
         
    Software
    
         
      
-        
    • OS: Proxmox VE 7.3.1
      • 
-        
    • Docker installed natively (not in VM or LXC container)
-        
        
-        
      • Using only docker-compose files
        • 
-        
      • 
-        
    • ZFS is set up, the HDDs are in a RAIDZ1 pool
+        
    • OS: Unraid 6.11.5
      • 
+        
    • Docker installed natively, but I might move it to a Debian
+        VM
      • 
+        
    • Storage: 3x 4TB, 1x 8TB parity drive, 512GB cache drive,
+        running off a 32GB USB drive
         
        
         
      • Equivalent to RAID-5
        • 
-        
      • Speed: 2x read speed, normal write speed
        • 
-        
      • 8TB of capacity available
        • 
+        
      • 12TB of capacity available
        • 
         
      • Can lose any one drive without losing any data.
        • 
         
      • 
+        
    • PC
+        Part Picker Link
      • 
         
    
         
    Website
    
         
      
         
    • Running on nginx in Docker
      • 
         
    • Behind Caddy as a reverse proxy
      • 
-        
    • Written in markdown, then converted to HTML using pandoc
+        
    • Written in markdown, then converted to HTML using pandoc.
         
        
         
      • Script for this here
        • 
         
      • pandoc is one of the very few things I don't have in Docker
         (yet)
        • 
         
      • 
-        
    • All
-        in a git repo
      • 
+        
    • Syntax highlighting using prism.js
      • 
+        
    • In
+        a git repo
      • 
+        
    
+        
    Docker registry
    
+        
      
+        
    • Currently just redirecting to Docker Hub, using
+        the Caddy config from here
+        (direct
+        link to Caddyfile)
      • 
+        
    • I'll probably set up a proper self-hosted registry later,
+        but I haven't gotten to it yet.
      • 
         
    
         
     
diff --git a/stack.md b/stack.md
index be6ed5f..89f7f6c 100755
--- a/stack.md
+++ b/stack.md
@@ -22,6 +22,7 @@
   - Equivalent to RAID-5
   - 12TB of capacity available
   - Can lose any one drive without losing any data.
+- [PC Part Picker Link](https://pcpartpicker.com/user/Cheap_Fleet/saved/pR82kL)
 
 ## Website
 
diff --git a/til/using-json-with-docker-compose.html b/til/using-json-with-docker-compose.html
index 68ee912..7626e2b 100644
--- a/til/using-json-with-docker-compose.html
+++ b/til/using-json-with-docker-compose.html
@@ -15,7 +15,7 @@
         whitespace issues wasting half an hour of your time. Here's an
         example of a docker compose file in JSON:
    
         
    {
+        class="language-json">{
   "version": "3.8",
   "services": {
     "nginx": {