various

This reverts commit 25db84eb15.

config.toml

@@ -1,5 +1,5 @@
 # The URL the site will be built for
-base_url = "https://cherrykitten.dev"
+base_url = "/"
 title = "CherryKitten"
 
 compile_sass = true
@@ -27,15 +27,13 @@ highlight_theme = "rosepine"
 logo_text = "CherryKitten"
 
 menu_items = [
-    {name = "Home", url = "$BASE_URL"},
+    {name = "Home", url = "/"},
 
-    {name = "About me", url = "$BASE_URL/about"},
+    {name = "Blog", url = "/blog"},
 
-    {name = "Blog", url = "$BASE_URL/blog"},
+    {name = "CV", url = "/cv"},
 
-    {name = "CV", url = "$BASE_URL/cv"},
-
-    {name = "Contact", url = "$BASE_URL/contact"},
+    {name = "Contact", url = "/contact"},
 ]
 
 page_titles = "combined"

content/blog/birds/index.md

@@ -90,10 +90,10 @@ And remember, All Crows Are Beautiful, All Cops Are Bastards, and if you see a S
 
 Thank you for reading through all this. As a "thank you"-treat, here are some photos of my beautiful bird friends :3
 
-![Bill, a black crow, sitting on top of a railing with water in the background.](/blog-assets/birds/bill.jpg)
+![Bill, a black crow, sitting on top of a railing with water in the background.](bill.jpg)
 
-![A pigeon sitting on top of my paw, with a peanut in its beak.](/blog-assets/birds/one-pidgey.jpg)
+![A pigeon sitting on top of my paw, with a peanut in its beak.](one-pidgey.jpg)
 
-![Two pigeons sitting on top of my paws, held in a small cup shape, and eating.](/blog-assets/birds/two-pidgeys.jpg)
+![Two pigeons sitting on top of my paws, held in a small cup shape, and eating.](two-pidgeys.jpg)
 
-![A majestic swan in water, glistening in the sun.](/blog-assets/birds/swan.png)
+![A majestic swan in water, glistening in the sun.](swan.png)

content/gallery/_index.md

@@ -0,0 +1,6 @@
++++
+paginate_by = 4
+sort_by = "date"
+template = "index.html"
+title = "Photo gallery"
++++

content/gallery/test-2/index.md

@@ -0,0 +1,10 @@
++++
+title = "Photo gallery Test photos number two"
+template = "gallery.html"
+date = 2024-06-07
++++
+
+Another few photos for testing my new gallery layout
+
+{{ gallery() }}
+

content/gallery/test/index.md

@@ -0,0 +1,10 @@
++++
+title = "Photo gallery Test photos"
+template = "gallery.html"
+date = 2024-06-06
++++
+
+All photos shot on a phone camera over the last years.
+
+{{ gallery() }}
+

content/home.md

@@ -14,6 +14,34 @@ Welcome to my little website :3
 
 </div>
 
+## About Me
+
+I'm Sammy. A queer catgirl who loves working with computers.
+My pronouns are It/Its. **Only** It/Its.
+I love learning new things, trying out new technologies and exploring the unknown.
+
+My first little steps into the world of IT already started as a little kitten.
+At age 12, I started learning LUA and the basics of server infrastructure
+to host Gameservers with custom code for a video game I had been playing.
+
+Since then, I have been continuously expanding my knowledge in both programming and administration.
+
+The linux command line is my cozy place. I selfhost almost everything.
+From cloud storage and media streaming to password management and social media. I also **love** Open Source. I like
+contributing to Open Source-Software and building my own tools to share with the world.
+
+I am experienced in Web-Development with HTML, CSS, and JavaScript, including Frameworks like React, Vue.js, and Svelte,
+as well as Backend-Development with NodeJS and Rust. I also know Python, and am generally able to learn new programming
+languages well and understand them quickly, even if I haven't used them much before. For example, I have also worked
+with PHP and Java Code in the past. Like I said, I love learning new things.
+
+Besides all that computer stuff, I love sewing, especially making cute plushies. I also try to spend at least as much
+time outside in nature as I do inside in front of a computer screen. I love being around water and wild animals, I love
+walking through
+forests and listening to all the beautiful birdsongs.
+
+Sometimes I try to make music and visual arts, it might not be much yet, but it's fun to play around with.
+
 ```Rust
 ///I like to meow
 fn main() {

content/pages/CV.md

@@ -4,22 +4,20 @@ template = "page.html"
 path = "cv"
 aliases = ["CV"]
 +++
+<div class="cvintro">
 
-{% section() %}
+<p>Samantha Yilmaz</p>
+<p>Pronouns: It/Its</p>
 
-## Technical Skills
+<div class="onlyprint">
+<p>1997-03-25</p>
+<p>https://Cherrykitten.dev</p>
+<p>https://github.com/cherrykitten</p>
+<p>contact@cherrykitten.dev</p>
 
-|                         |                                                                                                 |
-| ----------------------- | ----------------------------------------------------------------------------------------------- |
-| Linux                   | NixOS, Arch Linux, Debian, RHEL                                                                 |
-| Monitoring              | Grafana + (Prometheus, Telegraf, InfluxDB), VictoraMetrics, Zabbix                              |
-| DevOps / Automation     | Ansible, Terraform, Vagrant, Git, Jenkins                                                       |
-| Networking              | VPN (IPSec, Wireguard, OpenVPN), Routing (RIP, OSPF, BGP)                                              |
-| Virtualization          | KVM/QEMU, Proxmox, Docker                                                                       |
-| Security                | Server-Hardening, Security Best Practices, Vulnerability Assessment, Encryption, GPG, LUKS, TLS |
-| Scripting & Programming | Rust, Python, JavaScript, Shell, HTML, CSS, Nix                                                 |
+</div>
+</div>
 
-{% end %}
 
 {% section() %}
 
@@ -55,9 +53,11 @@ Software-Development in Rust and Python.
 - Ansible
 - Rust
 - Python
+- Matrix, Synapse
+- Monitoring (Grafana + VictoriaMetrics, Loki, Prometheus)
+- Vulnerability Scanning & Assessments
 
 {% end %}
-
 {% section() %}
 
 ### Linux & DevOps Engineer
@@ -130,3 +130,18 @@ Containers
 - Redmine
 
 {% end %}
+
+{% section() %}
+
+## Technical Skills
+
+|                         |                                                                                                 |
+| ----------------------- | ----------------------------------------------------------------------------------------------- |
+| Linux                   | NixOS, Arch Linux, Debian, RHEL                                                                 |
+| Monitoring              | Grafana + (Prometheus, Telegraf, InfluxDB), VictoraMetrics, Zabbix                              |
+| DevOps / Automation     | Ansible, Terraform, Vagrant, Git, Jenkins                                                       |
+| Networking              | VPN (IPSec, Wireguard, OpenVPN), Routing (RIP, OSPF, BGP)                                       |
+| Virtualization          | KVM/QEMU, Proxmox, Docker                                                                       |
+| Security                | Server-Hardening, Security Best Practices, Vulnerability Assessment, Encryption, GPG, LUKS, TLS |
+| Scripting & Programming | Rust, Python, JavaScript, Shell, HTML, CSS, Nix                                                 |
+{% end %}

content/pages/about_me.md

@@ -1,30 +0,0 @@
-+++
-title = "About Me"
-path = "about"
-+++
-
-I'm Sammy. A queer catgirl who loves working with computers.
-My pronouns are It/Its. **Only** It/Its.
-I love learning new things, trying out new technologies and exploring the unknown.
-
-My first little steps into the world of IT already started as a little kitten.
-At age 12, I started learning LUA and the basics of server infrastructure
-to host Gameservers with custom code for a video game I had been playing.
-
-Since then, I have been continuously expanding my knowledge in both programming and administration.
-
-The linux command line is my cozy place. I selfhost almost everything.
-From cloud storage and media streaming to password management and social media. I also **love** Open Source. I like
-contributing to Open Source-Software and building my own tools to share with the world.
-
-I am experienced in Web-Development with HTML, CSS, and JavaScript, including Frameworks like React, Vue.js, and Svelte,
-as well as Backend-Development with NodeJS and Rust. I also know Python, and am generally able to learn new programming
-languages well and understand them quickly, even if I haven't used them much before. For example, I have also worked
-with PHP and Java Code in the past. Like I said, I love learning new things.
-
-Besides all that computer stuff, I love sewing, especially making cute plushies. I also try to spend at least as much
-time outside in nature as I do inside in front of a computer screen. I love being around water and wild animals, I love
-walking through
-forests and listening to all the beautiful birdsongs.
-
-Sometimes I try to make music and visual arts, it might not be much yet, but it's fun to play around with.

content/pages/contact.md

@@ -1,12 +1,14 @@
 +++
-title = "Contact"
+title = "Contact & links"
 path = "contact"
 +++
 
 ## You can find me in the following places:
 
-- [@sammy@cherrykitten.gay](https://social.cherrykitten.dev/@sammy) - My personal GoToSocial instance, which you can follow from anywhere on the Fediverse!
+- [@sammy@cherrykitten.gay](https://cherrykitten.gay/@sammy) - My personal GoToSocial instance, which you can follow from anywhere on the Fediverse!
 - [@sammy:cherrykitten.dev](https://matrix.to/#/@sammy:cherrykitten.dev) - My Matrix account, also on my own personal homeserver and reachable from any other matrix server!
 - [contact@cherrykitten.dev](mailto:contact@cherrykitten.dev) - You could even e-mail me! My public key for encrypted e-mails can be found [here](../cherrykitten.pgp).
-- [GitHub](https://github.com/CherryKitten) - For code and stuff
-- [Codeberg](https://codeberg.org/CherryKitten) - For code and stuff but cooler than GitHub
+
+## Various links
+- [GitHub](https://github.com/CherryKitten) - For code and stuff, you can sponsor me there, most repos are mirrored from [my personal Forgejo instance](https://git.cherrykitten.dev)
+- [Last.fm](https://www.last.fm/user/cherrrykitty) - If you want to know what music I've been listening to

sass/gallery.scss

@@ -0,0 +1,26 @@
+@import "variables";
+
+.gallery {
+  display: grid;
+  grid-auto-flow: row dense;
+  grid-auto-rows: 1fr;
+  grid-template-columns: 1fr 1fr 1fr;
+  gap: 2em 2em;
+
+  img {
+    max-width: 100%;
+  }
+}
+
+.gallery:has(img:hover) img:not(:hover) {
+  filter: brightness(0.5) contrast(0.5);
+}
+
+@media not (prefers-reduced-motion) {
+  .gallery img:hover {
+    position: relative;
+    border: 2px ridge var(--accent);
+    transform: scale(1.7) translate(0, 25px);
+    z-index: 200;
+  }
+}

sass/main.scss

@@ -13,7 +13,11 @@ html {
 body {
   margin: 0;
   padding: 0;
-  font-family: Monaco, Consolas, Ubuntu Mono, monospace;
+  font-family:
+    Monaco,
+    Consolas,
+    Ubuntu Mono,
+    monospace;
   font-size: 1rem;
   line-height: 1.54;
   background-color: var(--background);
@@ -27,7 +31,8 @@ body {
     font-size: 1rem;
   }
 }
-h1, h2 {
+h1,
+h2 {
   display: flex;
   align-items: center;
   font-weight: 500;
@@ -35,7 +40,10 @@ h1, h2 {
   color: var(--accent2);
 }
 
-h3, h4, h5, h6 {
+h3,
+h4,
+h5,
+h6 {
   display: flex;
   align-items: center;
   font-weight: 400;
@@ -54,17 +62,17 @@ h2 {
   padding-bottom: 7px;
 }
 
-
 h3 {
   font-size: 1.2rem;
   font-weight: bolder;
 }
 
-h4, h5, h6 {
+h4,
+h5,
+h6 {
   font-size: 1.15rem;
 }
 
-
 a {
   color: inherit;
 }
@@ -142,16 +150,16 @@ code {
   background: var(--accent-alpha-20);
   padding: 1px 6px;
   margin: 0 2px;
-  font-size: .95rem;
+  font-size: 0.95rem;
 }
 
 pre {
   font-family: monospace;
   padding: 20px;
-  font-size: .95rem;
+  font-size: 0.95rem;
   overflow: auto;
-  border-top: 1px solid rgba(255, 255, 255, .1);
-  border-bottom: 1px solid rgba(255, 255, 255, .1);
+  border-top: 1px solid rgba(255, 255, 255, 0.1);
+  border-bottom: 1px solid rgba(255, 255, 255, 0.1);
 
   @media (max-width: $phone-max-width) {
     white-space: pre-wrap;
@@ -176,7 +184,7 @@ blockquote {
   }
 
   &:before {
-    content: '”';
+    content: "”";
     font-family: Georgia, serif;
     font-size: 3.875rem;
     position: absolute;
@@ -197,7 +205,7 @@ blockquote {
   }
 
   p:before {
-    content: '>';
+    content: ">";
     display: block;
     position: absolute;
     left: -25px;
@@ -212,7 +220,9 @@ table {
   margin: 40px 0;
 }
 
-table, th, td {
+table,
+th,
+td {
   border: none;
   padding: 10px;
 }
@@ -223,10 +233,10 @@ th {
 
 td {
   border-bottom: 1px dotted var(--accent);
- }
+}
 
-
-ul, ol {
+ul,
+ol {
   margin-left: 30px;
   padding: 0;
 
@@ -247,12 +257,13 @@ ol ol {
   display: flex;
   flex-direction: column;
   padding: 40px;
-  max-width: 864px;
+  max-width: 75vw;
   min-height: 100vh;
   margin: 0 auto;
 
   @media (max-width: $phone-max-width) {
     padding: 20px;
+    max-width: 864px;
   }
 }
 
@@ -271,16 +282,35 @@ hr {
   display: none;
 }
 
+.cvintro {
+  font-size: 0.7rem;
+  p {
+    padding: 0;
+    margin: 0;
+  }
+}
+
+.onlyprint {
+  display: none;
+}
+
 @media print {
   .section {
     break-inside: avoid-page;
-    padding-top: 1rem;
+    padding-top: 0.5rem;
+    font-size: 0.9rem;
   }
-  p, table {
+  p,
+  table {
     break-inside: avoid-page;
   }
+  td {
+    border: none;
+  }
   .noprint {
     display: none;
   }
+  .onlyprint {
+    display: initial;
+  }
 }
-

sass/style.scss

@@ -4,5 +4,6 @@
 @import 'logo';
 @import 'main';
 @import 'post';
+@import 'gallery';
 @import 'pagination';
 @import 'footer';

templates/404.html

@@ -10,7 +10,7 @@
 
 {% block content %}
 <div class="post">
-  <h1 class="post-title">{% block heading %}Lost?{% endblock heading %}</h1>
-  <p>{% block message %}This page does not exist.{% endblock message %}</p>
+  <h1 class="post-title">{% block heading %}Nya?{% endblock heading %}</h1>
+  <p>{% block message %}Oh no, This page does not exist. :({% endblock message %}</p>
 </div>
 {% endblock content %}

templates/gallery.html

@@ -0,0 +1,13 @@
+{% extends "index.html" %}
+
+{%- block title -%}
+{{ title_macros::title(page_title=page.title, main_title=config.title) }}
+{%- endblock -%}
+
+{% block content %}
+    <div class="post">
+        {{ post_macros::header(page=page) }}
+        {{ post_macros::content(page=page, summary=false) }}
+        {{ post_macros::earlier_later(page=page) }}
+    </div>
+{% endblock content %}

templates/index.html

@@ -28,7 +28,7 @@
 <body class="">
 <div class="container">
     {% block header %}
-    <header class="header">
+    <header class="header noprint">
         <div class="header__inner">
             <div class="header__logo">
                 {%- if config.logo_home_link %}
@@ -93,13 +93,6 @@
 
     {% block footer %}
     <footer class="footer noprint">
-        <div class="footer__inner">
-            <div class="copyright copyright--user">
-                 
-                <span>&copy; {{ date_macros::now_year() }} - CherryKitten</span><br>
-                 
-                <span onclick="alert('Nya!')">🐱</span></div>
-        </div>
                 <div style="display: flex; margin-top: 1rem; justify-content: center;">
 
                 <span><a href="/impressum">Impressum</a></span>
@@ -113,6 +106,7 @@
               <img src="/buttons/antinft.gif" alt="Anti NFT">
               <img src="/buttons/acab.gif" alt="ACAB">
               <img src="/buttons/transnow2.gif" alt="Trans rights now">
+              <img src="/buttons/3ds.png" alt="3DS browser verified">
 
         </div>
     </footer>

templates/shortcodes/gallery.html

@@ -0,0 +1,9 @@
+<div class="gallery">
+  {% for asset in page.assets -%} {%- if asset is matching("[.](jpg|png)$") -%}
+  {% set image = resize_image(path=asset, width=960, height=720, op="fit") %}
+    <a href="{{ get_url(path=asset) }}" target="_blank">
+      <img src="{{ image.url }}" />
+    </a>
+  </label>
+  {%- endif %} {%- endfor %}
+</div>