fix syntax highlighting classes, minor updates
This commit is contained in:
parent
34d46d03b9
commit
67e8d41b74
5 changed files with 47 additions and 27 deletions
|
@ -19,7 +19,7 @@
|
||||||
<p>Here's an example of an animated
|
<p>Here's an example of an animated
|
||||||
<code>_Bootscreen.h</code>:</p>
|
<code>_Bootscreen.h</code>:</p>
|
||||||
<div class="sourceCode" id="cb1"><pre
|
<div class="sourceCode" id="cb1"><pre
|
||||||
class="sourceCode cpp"><code class="sourceCode cpp"><span id="cb1-1"><a href="#cb1-1" aria-hidden="true" tabindex="-1"></a><span class="co">/**</span></span>
|
class="language-cpp"><code class="language-cpp"><span id="cb1-1"><a href="#cb1-1" aria-hidden="true" tabindex="-1"></a><span class="co">/**</span></span>
|
||||||
<span id="cb1-2"><a href="#cb1-2" aria-hidden="true" tabindex="-1"></a><span class="co"> * Marlin 3D Printer Firmware</span></span>
|
<span id="cb1-2"><a href="#cb1-2" aria-hidden="true" tabindex="-1"></a><span class="co"> * Marlin 3D Printer Firmware</span></span>
|
||||||
<span id="cb1-3"><a href="#cb1-3" aria-hidden="true" tabindex="-1"></a><span class="co"> * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]</span></span>
|
<span id="cb1-3"><a href="#cb1-3" aria-hidden="true" tabindex="-1"></a><span class="co"> * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]</span></span>
|
||||||
<span id="cb1-4"><a href="#cb1-4" aria-hidden="true" tabindex="-1"></a><span class="co"> *</span></span>
|
<span id="cb1-4"><a href="#cb1-4" aria-hidden="true" tabindex="-1"></a><span class="co"> *</span></span>
|
||||||
|
@ -370,7 +370,7 @@
|
||||||
<p>Each array looks like the one below, which is the Linux Mint
|
<p>Each array looks like the one below, which is the Linux Mint
|
||||||
logo.</p>
|
logo.</p>
|
||||||
<div class="sourceCode" id="cb2"><pre
|
<div class="sourceCode" id="cb2"><pre
|
||||||
class="sourceCode cpp"><code class="sourceCode cpp"><span id="cb2-1"><a href="#cb2-1" aria-hidden="true" tabindex="-1"></a><span class="at">const</span> <span class="dt">unsigned</span> <span class="dt">char</span> custom_start_bmp<span class="op">[]</span> PROGMEM <span class="op">=</span> <span class="op">{</span></span>
|
class="language-cpp"><code class="language-cpp"><span id="cb2-1"><a href="#cb2-1" aria-hidden="true" tabindex="-1"></a><span class="at">const</span> <span class="dt">unsigned</span> <span class="dt">char</span> custom_start_bmp<span class="op">[]</span> PROGMEM <span class="op">=</span> <span class="op">{</span></span>
|
||||||
<span id="cb2-2"><a href="#cb2-2" aria-hidden="true" tabindex="-1"></a> B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span></span>
|
<span id="cb2-2"><a href="#cb2-2" aria-hidden="true" tabindex="-1"></a> B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span></span>
|
||||||
<span id="cb2-3"><a href="#cb2-3" aria-hidden="true" tabindex="-1"></a> B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span></span>
|
<span id="cb2-3"><a href="#cb2-3" aria-hidden="true" tabindex="-1"></a> B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span></span>
|
||||||
<span id="cb2-4"><a href="#cb2-4" aria-hidden="true" tabindex="-1"></a> B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span></span>
|
<span id="cb2-4"><a href="#cb2-4" aria-hidden="true" tabindex="-1"></a> B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span>B11111111<span class="op">,</span></span>
|
||||||
|
@ -456,7 +456,7 @@
|
||||||
Bad Apple (albeit a bit messed up).</p>
|
Bad Apple (albeit a bit messed up).</p>
|
||||||
<h3 id="the-end">The end</h3>
|
<h3 id="the-end">The end</h3>
|
||||||
<div class="sourceCode" id="cb3"><pre
|
<div class="sourceCode" id="cb3"><pre
|
||||||
class="sourceCode cpp"><code class="sourceCode cpp"><span id="cb3-1"><a href="#cb3-1" aria-hidden="true" tabindex="-1"></a><span class="pp">#ifdef CUSTOM_BOOTSCREEN_ANIMATED_FRAME_TIME</span></span>
|
class="language-cpp"><code class="language-cpp"><span id="cb3-1"><a href="#cb3-1" aria-hidden="true" tabindex="-1"></a><span class="pp">#ifdef CUSTOM_BOOTSCREEN_ANIMATED_FRAME_TIME</span></span>
|
||||||
<span id="cb3-2"><a href="#cb3-2" aria-hidden="true" tabindex="-1"></a></span>
|
<span id="cb3-2"><a href="#cb3-2" aria-hidden="true" tabindex="-1"></a></span>
|
||||||
<span id="cb3-3"><a href="#cb3-3" aria-hidden="true" tabindex="-1"></a> <span class="co">// Each frame has its own custom duration</span></span>
|
<span id="cb3-3"><a href="#cb3-3" aria-hidden="true" tabindex="-1"></a> <span class="co">// Each frame has its own custom duration</span></span>
|
||||||
<span id="cb3-4"><a href="#cb3-4" aria-hidden="true" tabindex="-1"></a> <span class="at">const</span> <span class="dt">boot_frame_t</span> custom_bootscreen_animation<span class="op">[]</span> PROGMEM <span class="op">=</span> <span class="op">{</span></span>
|
<span id="cb3-4"><a href="#cb3-4" aria-hidden="true" tabindex="-1"></a> <span class="at">const</span> <span class="dt">boot_frame_t</span> custom_bootscreen_animation<span class="op">[]</span> PROGMEM <span class="op">=</span> <span class="op">{</span></span>
|
||||||
|
|
|
@ -11,9 +11,9 @@
|
||||||
<h1 id="resume">Resume</h1>
|
<h1 id="resume">Resume</h1>
|
||||||
<p>
|
<p>
|
||||||
Benjamin Zimmerman <br>
|
Benjamin Zimmerman <br>
|
||||||
<a href="resume@askiiart.net">resume@askiiart.net</a> <br> This
|
<a href="mailto:resume@askiiart.net">resume@askiiart.net</a>
|
||||||
is public, so I'm not going to put my phone number or address
|
<br> This is public, so I'm not going to put my phone number or
|
||||||
here. Please use email as the primary method of contact.
|
address here. Please use email as the primary method of contact.
|
||||||
</p>
|
</p>
|
||||||
<h2 id="professional-experience">Professional Experience</h2>
|
<h2 id="professional-experience">Professional Experience</h2>
|
||||||
<ul>
|
<ul>
|
||||||
|
|
59
stack.html
59
stack.html
|
@ -11,46 +11,65 @@
|
||||||
<h1 id="my-stack">My Stack</h1>
|
<h1 id="my-stack">My Stack</h1>
|
||||||
<h2 id="hardware">Hardware</h2>
|
<h2 id="hardware">Hardware</h2>
|
||||||
<ul>
|
<ul>
|
||||||
<li>CPU: Ryzen 5 3600</li>
|
<li>CPU: Intel i5-12400</li>
|
||||||
<li>Motherboard: Gigabyte B450M DS3H WIFI</li>
|
<li>Motherboard: MSI PRO B660-A</li>
|
||||||
<li>RAM: 2x 8GB DDR4-3200</li>
|
<li>RAM: 2x 8GB DDR4-3200</li>
|
||||||
<li>SSD: 500GB ADATA (for boot)</li>
|
<li>SSD: 500GB ADATA (for cache)</li>
|
||||||
<li>HDDs: 3x 4TB Toshiba X300s (for bulk storage)</li>
|
<li>HDDs:
|
||||||
<li>PSU: Corsair CX450M (2015)</li>
|
<ul>
|
||||||
|
<li>3x 4TB Toshiba X300s (for bulk storage)</li>
|
||||||
|
<li>1x 8TB Seagate Barracuda Compute (for parity), would not
|
||||||
|
recommend due to SMR.</li>
|
||||||
|
</ul></li>
|
||||||
|
<li>PSU: Corsair RM750x</li>
|
||||||
<li>UPS: CyberPower CP1500PFCLCD</li>
|
<li>UPS: CyberPower CP1500PFCLCD</li>
|
||||||
<li>Case: Silverstone PS09 (would recommend!)</li>
|
<li>Case: Some obscure thing from Cybertron (now CLX
|
||||||
<li>Fans: One 80mm fan in rear (blows air out, model and details
|
Gaming)</li>
|
||||||
unknown), One AVC 8025 DS08025R12U in front (pulls air in)</li>
|
<li>GPU: Integrated Intel UHD 750</li>
|
||||||
<li>GPU: None</li>
|
|
||||||
</ul>
|
</ul>
|
||||||
<h2 id="software">Software</h2>
|
<h2 id="software">Software</h2>
|
||||||
<ul>
|
<ul>
|
||||||
<li>OS: Proxmox VE 7.3.1</li>
|
<li>OS: Unraid 6.11.5</li>
|
||||||
<li>Docker installed natively (not in VM or LXC container)
|
<li>Docker installed natively, but I might move it to a Debian
|
||||||
<ul>
|
VM</li>
|
||||||
<li>Using only docker-compose files</li>
|
<li>Storage: 3x 4TB, 1x 8TB parity drive, 512GB cache drive,
|
||||||
</ul></li>
|
running off a 32GB USB drive
|
||||||
<li>ZFS is set up, the HDDs are in a RAIDZ1 pool
|
|
||||||
<ul>
|
<ul>
|
||||||
<li>Equivalent to RAID-5</li>
|
<li>Equivalent to RAID-5</li>
|
||||||
<li>Speed: 2x read speed, normal write speed</li>
|
<li>12TB of capacity available</li>
|
||||||
<li>8TB of capacity available</li>
|
|
||||||
<li>Can lose any one drive without losing any data.</li>
|
<li>Can lose any one drive without losing any data.</li>
|
||||||
</ul></li>
|
</ul></li>
|
||||||
|
<li><a
|
||||||
|
href="https://pcpartpicker.com/user/Cheap_Fleet/saved/pR82kL">PC
|
||||||
|
Part Picker Link</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
<h2 id="website">Website</h2>
|
<h2 id="website">Website</h2>
|
||||||
<ul>
|
<ul>
|
||||||
<li>Running on nginx in Docker</li>
|
<li>Running on nginx in Docker</li>
|
||||||
<li>Behind Caddy as a reverse proxy</li>
|
<li>Behind Caddy as a reverse proxy</li>
|
||||||
<li>Written in markdown, then converted to HTML using pandoc
|
<li>Written in markdown, then converted to HTML using pandoc.
|
||||||
<ul>
|
<ul>
|
||||||
<li>Script for this <a
|
<li>Script for this <a
|
||||||
href="https://git.askiiart.net/askiiart/askiiart-net/src/branch/main/md2html.py">here</a></li>
|
href="https://git.askiiart.net/askiiart/askiiart-net/src/branch/main/md2html.py">here</a></li>
|
||||||
<li>pandoc is one of the very few things I don't have in Docker
|
<li>pandoc is one of the very few things I don't have in Docker
|
||||||
(yet)</li>
|
(yet)</li>
|
||||||
</ul></li>
|
</ul></li>
|
||||||
<li><a href="https://git.askiiart.net/askiiart/askiiart-net">All
|
<li>Syntax highlighting using <a
|
||||||
in a git repo</a></li>
|
href="https://prismjs.com"><code>prism.js</code></a></li>
|
||||||
|
<li><a href="https://git.askiiart.net/askiiart/askiiart-net">In
|
||||||
|
a git repo</a></li>
|
||||||
|
</ul>
|
||||||
|
<h2 id="docker-registry">Docker registry</h2>
|
||||||
|
<ul>
|
||||||
|
<li>Currently just redirecting to <a
|
||||||
|
href="https://hub.docker.com/u/askiiart">Docker Hub</a>, using
|
||||||
|
the Caddy config from <a
|
||||||
|
href="https://httptoolkit.com/blog/docker-image-registry-facade/">here</a>
|
||||||
|
(<a
|
||||||
|
href="https://github.com/httptoolkit/docker-registry-facade/blob/main/Caddyfile">direct
|
||||||
|
link to Caddyfile</a>)</li>
|
||||||
|
<li>I'll probably set up a proper self-hosted registry later,
|
||||||
|
but I haven't gotten to it yet.</li>
|
||||||
</ul>
|
</ul>
|
||||||
<script src="/prism.js"></script>
|
<script src="/prism.js"></script>
|
||||||
</body>
|
</body>
|
||||||
|
|
1
stack.md
1
stack.md
|
@ -22,6 +22,7 @@
|
||||||
- Equivalent to RAID-5
|
- Equivalent to RAID-5
|
||||||
- 12TB of capacity available
|
- 12TB of capacity available
|
||||||
- Can lose any one drive without losing any data.
|
- Can lose any one drive without losing any data.
|
||||||
|
- [PC Part Picker Link](https://pcpartpicker.com/user/Cheap_Fleet/saved/pR82kL)
|
||||||
|
|
||||||
## Website
|
## Website
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
whitespace issues wasting half an hour of your time. Here's an
|
whitespace issues wasting half an hour of your time. Here's an
|
||||||
example of a docker compose file in JSON:</p>
|
example of a docker compose file in JSON:</p>
|
||||||
<div class="sourceCode" id="cb1"><pre
|
<div class="sourceCode" id="cb1"><pre
|
||||||
class="sourceCode json"><code class="sourceCode json"><span id="cb1-1"><a href="#cb1-1" aria-hidden="true" tabindex="-1"></a><span class="fu">{</span></span>
|
class="language-json"><code class="language-json"><span id="cb1-1"><a href="#cb1-1" aria-hidden="true" tabindex="-1"></a><span class="fu">{</span></span>
|
||||||
<span id="cb1-2"><a href="#cb1-2" aria-hidden="true" tabindex="-1"></a> <span class="dt">"version"</span><span class="fu">:</span> <span class="st">"3.8"</span><span class="fu">,</span></span>
|
<span id="cb1-2"><a href="#cb1-2" aria-hidden="true" tabindex="-1"></a> <span class="dt">"version"</span><span class="fu">:</span> <span class="st">"3.8"</span><span class="fu">,</span></span>
|
||||||
<span id="cb1-3"><a href="#cb1-3" aria-hidden="true" tabindex="-1"></a> <span class="dt">"services"</span><span class="fu">:</span> <span class="fu">{</span></span>
|
<span id="cb1-3"><a href="#cb1-3" aria-hidden="true" tabindex="-1"></a> <span class="dt">"services"</span><span class="fu">:</span> <span class="fu">{</span></span>
|
||||||
<span id="cb1-4"><a href="#cb1-4" aria-hidden="true" tabindex="-1"></a> <span class="dt">"nginx"</span><span class="fu">:</span> <span class="fu">{</span></span>
|
<span id="cb1-4"><a href="#cb1-4" aria-hidden="true" tabindex="-1"></a> <span class="dt">"nginx"</span><span class="fu">:</span> <span class="fu">{</span></span>
|
||||||
|
|
Loading…
Reference in a new issue