clean up repo
This commit is contained in:
parent
f8a5b5f433
commit
86557617db
18 changed files with 0 additions and 271 deletions
|
|
@ -1,8 +0,0 @@
|
|||
#+title: Kaneroku Matsumoto 2023 Shincha
|
||||
#+date: <2024-05-16 Thu>
|
||||
|
||||
I received this tea as a free 10 gram sample from my latest order of tea from Yunomi.life.
|
||||
|
||||
Despite being a year old, this tea is still fantastic. The leaves produce a thick, green broth. It gives plenty of umami. It's a little easy to oversteep, but that's normal for a green tea.
|
||||
|
||||
Rating: 8/10
|
||||
|
|
@ -1,123 +0,0 @@
|
|||
#+title: On Switching to Org-Mode for my Website
|
||||
#+author: Jacob Janzen
|
||||
#+date: <2024-04-14 Sun>
|
||||
|
||||
When I first created this website, I built everything in raw HTML. I liked the control I had over it. It was also a real pain to update it though. Components such as the navigation bar at the top had to be copied to every HTML file along with CSS styling. This could have been made easier with JavaScript, but I consider that to be an abuse of scripting. One of the primary design decisions of this site was avoiding JavaScript whenever possible and there had to be another way.
|
||||
|
||||
Enter Emacs Org-Mode.
|
||||
|
||||
Emacs Org-Mode at its core is a very powerful note-taking software with a lot of depth that I have not come close to. What I do know is that it is quite a bit more ergonomic than Markdown for my needs which is why I prefer =.org= over =.md= whenever I have to write documentation. I've been using Emacs for a while, but hadn't really considered its utility as a highly configurable static site generator before now. Having done so though, I have to say that I really enjoy this new setup. I have set up a [[https://git.sr.ht/~jjanzen/website/tree/main/item/.build.yml][build script]] using sourcehut's build configuration that automatically compiles my =.org= files into =.html= and publishes it. The key line is
|
||||
#+begin_src sh
|
||||
emacs --batch -f package-initialize --script ~/website/publish.el
|
||||
#+end_src
|
||||
which calls Emacs with a [[https://git.sr.ht/~jjanzen/website/tree/main/item/publish.el][publishing script]] I made in Emacs Lisp.
|
||||
|
||||
This =elisp= script that is called is a fair bit more complicated than the =.build.yml= file and it definitely took me a while to get it to where I was happy with it. First, I ensure I have installed all the packages I need with =use-package=.
|
||||
#+begin_src emacs-lisp
|
||||
(require 'package)
|
||||
(add-to-list 'package-archives '("gnu" . "https://elpa.gnu.org/packages/"))
|
||||
(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/"))
|
||||
(package-initialize)
|
||||
|
||||
(unless (package-installed-p 'use-package)
|
||||
(package-refresh-contents)
|
||||
(package-install 'use-package))
|
||||
(eval-and-compile
|
||||
(setq use-package-always-ensure t
|
||||
use-package-expand-minimally t))
|
||||
|
||||
(use-package org
|
||||
:ensure org-plus-contrib)
|
||||
(use-package ox-rss
|
||||
:after org)
|
||||
|
||||
(require 'org)
|
||||
(require 'ox-html)
|
||||
#+end_src
|
||||
=use-package= is maybe a little heavier than what I need for package management in a script like this, but =ox-rss=, the package used to generate my RSS feed was a challenge to get installed correctly. It must be installed *after* =org= is set up.
|
||||
|
||||
The core of publishing =.org= files to =.html= is the =org-publish-project-alist= variable. It allows me to define different sources for the site, each with different configuration options.
|
||||
|
||||
The first source contains the core of my website. Most of the pages outside of my blog appear here. These all reside in the same repository as my website build scripts. Also note the =:html-preamble= and =:html-head= fields. The ability to include my navigation bar and style-sheet in every file automatically made things so much nicer for me.
|
||||
#+begin_src emacs-lisp
|
||||
("org-core"
|
||||
:base-directory "~/website/"
|
||||
:base-extension "org"
|
||||
:publishing-directory "~/public_html/"
|
||||
:recursive t
|
||||
:publishing-function org-html-publish-to-html
|
||||
:with-toc nil
|
||||
:headline-levels 4
|
||||
:section-numbers nil
|
||||
:html-head "<link rel='stylesheet' href='/css/stylesheet.css' type='text/css'/>"
|
||||
:html-preamble "<div class='topnav'><a href='/'>Home</a><a href='/projects.html'>Projects</a><a href='/blog'>Blog</a><a href='/config.html'>Dotfiles</a><a href='/about.html'>About Me</a><a href='/rss.xml'>RSS</a></div>"
|
||||
:html-postamble nil)
|
||||
#+end_src
|
||||
|
||||
Also in this repository, I have my styling and images (at this point it's literally a single =.css= file) which is included from the second entry.
|
||||
#+begin_src emacs-lisp
|
||||
("org-static"
|
||||
:base-directory "~/website/"
|
||||
:base-extension "css\\|js\\|png\\|jpg\\|gif\\|pdf\\|mp3\\|ogg\\|swf"
|
||||
:publishing-directory "~/public_html"
|
||||
:recursive t
|
||||
:publishing-function org-publish-attachment)
|
||||
#+end_src
|
||||
|
||||
The blog generation was something of an abuse of Org-Mode's publishing features. It includes the ability to generate a sitemap automatically. I don't particularly need (or want) a true sitemap though. This entry is largely the same as my core website configuration, but I have it generate my sitemap into a file called =index.org= which is then compiled into HTML like every other page allowing me to have [[https://jjanzen.ca/blog]] point to a list of every page in my blog repository and have that list update automatically.
|
||||
#+begin_src emacs-lisp
|
||||
("org-blog"
|
||||
:base-directory "~/blog/"
|
||||
:base-extension "org"
|
||||
:publishing-directory "~/public_html/blog"
|
||||
:recursive t
|
||||
:publishing-function org-html-publish-to-html
|
||||
:with-toc nil
|
||||
:with-properties t
|
||||
:with-date t
|
||||
:with-timestamps nil
|
||||
:headline-levels 4
|
||||
:section-numbers nil
|
||||
:html-head "<link rel='stylesheet' href='/css/stylesheet.css' type='text/css'/>"
|
||||
:html-preamble "<div class='topnav'><a href='/'>Home</a><a href='/projects.html'>Projects</a><a href='/blog'>Blog</a><a href='/config.html'>Dotfiles</a><a href='/about.html'>About Me</a><a href='/rss.xml'>RSS</a></div>"
|
||||
:html-postamble nil
|
||||
:auto-sitemap t
|
||||
:sitemap-filename "index.org"
|
||||
:sitemap-format-entry my/org-publish-org-sitemap-format
|
||||
:sitemap-sort-files anti-chronologically
|
||||
:sitemap-title "Blog")
|
||||
#+end_src
|
||||
|
||||
The default formatting for that list just shows the title, but I do think it's valuable to also list the date for blog posts. To remedy this, I define my own sitemap format function here.
|
||||
#+begin_src emacs-lisp
|
||||
(defun my/org-publish-org-sitemap-format (entry style project)
|
||||
(cond ((not (directory-name-p entry))
|
||||
(format "(%s) [[file:blog/%s][%s]]\n"
|
||||
(format-time-string "%Y-%m-%d"
|
||||
(org-publish-find-date entry project))
|
||||
entry
|
||||
(org-publish-find-title entry project)))))
|
||||
#+end_src
|
||||
|
||||
The most challenging portion to implement was the RSS feed though. This was a feature I wanted and never bothered to implement with the pure HTML setup. With the complete refactor though, I figured it would be nice to have an automatically generating RSS feed. The issue is that =ox-rss=, the package used for generating RSS feeds only works on single files. The blog isn't one file though so we need to combine all the files into one and abuse sitemaps once again to create an RSS feed. I found [[https://writepermission.com/org-blogging-rss-feed.html][this]] blog post helpful in implementing the RSS feed. I ended up using the same configuration for it as [[https://nicolasknoebber.com/posts/blogging-with-emacs-and-org.html][this]] blog though because I found some functions in the first one didn't seem to work correctly anymore.
|
||||
|
||||
Finally, by using Org-Mode to generate the site, I was able to include by system configuration files in my site. I use Doom Emacs literate configuration to automatically generate all of my configuration files and since this is just a =.org= file, I can also compile that into HTML to easily display.
|
||||
#+begin_src emacs-lisp
|
||||
("org-config"
|
||||
:base-directory "~/.doom.d/"
|
||||
:base-extension "org"
|
||||
:html-head "<link rel='stylesheet' href='/css/stylesheet.css' type='text/css'/>"
|
||||
:html-preamble "<div class='topnav'><a href='/'>Home</a><a href='/projects.html'>Projects</a><a href='/blog'>Blog</a><a href='/config.html'>Dotfiles</a><a href='/about.html'>About Me</a><a href='/rss.xml'>RSS</a></div>"
|
||||
:html-postamble nil
|
||||
:publishing-directory "~/public_html"
|
||||
:publishing-function org-html-publish-to-html
|
||||
:headline-levels 4
|
||||
:auto-preamble t)
|
||||
#+end_src
|
||||
|
||||
Finally, I just publish it to HTML with
|
||||
#+begin_src emacs-lisp
|
||||
(org-publish-all t)
|
||||
#+end_src
|
||||
|
||||
Although this was a little bit of a challenge to setup, I appreciate that I now effectively have my own highly-configurable static-site generator and no longer have to write all of this in raw HTML. It makes for a much more comfortable experience and should be stable enough that I shouldn't have to deal with debugging weird =elisp= issues for a while.
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
#+title: Talking About The Asadas (2020)
|
||||
#+author: Jacob Janzen
|
||||
#+date: <2024-03-22 Sun>
|
||||
|
||||
I finally got around to re-watching this movie last night after watching it on a plane one time. It really stuck with me because of a scene near the end that made me Feel Things. I usually don't really talk about movies all that much but I felt the need to discuss this one.
|
||||
|
||||
On re-watch, the film did not hold up as well as I remembered. I still enjoyed it, but I found the plot and pacing to be somewhat odd. It felt like two disjoint movies, one about a struggling photographer trying to follow his dreams and one about trying to find hope in the aftermath of the 2011 Tōhoku earthquake. I think both stories worked well on their own, but I think that they failed to transition effectively between the two.
|
||||
|
||||
The first half of the movie shows Masashi taking up photography after seeing his father gifts him the old family camera. He is very interested in photography as a child before becoming directionless after graduating from his university with a prestigious award for a family photo he took. Years later, he becomes inspired once again and begins taking many family photos, each with funny themes where the family pretends to be in various different scenarios such as pretending they were all on a car racing team or that they were a family of gangsters. He publishes a book of this photography and initially has little success before winning an award for it and achieving a lot of success. I found this section to be very poorly paced. He pretty quickly goes from his book being an abject failure to a huge success. It feels like it was missing something, but the family photos were cute and fun and the struggles of wanting to do something, but never doing anything to satisfy that urge to create is immensely relatable to me.
|
||||
|
||||
The second half of the movie was significantly more emotionally stimulating and I think that it deals with the devastation of such a natural disaster very well. In particular, I appreciated how it dealt with a young child who had lost her father in the earthquake. After his death she was very distraught because she could not find any photos of her father in the collection of photos that protagonist Masashi Asada and other volunteers had helped salvage. At the same time, Masashi's father was having a medical emergency and his family thought he may pass away. Similarly, there were few photos of him before Masashi took up photography as his father was always the one behind the camera. Realizing this, Masashi quickly comes back to Tōhoku to take a family photo for that child. Wearing the father's old watch to take a photo, he made the family realize that their father was actually in every single one of those photos, just behind the camera instead of in front.
|
||||
|
||||
The movie ends with a fake-out about the father's death. It shows the family surrounding him as he lays down as though dead. His wife falls forward to sob, and then you hear a camera shutter and the family all start laughing. This was just another of Masashi's fun themed family photos. The scene gave me a good chuckle.
|
||||
|
||||
Overall, I found the movie to be very cute and I found that it did a great job of dealing with the tragedy of natural disaster. I really wish that it did a better job of pacing the first half and tying the themes of the first half to the second half. It felt disjointed and that is disappointing to me because I think it could have been a really fantastic movie if those issues were worked through with a little more script editing.
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
#+title: Uji Matcha Tempaku Imperial Ceremonial Grade
|
||||
#+date: <2024-05-16 Thu>
|
||||
|
||||
Finally, I have received new matcha after saving it all winter for when I could obtain it with fresh spring sencha to save on shipping costs.
|
||||
|
||||
This tea came in a cute washi paper can, which was a nice touch. Absolutely no bitterness or unpleasant flavours. Plenty of sweetness and umami. This is just a perfect matcha for a matcha without the need for milk or other additives. This tea is really good and I will order it again in the future.
|
||||
|
||||
Rating: 10/10
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
#+title: White2Tea 2020 Old Reliable
|
||||
|
||||
I received this tea as a part of an extra sample with an order. The tea is incredibly smooth with a fairly classic shou flavour and a soupy mouthfeel. It potentially needed a little more rest before drinking as it was still a little on the stinky side. That did not affect the taste in any negative way though. Overall, a pretty enjoyable tea.
|
||||
|
||||
7/10
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
#+title: White2Tea 2021 Hotline Space Coyote
|
||||
#+author: Jacob Janzen
|
||||
#+date: <2024-03-21 Sun>
|
||||
|
||||
This is a 3-year-old raw pu'er in a 200 gram cake.
|
||||
|
||||
This one is really fantastic. The pale yellow liquor has a milky mouthfeel that gives notes of fresh fruit, apricot in particular.
|
||||
|
||||
Rating 9/10
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
#+title: White2Tea 2022 941
|
||||
#+author: Jacob Janzen
|
||||
#+date: <2024-04-19 Fri>
|
||||
|
||||
Today I got around to starting my 2022 941 cake. This is a particularly green pu'er, the leaves after being broken off the cake look like green leaves and even have visible trichomes. The scent of the leaves is reminiscent of typical young pu'er but a little more vegetal than usual.
|
||||
|
||||
The flavour is not particularly complex, but quite pleasant. The yellow-green liquor tastes quite vegetal with a very mild bitterness. The tannin content seems to be rather low as I get absolutely no dryness from it. It's a very easy tea to enjoy, but it's not going to provide a particularly interesting experience. Makes for a good daily drinker.
|
||||
|
||||
Rating: 7/10
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
#+title: White2Tea 2022 Boat Captain
|
||||
#+author: Jacob Janzen
|
||||
#+date: <2024-03-17 Sun>
|
||||
|
||||
This is a 2-year-old raw pu'er in a 200 gram cake.
|
||||
|
||||
The liquor is a yellowy-orange colour, with a thick, soupy texture. The early steeps were very smooth, while later ones were steeps were drier with a more tannic mouthfeel. It has a smoky, leather flavour that settles into a malty sweetness.
|
||||
|
||||
Rating 8/10
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
#+title: White2Tea 2023 En Passant
|
||||
#+author: Jacob Janzen
|
||||
#+date: <2024-04-21 Sun>
|
||||
|
||||
This tea is a really affordable small-batch shou pu'er from White2Tea. The store page describes it as a little fresh in 2023 and I will concede that it is definitely a little too fresh even in early 2024. A friend described this tea as "it smells like ass, but it's so smooth" and that is probably the best description I could give to it. At this point, the smells of wet piling are starting to recede, but the unbrewed leaves still have that distinct pile smell.
|
||||
|
||||
Despite the fact that it doesn't smell too great (it's not /that/ bad, it just doesn't smell /nice/ like other teas might), the flavour is fantastic. It's got an earthy, mossy taste that might remind one of mushrooms and the black liquor that the leaves produce goes down your throat with ease. Absolutely no bitterness even when brewing for long periods of time.
|
||||
|
||||
Rating 6/10
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
#+title: White2Tea 2023 Lumber Slut
|
||||
#+author: Jacob Janzen
|
||||
#+date: <2024-03-25 Sun>
|
||||
|
||||
This tea is a 1-year-old ripe pu'er. It came in a 200 gram cake.
|
||||
|
||||
The liquor is black and smells like wood. It has a pleasant, smooth woody flavour. Not at all complex, but still enjoyable. I like to brew this one by putting an unmeasured chunk of leaves at the bottom of my thermos and fill it with boiling water. It doesn't seem to oversteep no matter what I do to it. Good daily drinker.
|
||||
|
||||
Rating 8/10
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
#+title: White2Tea 2024 Bamboo Green
|
||||
#+author: Jacob Janzen
|
||||
#+date: <2024-04-25 Thu>
|
||||
The first green teas of the year have finally arrived. I have missed green tea so much, but I can't justify buying it during the winter as green tea is particularly prone to getting stale and so I'd rather spend that money on teas that can survive for a longer period of time while remaining fresh enough to fully enjoy.
|
||||
|
||||
The pale yellow-green liquor provides a fantastic blend of umami and nutty flavours. The visual appearance and flavour of this tea heavily remind me of Longjing tea. I really like this one, but don't have a whole lot to say about it. It's just a great tea.
|
||||
|
||||
Rating 9/10
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
#+title: White2Tea 2024 Millstone
|
||||
#+date: <2025-01-05 Sun>
|
||||
It's been a while since I've tried a new tea. I've been digging through my backlog for a while now. Today I finally had the chance to dig into something new. Today was a 2024 sheng from White2Tea which I got in a pack of single-serving 7g balls.
|
||||
|
||||
This tea brews to a beautiful orange colour. I can't say the liquor has any other particularly interesting qualities though; I can only really describe the mouthfeel as average. The tea has low astringency and doesn't seem to suffer from any bitterness which makes for a very pleasant, if uninteresting tea.
|
||||
|
||||
6/10
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
#+title: White2Tea Daily Duck Shit
|
||||
#+author: Jacob Janzen
|
||||
#+date: <2024-03-19 Sun>
|
||||
|
||||
I won't lie; I initially bought this one for the funny name, but it's actually a pretty decent inexpensive tea. Normally, roasted oolongs aren't my favourite, but I do enjoy some good duck shit.
|
||||
|
||||
The liquor is a pale orange with a milky texture. The liquor is a pale orange with a milky mouthfeel. The flavour is somewhat nutty but also evokes a sense of dried fruit. Dates and almonds are the most prominent flavours that I taste in it.
|
||||
|
||||
Rating: 7/10
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
#+title: White2Tea Ganlu
|
||||
#+author: Jacob Janzen
|
||||
#+date: <2024-04-29 Mon>
|
||||
|
||||
I don't really like this one to be honest. It just doesn't taste good at all to me. I suppose there's a hint of artichoke which is pleasant, but that flavour gets overpowered by a sense of sourness. I ended up pouring this one out halfway through my first cup.
|
||||
|
||||
Rating 2/10
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
#+title: Yunnan Sourcing 2015 Ye Zhu Tang
|
||||
#+date: <2024-06-26 Tue>
|
||||
|
||||
Today I enjoyed a pleasant 9-year-old sheng pu'er from Yunnan Sourcing. I am beginning to find that 8 or 9 years is when a pu'er starts to become really good. I certainly don't mind young pu'ers. The bitterness can be enjoyable, but the older aged teas start gaining a sense of smooth sweetness that is even more enjoyable.
|
||||
|
||||
This tea is smooth, giving a nice lingering sweetness. It is strongly astringent, but not unpleasantly so. The scent is floral, but the tea gives a more fruity flavour than the scent would suggest.
|
||||
|
||||
Rating: 8/10
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
#+title: Yunnan Sourcing 2016 Xiao Hu Sai Village
|
||||
#+date: <2024-06-03 Mon>
|
||||
|
||||
This tea came as a 25 gram sample with Yunnan Sourcing's Raw Pu-erh "B-Sides" sampler.
|
||||
|
||||
It's been a while since I've had a sheng pu'er. The smell of a raw pu'er always makes me feel good. I think it helps that I put a little more ritual into this kind of tea. I almost always do it in my clay teapot and prepping is a little more involved.
|
||||
|
||||
The tea forms a darker yellow coloured fluid. Thick, soupy. I find a lovely sweetness in it, reminiscent of dates. It seems relatively easy to brew as far as raw pu'er goes. I enjoy it.
|
||||
|
||||
Rating: 8/10
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
#+title: Yunnan Sourcing 2022 Peerless
|
||||
#+author: Jacob Janzen
|
||||
#+date: <2024-04-22 Mon>
|
||||
|
||||
This is the first tea in the Yunnan Sourcing's ripe pu'er sampler. Along with this order, I got a new gaiwan and tea cup which have more appropriate sizes for my needs (about 90 ml each instead of a 150 ml gaiwan and 40 ml teacups) which I am rather excited about.
|
||||
|
||||
The tea has a noticeable (dark) chocolatey flavour that settles into a pleasant sweetness. The mouthfeel is thick and soupy. I like this one. An all-around enjoyable tea.
|
||||
|
||||
Rating: 9/10
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
#+title: Yunnan Sourcing 2024 Green Mark Dragon
|
||||
#+author: Jacob Janzen
|
||||
#+date: <2024-04-23 Tue>
|
||||
|
||||
I received this mix of ripe and raw pu'er as a free sample in my most recent Yunnan Sourcing order. The mixture works really well. I noticed that the ripe pu'er reduces the astringency and bitterness of the raw and in turn, the raw gives the ripe a sweeter, more fresh taste. I think the raw pu'er flavour is a little stronger than the ripe (which is fine by me since I prefer raw anyways).
|
||||
|
||||
The liquor is a dark brown, probably closer in colour to a typical ripe pu'er than a raw pu'er. The flavour is gives notes of wild berries and mushrooms. The lack of astringency and bitterness makes it pretty easy to brew and I'd definitely recommend it to others.
|
||||
|
||||
Rating 9/10
|
||||
Loading…
Add table
Reference in a new issue