8 files changed, 312 insertions, 47 deletions
diff --git a/beam-funnies.sh b/beam-funnies.sh
index 3f16da6..7ab7a40 100755
--- a/beam-funnies.sh
+++ b/beam-funnies.sh
@@ -6,7 +6,7 @@ magick mogrify -format JPEG *.webp
 rm *webp
 
 # and beam them up scotty
-rsync -rtvzP ~/funnies/ mms@michal.sapka.me:/var/www/htdocs/funnies/2023/$(date +%F)
+rsync -rtvzP ~/funnies/ mms@michal.sapka.me:/var/www/htdocs/funnies/2024/$(date +%F)
 
 # clean up
 rm *
diff --git a/content-org/articles.org b/content-org/articles.org
index 79ce52a..2cd11ca 100644
--- a/content-org/articles.org
+++ b/content-org/articles.org
@@ -1,4 +1,4 @@
-#+TITLE: Michał Sapka's Emacs Config
+#+TITLE: Articles
 #+AUTHOR: Michał Sapka
 #+URL: https://michal.sapka.me
 #+STARTUP: show2levels indent logdone
diff --git a/content-org/blog.org b/content-org/blog.org
index ba3dd8b..b78b4bf 100644
--- a/content-org/blog.org
+++ b/content-org/blog.org
@@ -1,4 +1,4 @@
-#+TITLE: Michał Sapka's Emacs Config
+#+TITLE: Blog
 #+AUTHOR: Michał Sapka
 #+URL: https://michal.sapka.me/star-trek
 #+STARTUP: show2levels indent logdone
diff --git a/content-org/links.org b/content-org/links.org
index 8cf9230..b7f42e8 100644
--- a/content-org/links.org
+++ b/content-org/links.org
@@ -20,3 +20,7 @@
 * MacOS essentials
 * Text editors
 * iOS apps
+* DRM-free Digital music stores
+- [[https://bandcamp.com/][Bandcamp]]
+- [[https://www.hdtracks.com/][HDTracks]]
+  
diff --git a/content-org/me.org b/content-org/me.org
new file mode 100644
index 0000000..149919e
--- /dev/null
+++ b/content-org/me.org
@@ -0,0 +1,208 @@
+#+TITLE: me
+#+AUTHOR: Michał Sapka
+#+URL: https://michal.sapka.me
+#+STARTUP: show2levels indent logdone
+
+#+HUGO_BASE_DIR: ~/ghq/vcs.sapka.me/michal-sapka-me/
+#+HUGO_WEIGHT: auto
+#+HUGO_SECTION: me
+
+* Now
+:PROPERTIES:
+:EXPORT_FILE_NAME: now
+:EXPORT_HUGO_CUSTOM_FRONT_MATTER: abstract What am up to?
+:END:
+
+The following is a short list of things I do /right now/.
+
+
+** Now
+*** Watching
+- [[https://jujutsukaisen.jp/][Jujutsu Kaisen]] season 2 [since Jan 2024]
+- [[https://www.startrek.com/en-un/series/star-trek-voyager][Star Trek Voyager]] season 5 [since since 2023-02-11; series since 2021-05-28]
+- [[https://web.archive.org/web/20020726125436/http://www.3rdrock.com/][3rd Rock from the Sun]] season 2 [since 2024-01-13; series since 2024-01-03]
+*** Playing
+- [[https://www.atlus.com/p5s/][Persona 5 Strikers]] [since Dec 2023]
+- [[https://www.nethack.org/][Nethack]] [since 2024-02-01]
+*** Reading
+- [[https://mwl.io/nonfiction/os#af3e][Absolute FreeBSD]] [since Dec 2023]
+
+
+#+begin_quote
+The hardest thing here is finding official websites.
+
+-- me
+#+end_quote
+
+
+* DONE Contact
+:PROPERTIES:
+:EXPORT_FILE_NAME: now
+:END:
+
+CLOSED: [2023-11-30 Fri 12:43]
+:PROPERTIES:
+:EXPORT_FILE_NAME: contact
+:EXPORT_HUGO_CUSTOM_FRONT_MATTER: abstract How to contact me?
+:END:
+
+** Contact
+
+
+I try not use social media except for YouTube. Therefore, you won't find me on Twitter, TikTok.
+
+**Email**: [[mailto:contact@michal.sapka.me][contact@michal.sapka.me]]
+**Mastodon**: [[https://emacs.ch/@ms][@mms@emacs.ch]]
+
+** GPG keys
+
+If you want, you can use my GPG key to validate signature (all emails from me should be signed) or to encrypt a message.
+You can find the key [here](/mms.gpg).
+
+Or you can import it directly
+
+#+begin_src shell
+curl -sL https://michal.sapka.me/mms.gpg | gpg --import
+#+end_src
+
+Log:
+- 2023-11-30: key *72AC6E152B4D98DE4CEF2CDA7E97D88147ED66E7* created
+
+* DONE Hardware and software I use
+CLOSED: [2023-11-26 Fri 12:43]
+:PROPERTIES:
+:EXPORT_FILE_NAME: uses
+:EXPORT_HUGO_CUSTOM_FRONT_MATTER: abstract What is my geat/setup?
+:END:
+
+This is list of hardware and software I use. 
+Note, that I have two PCs (work MacBook and personal ThinkPad).
+I try to address this when applicable.
+
+
+** Hardware
+
+*** Computer
+
+My company provides (and forces me to use) a 2021 16-inch MacBook Pro with an M1 Pro and 32 GB of memory.
+It's as everyone says: crazy fast, dead silent and heavy as a horse.
+It's also much too expensive and impossible to repair.
+I simply can not recommend it due to the price - both the purchase and in case of any problems.
+M1 may be fast, but the downside is the level of integration. 
+You can not replace anything, the CPU, GPU, cache, memory and spying stuff is a single substance.
+I am afraid that this is the future of personal computing, and I am not pleased.
+
+
+My personal machine is a 15,6'' ThinkPad Extreme, gen 2. 
+It's equipped with Intel i5-9300 8 core @ 4 1GHz and has 32 GB of memory.
+Furthermore, It has two GPUs: UHD Graphics 630 and NVIDIA GeForce GTX 1650 Mobile / Max-Q.
+It would be a perfect machine if it wasn't for the NVIDIA.
+It's the only way to achieve monitor output, so I am forced to use it.
+Unfortunately, the support for Linux is bad and for BSD it's abysmal.
+The battery is drained in an instant, the computer overheats, and yet I don't game.
+Luckily, the drivers exist for FreeBSD, but OpenBSD is out the question due to licensing issues.
+Perfect if you use Windows or PoP_OS. Otherwise, I'd reconsider.
+
+*** Phone
+
+Not much to say, as phones are boring. 
+I use iPhone 13 mini, and I'll try to stick to it as long as possible.
+I try (and fail to) not use phone at all, so I don't need the horsepower.
+I don't install apps because why would I?
+The primary use case is YouTube on the john and contactless payments.
+
+I am eying e-ink devices, so if this one breaks, then who knows?
+
+*** Computer and pointing device
+
+I found love in Charybdis from Bastard Keyboard. 
+You can read my [review here](/2023/charybdis/).
+
+Highly recommended!
+
+*** Monitor
+
+Dell P2727Q.
+
+It's a 27-inch 4k monitor with USB-C power delivery, USB hub and an Ethernet.
+Works as advertised.
+
+*** Headphones
+
+Sennheiser 6xx.
+I can not recommend them enough.
+Light, comfortable and sound just good enough for me not to look at audiophile headphones.
+They are also wired, which is a huge plus.
+
+Headphone amplifier very recommended - I use Topping A50s.
+
+*** Speakers
+
+Ruarkaudio MR1. 
+I like those! 
+I have them connected to computer via line-in and to a Wiim mini streamer using a digital connection.
+They are small speakers, so nothing to write home about - but for their size they work great.
+
+However, I bought them for their look.
+Full wife approval factor
+
+** Software
+
+*** Operating system
+
+For work, I use macOS. 
+I try to keep on the old version as long as IT allows, as each new iteration comes with new problems.
+Have you used the System Preferences recently?
+If this was a hobby project, sure.
+But this is not, and at this point I am afraid to ask how it even was approved by QA.
+
+On my personal laptop I use FreeBSD.
+You can follow mu BSD journey [here](/category/bsd/).
+
+*** Shell
+
+I use Z Shell.
+I tried to move to Korn Shell, but I still need to find time for this migration.
+
+*** Window manager
+
+DWM. 
+I don't have much personalization there yet, so nothing too interesting.
+
+On MacOS I use Yabai, which adds tiling capabilities.
+However, DWM, with it's tagging, beats virtual desktop by a mile.
+
+*** Web browser
+
+Firefox. 
+It is a bit too corporate with strange things the foundation does, but there is no alternative.
+
+*** Text editor
+
+Emacs with Evil mode.
+
+*** Version manager
+
+I'm a Ruby dev by trade, so I use rbenv.
+I tried asdf and loved it, but rbenv is already too established in work, that I gave up the fight.
+
+*** Music player
+
+MPD, and sometimes YouTube.
+
+*** Email client
+
+Emacs and Notmuch
+
+*** RSS reader
+
+Emacs and Elfeed
+
+*** Password Manager.
+
+Bitwarden. It does the job.
+
+*** Spellcheck
+
+I use LanguageTool via ltex-ls. 
+The checker uses ngram data provides by LanguageTool.
diff --git a/content/me/now.md b/content/me/now.md
new file mode 100644
index 0000000..9904a59
--- /dev/null
+++ b/content/me/now.md
@@ -0,0 +1,34 @@
++++
+title = "Now"
+author = ["Michał Sapka"]
+draft = false
+weight = 1001
+abstract = "What am up to?"
++++
+
+The following is a short list of things I do _right now_.
+
+
+## Now {#now}
+
+
+### Watching {#watching}
+
+-   [Jujutsu Kaisen](https://jujutsukaisen.jp/) season 2 [since Jan 2024]
+-   [Star Trek Voyager](https://www.startrek.com/en-un/series/star-trek-voyager) season 5 [since since 2023-02-11; series since 2021-05-28]
+-   [3rd Rock from the Sun](https://web.archive.org/web/20020726125436/http://www.3rdrock.com/) season 2 [since 2024-01-13; series since 2024-01-03]
+
+
+### Playing {#playing}
+
+-   [Persona 5 Strikers](https://www.atlus.com/p5s/) [since Dec 2023]
+-   [Nethack](https://www.nethack.org/) [since 2024-02-01]
+
+
+### Reading {#reading}
+
+-   [Absolute FreeBSD](https://mwl.io/nonfiction/os#af3e) [since Dec 2023]
+
+> The hardest thing here is finding official websites.
+>
+> -- me
diff --git a/content/me/uses.md b/content/me/uses.md
index 1d298b9..448e37b 100644
--- a/content/me/uses.md
+++ b/content/me/uses.md
@@ -1,30 +1,31 @@
----
-title: "Hardware and software I use"
-category: 
-- me
-- update
-abstract: My personal setup
-date: 2023-11-26T14:49:16+01:00
-draft: false
----
-This is list of hardware and software I use. 
++++
+title = "Hardware and software I use"
+author = ["Michał Sapka"]
+date = 2023-11-26T12:43:00+01:00
+draft = false
+weight = 1003
+abstract = "What is my geat/setup?"
++++
+
+This is list of hardware and software I use.
 Note, that I have two PCs (work MacBook and personal ThinkPad).
 I try to address this when applicable.
 
-## Hardware
 
-### Computer
+## Hardware {#hardware}
+
+
+### Computer {#computer}
 
 My company provides (and forces me to use) a 2021 16-inch MacBook Pro with an M1 Pro and 32 GB of memory.
 It's as everyone says: crazy fast, dead silent and heavy as a horse.
 It's also much too expensive and impossible to repair.
 I simply can not recommend it due to the price - both the purchase and in case of any problems.
-M1 may be fast, but the downside is the level of integration. 
+M1 may be fast, but the downside is the level of integration.
 You can not replace anything, the CPU, GPU, cache, memory and spying stuff is a single substance.
 I am afraid that this is the future of personal computing, and I am not pleased.
 
-
-My personal machine is a 15,6'' ThinkPad Extreme, gen 2. 
+My personal machine is a 15,6'' ThinkPad Extreme, gen 2.
 It's equipped with Intel i5-9300 8 core @ 4 1GHz and has 32 GB of memory.
 Furthermore, It has two GPUs: UHD Graphics 630 and NVIDIA GeForce GTX 1650 Mobile / Max-Q.
 It would be a perfect machine if it wasn't for the NVIDIA.
@@ -34,9 +35,10 @@ The battery is drained in an instant, the computer overheats, and yet I don't ga
 Luckily, the drivers exist for FreeBSD, but OpenBSD is out the question due to licensing issues.
 Perfect if you use Windows or PoP_OS. Otherwise, I'd reconsider.
 
-### Phone
 
-Not much to say, as phones are boring. 
+### Phone {#phone}
+
+Not much to say, as phones are boring.
 I use iPhone 13 mini, and I'll try to stick to it as long as possible.
 I try (and fail to) not use phone at all, so I don't need the horsepower.
 I don't install apps because why would I?
@@ -44,21 +46,24 @@ The primary use case is YouTube on the john and contactless payments.
 
 I am eying e-ink devices, so if this one breaks, then who knows?
 
-### Computer and pointing device
 
-I found love in Charybdis from Bastard Keyboard. 
-You can read my [review here](/2023/charybdis/).
+### Computer and pointing device {#computer-and-pointing-device}
+
+I found love in Charybdis from Bastard Keyboard.
+You can read my [review here](_2023/charybdis_).
 
 Highly recommended!
 
-### Monitor
+
+### Monitor {#monitor}
 
 Dell P2727Q.
 
 It's a 27-inch 4k monitor with USB-C power delivery, USB hub and an Ethernet.
 Works as advertised.
 
-### Headphones
+
+### Headphones {#headphones}
 
 Sennheiser 6xx.
 I can not recommend them enough.
@@ -67,73 +72,86 @@ They are also wired, which is a huge plus.
 
 Headphone amplifier very recommended - I use Topping A50s.
 
-### Speakers
 
-Ruarkaudio MR1. 
-I like those! 
+### Speakers {#speakers}
+
+Ruarkaudio MR1.
+I like those!
 I have them connected to computer via line-in and to a Wiim mini streamer using a digital connection.
 They are small speakers, so nothing to write home about - but for their size they work great.
 
 However, I bought them for their look.
 Full wife approval factor
 
-## Software
 
-## Operating system
+## Software {#software}
+
+
+### Operating system {#operating-system}
 
-For work, I use macOS. 
+For work, I use macOS.
 I try to keep on the old version as long as IT allows, as each new iteration comes with new problems.
 Have you used the System Preferences recently?
 If this was a hobby project, sure.
 But this is not, and at this point I am afraid to ask how it even was approved by QA.
 
 On my personal laptop I use FreeBSD.
-You can follow mu BSD journey [here](/category/bsd/).
+You can follow mu BSD journey [here](_category/bsd_).
 
-## Shell
+
+### Shell {#shell}
 
 I use Z Shell.
 I tried to move to Korn Shell, but I still need to find time for this migration.
 
-## Window manager
 
-DWM. 
+### Window manager {#window-manager}
+
+DWM.
 I don't have much personalization there yet, so nothing too interesting.
 
 On MacOS I use Yabai, which adds tiling capabilities.
 However, DWM, with it's tagging, beats virtual desktop by a mile.
 
-## Web browser
 
-Firefox. 
+### Web browser {#web-browser}
+
+Firefox.
 It is a bit too corporate with strange things the foundation does, but there is no alternative.
 
-## Text editor
+
+### Text editor {#text-editor}
 
 Emacs with Evil mode.
 
-## Version manager
+
+### Version manager {#version-manager}
 
 I'm a Ruby dev by trade, so I use rbenv.
 I tried asdf and loved it, but rbenv is already too established in work, that I gave up the fight.
 
-## Music player
+
+### Music player {#music-player}
 
 MPD, and sometimes YouTube.
 
-## Email client
+
+### Email client {#email-client}
 
 Emacs and Notmuch
 
-## RSS reader
+
+### RSS reader {#rss-reader}
 
 Emacs and Elfeed
 
-## Password Manager.
+
+### Password Manager. {#password-manager-dot}
 
 Bitwarden. It does the job.
 
-## Spellcheck
 
-I use LanguageTool via ltex-ls. 
+### Spellcheck {#spellcheck}
+
+I use LanguageTool via ltex-ls.
 The checker uses ngram data provides by LanguageTool.
diff --git a/layouts/_default/index.html b/layouts/_default/index.html
index 7733a2c..0b620e6 100644
--- a/layouts/_default/index.html
+++ b/layouts/_default/index.html
@@ -7,7 +7,8 @@ Hey! I'm Michał Sapka, a computer programmer living in Kraków, Poland. This we
   <a href="/me/contact/">Contact</a> //
   <a href="/me/uses/">Uses<a> //
   <a href="/about/">About<a> //
-  <a href="/links/">Links<a>
+  <a href="/links/">Links<a> //
+  <a href="/me/now/">Now<a>
 </nav>
 <div>
   <a href="https://nonbot.org/pledged/view/9b37caf2-57c1-4934-9bea-69c54eb46452" target="_blank">
@@ -33,7 +34,7 @@ Hey! I'm Michał Sapka, a computer programmer living in Kraków, Poland. This we
   <P><a class="sec-link" href="/emacs/"><b>C-X Emacs</b>: this is my Emacs. There are many like it, but this one is mine. My Emacs is my best friend. It is my life.</a> </p>
   <P><a class="sec-link" href="/star-trek/"><b>Star Trek fan site</b>: my little shrine to the greatest american Sci-Fi that has ever graced our screens.</a> </p>
   <P><a class="sec-link" href="/funnies/"><b>Funnies</b>: A small, curated collection of things I found funny or ammusing.</a> </p>
-  <p><a class="sec-link" href="/vcs/git/"><b>Version control system</b> : My little code repository. I don't expect to cooporate on any of those, so it's just stagit.</a></p>
+  <p><a class="sec-link" href="/git/"><b>Version control system</b> : My little code repository. I don't expect to cooporate on any of those, so it's just stagit.</a></p>
   <p><a class="sec-link" href="/site/"><b>Site info</b> : you can find site updates, metrics, statics, and legal thingies here.</a></p>
 </nav>