refactor: change SSG to Zola (#1)

* ci: disable action as it will need a rework * refactor: change SSG to Zola * ci: set up action for Zola
2025-04-23 00:13:01 +03:00 · 2024-09-22 15:06:28 +03:00 · 2024-09-22 15:06:28 +03:00 · 7aa6938137
commit 7aa6938137
parent f8542553ec
37 changed files with 422 additions and 664 deletions
--- a/.github/workflows/build_and_deploy.yml
+++ b/.github/workflows/build_and_deploy.yml
@ -1,4 +1,4 @@
-name: 🚀 Build and deploy website on push
+# name: 🚀 Build and deploy website on push
 on:
  push:
    branches:
@ -10,31 +10,19 @@ jobs:
    steps:
      - name: 🚚 Get latest code
        uses: actions/checkout@v2
-      - name: 📦 Use cache
-        uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile') }}
-          restore-keys: |
-            ${{ runner.os }}-gems-
-      - name: 🔧 Setup Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16
-      - name: 🛠️ Setup Ruby
-        uses: ruby/setup-ruby@v1
+      - name: 🛠️ Setup Zola
+        uses: taiki-e/install-action@v2
        with: 
-          ruby-version: '3.0'
-          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+          tool: zola@0.19.1
      - name: 🏗️ Build website with Jekyll
-        run: JEKYLL_ENV=production bundle exec jekyll build
+        run: zola build
      - name: 📂 Sync files
        uses: SamKirkland/FTP-Deploy-Action@4.3.0
        with:
          server: ${{ secrets.FTP_WEB_SERVER }}
          username: ${{ secrets.FTP_USER_NAME }}
          password: ${{ secrets.FTP_PASSWORD }}
-          local-dir: ./_site/
+          local-dir: ./public/
          server-dir: /www/weryskok.ru/
          exclude: |
            **/.git*
--- a/.gitignore
+++ b/.gitignore
@ -1,9 +1,2 @@
-# Ignore metadata generated by Jekyll
-_site/
-.sass-cache/
-.jekyll-cache/
-.jekyll-metadata
-
-# Ignore folders generated by Bundler
-.bundle/
-vendor/
+# Ignore folder generated by Zola
+public/
--- a/.prettierrc
+++ b/.prettierrc
@ -1,3 +0,0 @@
-tabWidth: 4
-semi: true
-singleQuote: true
--- a/15
+++ b/15
@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
-
-gem "jekyll"
-gem "webrick"
-
-group :jekyll_plugins do
-    gem 'jekyll-sitemap'
-    gem 'jekyll-feed'
-    gem 'jekyll-seo-tag'
-    gem 'jekyll-minifier'
-  end
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -1,93 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    colorator (1.1.0)
-    concurrent-ruby (1.1.10)
-    cssminify2 (2.0.1)
-    em-websocket (0.5.3)
-      eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0)
-    eventmachine (1.2.7)
-    execjs (2.8.1)
-    ffi (1.15.5)
-    forwardable-extended (2.6.0)
-    htmlcompressor (0.4.0)
-    http_parser.rb (0.8.0)
-    i18n (1.10.0)
-      concurrent-ruby (~> 1.0)
-    jekyll (4.2.2)
-      addressable (~> 2.4)
-      colorator (~> 1.0)
-      em-websocket (~> 0.5)
-      i18n (~> 1.0)
-      jekyll-sass-converter (~> 2.0)
-      jekyll-watch (~> 2.0)
-      kramdown (~> 2.3)
-      kramdown-parser-gfm (~> 1.0)
-      liquid (~> 4.0)
-      mercenary (~> 0.4.0)
-      pathutil (~> 0.9)
-      rouge (~> 3.0)
-      safe_yaml (~> 1.0)
-      terminal-table (~> 2.0)
-    jekyll-feed (0.16.0)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-minifier (0.1.10)
-      cssminify2 (~> 2.0)
-      htmlcompressor (~> 0.4)
-      jekyll (>= 3.5)
-      json-minify (~> 0.0.3)
-      uglifier (~> 4.1)
-    jekyll-sass-converter (2.2.0)
-      sassc (> 2.0.1, < 3.0)
-    jekyll-seo-tag (2.8.0)
-      jekyll (>= 3.8, < 5.0)
-    jekyll-sitemap (1.4.0)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-watch (2.2.1)
-      listen (~> 3.0)
-    json (2.6.2)
-    json-minify (0.0.3)
-      json (> 0)
-    kramdown (2.4.0)
-      rexml
-    kramdown-parser-gfm (1.1.0)
-      kramdown (~> 2.0)
-    liquid (4.0.3)
-    listen (3.7.1)
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
-    mercenary (0.4.0)
-    pathutil (0.16.2)
-      forwardable-extended (~> 2.6)
-    public_suffix (4.0.7)
-    rb-fsevent (0.11.1)
-    rb-inotify (0.10.1)
-      ffi (~> 1.0)
-    rexml (3.2.5)
-    rouge (3.28.0)
-    safe_yaml (1.0.5)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    terminal-table (2.0.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    uglifier (4.2.0)
-      execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.8.0)
-    webrick (1.7.0)
-
-PLATFORMS
-  x86_64-linux
-
-DEPENDENCIES
-  jekyll
-  jekyll-feed
-  jekyll-minifier
-  jekyll-seo-tag
-  jekyll-sitemap
-  webrick
-
-BUNDLED WITH
-   2.3.14
--- a/README.MD
+++ b/README.MD
@ -2,16 +2,13 @@
 This repo contains source code for [weryskok.ru](https://weryskok.ru).

 ## What tools are used?
-* [Jekyll](https://jekyllrb.com/) as static site generator
+* [Zola](https://www.getzola.org/) as static site generator
 * [Darkly Bootstrap](https://bootswatch.com/darkly/) for components to build this site

 ## How to build this site?
-1. Install ``nodejs``, ``ruby`` and ``rubygems``.
-1. ``gem install bundler``.
-1. Add gems dir to path.
-1. ``git clone https://github.com/WerySkok/weryskok.ru.git && cd weryskok.ru``
-1. ``bundle install``
-1. ``JEKYLL_ENV=production bundle exec jekyll build``
+1. [Install Zola](https://www.getzola.org/documentation/getting-started/installation/).
+2. ``git clone https://github.com/WerySkok/weryskok.ru.git && cd weryskok.ru``
+3. ``zola build``

 ## Why not GitHub Pages?
 Am lazy.
--- a/_config.yml
+++ b/_config.yml
@ -1,12 +0,0 @@
-plugins:
-  - jekyll-feed
-  - jekyll-sitemap
-  - jekyll-seo-tag
-  - jekyll-minifier
-exclude:
-  - README.MD
-  - LICENSE
-
-jekyll-minifier:
-  uglifier_args:
-    harmony: true
--- a/_includes/header-en.html
+++ b/_includes/header-en.html
@ -1,32 +0,0 @@
-<nav class="navbar sticky-top navbar-expand-lg navbar-dark bg-dark">
-    <div class="container">
-        <a class="navbar-brand" href="/en/">WerySkok.ru</a>
-        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent"
-            aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Open menu">
-            <span class="navbar-toggler-icon"></span>
-        </button>
-        <div class="collapse navbar-collapse" id="navbarSupportedContent">
-            <ul class="navbar-nav me-auto mb-2 mb-lg-0">
-                {% for item in site.data.navigation-en %}
-                <li class="nav-item">
-                    <a href="{{ item.link }}" class="nav-link{% if page.url==item.link %} active{% endif %}" {% if
-                        page.url==item.link %}aria-current="page" {% endif %}>{{ item.name }}</a>
-                </li>
-                {% endfor %}
-                <li class="nav-item">
-                    <a class="nav-link" href="https://t.me/WerySkok"><i class="fab fa-telegram-plane"></i></a>
-                </li>
-            </ul>
-            <span class="navbar-nav dropdown">
-                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                    <i class="fas fa-globe"></i>&nbsp;English
-                </a>
-                <ul class="dropdown-menu" aria-labelledby="navbarDropdown">
-                    <li><a class="dropdown-item" onclick="usePrefferedLanguage('ru'); return false;" href="/">Русский</a></li>
-                    <li><a class="dropdown-item active" onclick="usePrefferedLanguage('en'); return false;" href="/en/">English</a></li>
-                </ul>
-              </li>
-            </span>
-        </div>
-    </div>
-</nav>
--- a/_layouts/default.html
+++ b/_layouts/default.html
@ -1,63 +0,0 @@
-<!DOCTYPE html>
-<html lang="ru">
-    <head>
-        <meta charset="UTF-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <title>{{ page.title }}</title>
-        <script
-            src="https://kit.fontawesome.com/48d163f212.js"
-            crossorigin="anonymous"
-        ></script>
-        <link
-            rel="stylesheet"
-            href="https://bootswatch.com/5/darkly/bootstrap.min.css"
-            crossorigin="anonymous"
-        />
-        <!-- <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet"
-        integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"> -->
-        <link rel="preconnect" href="https://fonts.gstatic.com" />
-        <link
-            href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600&display=swap"
-            rel="stylesheet"
-        />
-        <style>
-            body {
-                font-family: 'Inter', sans-serif;
-            }
-        </style>
-        <link
-            rel="apple-touch-icon"
-            sizes="180x180"
-            href="/apple-touch-icon.png"
-        />
-        <link
-            rel="icon"
-            type="image/png"
-            sizes="32x32"
-            href="/favicon-32x32.png"
-        />
-        <link
-            rel="icon"
-            type="image/png"
-            sizes="16x16"
-            href="/favicon-16x16.png"
-        />
-        <link rel="manifest" href="/site.webmanifest" />
-        <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5" />
-        <meta name="msapplication-TileColor" content="#2d89ef" />
-        <meta name="theme-color" content="#ffffff" />
-        <script src="/assets/scripts/change_language.js"></script>
-        {% feed_meta %} {% seo %}
-    </head>
-
-    <body class="d-flex flex-column h-100">
-        {% include header.html %}
-        <main class="flex-shrink-0">{{ content }}</main>
-        {% include footer.html %}
-        <script
-            src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta2/dist/js/bootstrap.bundle.min.js"
-            integrity="sha384-b5kHyXgcpbZJO/tY9Ul7kGkf1S0CWuKcCD38l8YkeH8z8QjE0GmW1gYU5S9FOnJ0"
-            crossorigin="anonymous"
-        ></script>
-    </body>
-</html>
--- a/config.toml
+++ b/config.toml
@ -0,0 +1,21 @@
+# The URL the site will be built for
+base_url = "https://weryskok.ru"
+
+# Whether to automatically compile all Sass files in the sass directory
+compile_sass = false
+
+# Whether to build a search index to be used later on by a JavaScript library
+build_search_index = false
+
+default_language = "ru"
+
+[markdown]
+# Whether to do syntax highlighting
+# Theme can be customised by setting the `highlight_theme` variable to a theme supported by Zola
+highlight_code = false
+
+[languages.en]
+
+[extra]
+# Put all your custom variables here
+navigation = [{ name = "Блог", link = "https://blog.weryskok.ru" }]
--- a/content/_index.en.md
+++ b/content/_index.en.md
@ -1,7 +1,6 @@
---
-layout: default-en
-title: Main
---
+++
+title = "Main"
+++

 <section class="d-flex align-items-center justify-content-center vh-100">
    <!-- it took a lot of tears on this part, pls help -->
--- a/content/_index.md
+++ b/content/_index.md
@ -1,8 +1,6 @@
---
-layout: default
-title: Главная
---
-
+++
+title = "Главная"
+++
 <section class="d-flex align-items-center justify-content-center vh-100">
    <!-- на этот блок ушло много слёз, помогите -->
    <div class="row justify-content-center me-0">
@ -565,4 +563,4 @@ title: Главная
            </div>
        </div>
    </div>
-</section>
+</section>
--- a/content/lol.en.md
+++ b/content/lol.en.md
@ -0,0 +1,4 @@
+++
+title = "lol"
+++
+lol
--- a/content/my-pc.en.md
+++ b/content/my-pc.en.md
@ -0,0 +1,160 @@
+++
+title = "My PCs"
+++
+## My computers
+### Laptop
+Right now I am using <a 
+href="https://support.hp.com/us-en/document/c08081496" target="_blank">HP OMEN
+16-c0001ur</a>laptop. I didn't try to replace any parts yet but I am planning to
+increase RAM capacity in the future.
+
+Laptop configuration is:
+
+<table class="table table-hover">
+    <tbody>
+        <tr>
+            <th scope="row">CPU</th>
+            <td>
+                <a href="https://www.amd.com/en/products/apu/amd-ryzen-7-5800h"
+                target="_blank">AMD Ryzen 7 5800H</a>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">RAM</th>
+            <td>
+                Two DDR4-3200 <strong>8 GB</strong> sticks (<strong>16 GB
+                </strong> in total)
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">GPU</th>
+            <td>
+                <ul>
+                    <li>Integrated AMD Radeon Graphics</li>
+                    <li>
+                        Discrete NVIDIA GeForce RTX 3070 Laptop GPU with 8 GB
+                        GDDR6
+                    </li>
+                </ul>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">Storage</th>
+            <td>M.2 NVMe SSD for <strong>1 TB</strong></td>
+        </tr>
+        <tr>
+            <th scope="row">Operating system</th>
+            <td>
+                Windows 11 and Arch Linux
+                <small>(sadly, there are issues with discrete GPU)</small>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">Monitors</th>
+            <td>
+                <ul>
+                    <li>
+                        Laptop's 16.1" display with 144 Hz refresh rate and
+                        <strong>1920x1080</strong> (16:9) resoluton.
+                    </li>
+                    <li>
+                        External ViewSonic VX2452MH monitor with
+                        <strong>1920x1080</strong> (16:9) resoluton.
+                    </li>
+                </ul>
+            </td>
+        </tr>
+    </tbody>
+</table>
+
+### Компьютер
+Well, it just so happens that my computer is a purchased unit from 2013. It was
+assembled by USN company as part of IGROMIR series (and yes, in 2013 I was at
+IGROMIR and after the big crowds and queues I refused to go there again).
+According to <a href="http://www.dailycomm.ru/m/24594/" target="_blank">this
+article</a>, the exact model is the USN IGROMIR V1, although the claimed SSD
+unit was not there. The main thing is that this computer is still doing its job
+well today.
+
+Of course, the computer in such a long time was updated, first I added a
+terabyte HDD from the old computer, Then I ordered an SSD from AliExpress, and
+in 2020 I decided to replace the RAM and video card. In 2022, I replaced two 1TB
+drives with one 2TB drive because the first two were nearing the end of their
+life. (yet the new one oftenly restarts itself for some reason)
+
+Now it is rarely used since laptop's appearance.
+
+The current configuration is:
+<table class="table table-hover">
+    <tbody>
+        <tr>
+            <th scope="row">Motherboard</th>
+            <td>GIGABYTE GA-B75-D3V</td>
+        </tr>
+        <tr>
+            <th scope="row">CPU</th>
+            <td>
+                <a href=
+"https://ark.intel.com/content/www/us/en/ark/products/65719/intel-core-i7-3770-processor-8m-cache-up-to-3-90-ghz.html"
+                   target="_blank">Intel Core i7-3770</a>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">RAM</th>
+            <td>
+                2 Patriot PSD38G16002 DDR3 <strong>8 GB</strong> sticks
+                (<strong>16 GB</strong> in total)
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">Видеокарта</th>
+            <td>
+                GIGABYTE GeForce GTX 1650 SUPER WINDFORCE OC 4G
+                (GV-N165SWF2OC-4GD)
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">Storage</th>
+            <td>
+                <ul>
+                    <li>KingDian S370 for <strong>128 GB</strong></li>
+                    <li>
+                        Western Digital Blue WD20EZBX for <strong>2 TB</strong>
+                    </li>
+                    <del>
+                        <li>
+                            Seagate Barracuda ST1000DM003 for <strong>1 TB
+                            </strong>
+                        </li>
+                    </del>
+                    <del>
+                        <li>
+                            Western Digital AV-GP WD10EVDS for <strong>1 TB
+                            </strong>
+                        </li>
+                    </del>
+                </ul>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">Operating Systems</th>
+            <td>
+                Arch Linux and Windows 10
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">Monitors</th>
+            <td>
+                <ul>
+                    <li>
+                        ViewSonic VX2452MH with <strong>1920x1080
+                        </strong> (16:9) resolution.
+                    </li>
+                    <li>
+                        BenQ E910 with <strong>1280x1024</strong> (5:4) resolution.
+                    </li>
+                </ul>
+            </td>
+        </tr>
+    </tbody>
+</table>
--- a/content/my-pc.md
+++ b/content/my-pc.md
@ -0,0 +1,168 @@
+++
+title = "Мои ПК"
+++
+## Мои компьютеры
+### Ноутбук
+В настоящее время я пользуюсь ноутбуком <a 
+href="https://support.hp.com/us-en/document/c08081496" target="_blank">HP OMEN
+16-c0001ur</a>, купленным за 140 тысяч рублей. Пока я внутрь него не залезал,
+но планирую увеличить объём ОЗУ в будущем.
+
+Конфигурация ноутбука следующая:
+
+<table class="table table-hover">
+    <tbody>
+        <tr>
+            <th scope="row">Процессор</th>
+            <td>
+                <a href="https://www.amd.com/ru/products/apu/amd-ryzen-7-5800h"
+                target="_blank">AMD Ryzen 7 5800H</a>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">Оперативная память</th>
+            <td>
+                2 плашки памяти DDR4-3200 по <strong>8 ГБ</strong> (всего
+                <strong>16 ГБ</strong>)
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">Видеокарта</th>
+            <td>
+                <ul>
+                    <li>Встроенная AMD Radeon Graphics</li>
+                    <li>
+                        Дискретная NVIDIA GeForce RTX 3070 для ноутбуков с 8 ГБ
+                        видеопамяти GDDR6
+                    </li>
+                </ul>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">Постоянное хранилище</th>
+            <td>M.2 NVMe-накопитель на <strong>1 ТБ</strong></td>
+        </tr>
+        <tr>
+            <th scope="row">ОС</th>
+            <td>
+                Windows 11 и Arch Linux
+                <small>(увы, есть проблемы с дискретной видеокартой)</small>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">Мониторы</th>
+            <td>
+                <ul>
+                    <li>
+                        Экран ноутбука диагональю 16,1 дюймов с частотой 144 Гц
+                        и разрешением <strong>1920x1080</strong> (16:9)
+                    </li>
+                    <li>
+                        Внешний монитор ViewSonic VX2452MH c разрешением
+                        <strong>1920x1080</strong> (16:9)
+                    </li>
+                </ul>
+            </td>
+        </tr>
+    </tbody>
+</table>
+
+### Компьютер
+Так сложилось, что мой компьютер — покупной блок аж из 2013 года. Он
+собран компанией USN в линейке IGROMIR (и да, в 2013-м я был на Игромире
+и после большой толпы и очередей зарёкся туда ходить). Судя по
+<a href="http://www.dailycomm.ru/m/24594/" target="_blank">данной статье</a>,
+точная модель — USN IGROMIR V1, хотя заявленного SSD-шника там не
+было. Главное, что данный компьютер и сегодня хорошо справляется со
+своими задачами.
+
+Естественно, компьютер за такой долгий срок обновлялся, сначала я
+добавил терабайтник от старого компа, потом заказал SSD с алика, а в
+2020-м я решился на замену ОЗУ и видеокарты. В 2022 я заменил два диска
+по 1 ТБ на один диск на 2 ТБ, так как у первых двух срок службы подходил
+к концу. (только новый почему-то постоянно останавлиется и заново
+раскручивается...)
+
+В настоящее время компьютер мало используется в связи с появлением
+ноутбука.
+
+Сегодняшняя конфигурация следующая:
+<table class="table table-hover">
+    <tbody>
+        <tr>
+            <th scope="row">Материнская плата</th>
+            <td>
+                <a href=
+                "https://www.gigabyte.ru/products/page/mb/ga-b75-d3vrev_11"
+                   target="_blank">GIGABYTE GA-B75-D3V</a>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">Процессор</th>
+            <td>
+                <a href=
+"https://ark.intel.com/content/www/ru/ru/ark/products/65719/intel-core-i7-3770-processor-8m-cache-up-to-3-90-ghz.html"
+                   target="_blank">Intel Core i7-3770</a>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">Оперативная память</th>
+            <td>
+                2 плашки памяти Patriot PSD38G16002 DDR3 по <strong>8 ГБ
+                </strong> (всего <strong>16 ГБ</strong>)
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">Видеокарта</th>
+            <td>
+                GIGABYTE GeForce GTX 1650 SUPER WINDFORCE OC 4G
+                <a href=
+                "https://www.gigabyte.com/ru/Graphics-Card/GV-N165SWF2OC-4GD"
+                target="_blank">[GV-N165SWF2OC-4GD]</a>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">Постоянное хранилище</th>
+            <td>
+                <ul>
+                    <li>KingDian S370 на <strong>128 ГБ</strong></li>
+                    <li>
+                        Western Digital Blue WD20EZBX на <strong>2 ТБ</strong>
+                    </li>
+                    <del>
+                        <li>
+                            Seagate Barracuda ST1000DM003 на <strong>1 ТБ
+                            </strong>
+                        </li>
+                    </del>
+                    <del>
+                        <li>
+                            Western Digital AV-GP WD10EVDS на <strong>1 ТБ
+                            </strong>
+                        </li>
+                    </del>
+                </ul>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">ОС</th>
+            <td>
+                Arch Linux и Windows 10
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">Мониторы</th>
+            <td>
+                <ul>
+                    <li>
+                        ViewSonic VX2452MH c разрешением <strong>1920x1080
+                        </strong> (16:9)
+                    </li>
+                    <li>
+                        BenQ E910 c разрешением <strong>1280x1024</strong> (5:4)
+                    </li>
+                </ul>
+            </td>
+        </tr>
+    </tbody>
+</table>
--- a/_data/navigation-en.yml
+++ b/_data/navigation-en.yml
@ -1,6 +1,6 @@
 - name: Blog (in Russian)
  link: https://blog.weryskok.ru
 - name: My PC
-  link: /en/my_pc.html
+  link: /en/my-pc/
 - name: <i class="fab fa-discord"></i>&nbsp;Minecraft-server (in Russian)
  link: https://discord.com/invite/KCuJ687jqA
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@ -1,6 +1,6 @@
 - name: Блог
  link: https://blog.weryskok.ru
 - name: Мой ПК
-  link: /my_pc.html
+  link: /my-pc/
 - name: <i class="fab fa-discord"></i>&nbsp;Minecraft-сервер
  link: https://discord.com/invite/KCuJ687jqA
--- a/en/my_pc.html
+++ b/en/my_pc.html
@ -1,185 +0,0 @@
---
-layout: default-en
-title: My PCs
---
-
-<section class="container mb-5">
-    <h1 class="display-5 mb-4">My computers</h1>
-    <h2 class="display-6 mb-4">Laptop</h2>
-    <p>
-        Right now I am using
-        <a
-            href="https://support.hp.com/us-en/document/c08081496"
-            target="_blank"
-            >HP OMEN 16-c0001ur</a
-        >
-        laptop. I didn't try to replace any parts yet but I am planning to
-        increase RAM capacity in the future.
-    </p>
-
-    <p>Laptop configuration is:</p>
-
-    <table class="table table-hover">
-        <tbody>
-            <tr>
-                <th scope="row">CPU</th>
-                <td>
-                    <a
-                        href="https://www.amd.com/en/products/apu/amd-ryzen-7-5800h"
-                        target="_blank"
-                        >AMD Ryzen 7 5800H</a
-                    >
-                </td>
-            </tr>
-            <tr>
-                <th scope="row">RAM</th>
-                <td>
-                    Two DDR4-3200 <strong>8 GB</strong> sticks (<strong
-                        >16 GB</strong
-                    >
-                    in total)
-                </td>
-            </tr>
-            <tr>
-                <th scope="row">GPU</th>
-                <td>
-                    <ul>
-                        <li>Integrated AMD Radeon Graphics</li>
-                        <li>
-                            Discrete NVIDIA GeForce RTX 3070 Laptop GPU with 8
-                            GB GDDR6
-                        </li>
-                    </ul>
-                </td>
-            </tr>
-            <tr>
-                <th scope="row">Storage</th>
-                <td>M.2 NVMe SSD for <strong>1 TB</strong></td>
-            </tr>
-            <tr>
-                <th scope="row">Operating system</th>
-                <td>
-                    Windows 11 and Arch Linux
-                    <small>(sadly, there are issues with discrete GPU)</small>
-                </td>
-            </tr>
-            <tr>
-                <th scope="row">Monitors</th>
-                <td>
-                    <ul>
-                        <li>
-                            Laptop's 16.1" display with 144 Hz refresh rate and
-                            <strong>1920x1080</strong> (16:9) resoluton.
-                        </li>
-                        <li>
-                            External ViewSonic VX2452MH monitor with
-                            <strong>1920x1080</strong> (16:9) resoluton.
-                        </li>
-                    </ul>
-                </td>
-            </tr>
-        </tbody>
-    </table>
-
-    <h2 class="display-6 mb-4">Desktop PC</h2>
-    <p>
-        Well, it just so happens that my computer is a purchased unit from 2013.
-        It was assembled by USN company as part of IGROMIR series (and yes, in
-        2013 I was at IGROMIR and after the big crowds and queues I refused to
-        go there again). Judging by
-        <a href="http://www.dailycomm.ru/m/24594/" target="_blank"
-            >this article</a
-        >, the exact model is the USN IGROMIR V1, although the claimed SSD unit
-        was not there. The main thing is that this computer is still doing its
-        job well today.
-    </p>
-    <p>
-        Of course, the computer in such a long time was updated, first I added a
-        terabyte HDD from the old computer, Then I ordered an SSD from
-        AliExpress, and in 2020 I decided to replace the RAM and video card. In
-        2022, I replaced two 1TB drives with one 2TB drive because the first two
-        were nearing the end of their life. (yet the new one oftenly restarts
-        itself for some reason)
-    </p>
-
-    <p>The current configuration is:</p>
-
-    <table class="table table-hover">
-        <tbody>
-            <tr>
-                <th scope="row">Motherboard</th>
-                <td>GIGABYTE GA-B75-D3V</td>
-            </tr>
-            <tr>
-                <th scope="row">CPU</th>
-                <td>
-                    <a
-                        href="https://ark.intel.com/content/www/us/en/ark/products/65719/intel-core-i7-3770-processor-8m-cache-up-to-3-90-ghz.html"
-                        target="_blank"
-                        >Intel Core i7-3770</a
-                    >
-                </td>
-            </tr>
-            <tr>
-                <th scope="row">RAM</th>
-                <td>
-                    2 Patriot PSD38G16002 DDR3 <strong>8 GB</strong> sticks
-                    (<strong>16 GB</strong> in total)
-                </td>
-            </tr>
-            <tr>
-                <th scope="row">Video card</th>
-                <td>
-                    GIGABYTE GeForce GTX 1650 SUPER WINDFORCE OC 4G
-                    (GV-N165SWF2OC-4GD)
-                </td>
-            </tr>
-            <tr>
-                <th scope="row">Storage</th>
-                <td>
-                    <ul>
-                        <li>KingDian S370 for <strong>128 GB</strong></li>
-                        <li>
-                            Western Digital Blue WD20EZBX for
-                            <strong>2 TB</strong>
-                        </li>
-                        <del>
-                            <li>
-                                Seagate Barracuda ST1000DM003 for
-                                <strong>1 TB</strong>
-                            </li>
-                        </del>
-                        <del>
-                            <li>
-                                Western Digital AV-GP WD10EVDS for
-                                <strong>1 TB</strong>
-                            </li>
-                        </del>
-                    </ul>
-                </td>
-            </tr>
-            <tr>
-                <th scope="row">Operating System</th>
-                <td>
-                    Manjaro Linux <small>(I advice it for everyone)</small> and
-                    Windows 10
-                </td>
-            </tr>
-            <tr>
-                <th scope="row">Monitors</th>
-                <td>
-                    <ul>
-                        <li>
-                            ViewSonic VX2452MH with
-                            <strong>1920x1080</strong> (16:9) resoluton.
-                        </li>
-                        <li>
-                            BenQ E910 with <strong>1280x1024</strong> (5:4)
-                            resolution
-                        </li>
-                    </ul>
-                </td>
-            </tr>
-        </tbody>
-    </table>
-</section>
--- a/my_pc.html
+++ b/my_pc.html
@ -1,194 +0,0 @@
---
-layout: default
-title: Мои ПК
---
-
-<section class="container mb-5">
-    <h1 class="display-5 mb-4">Мои компьютеры</h1>
-    <h2 class="display-6 mb-4">Ноутбук</h2>
-    <p>
-        В настоящее время я пользуюсь ноутбуком
-        <a
-            href="https://support.hp.com/us-en/document/c08081496"
-            target="_blank"
-            >HP OMEN 16-c0001ur</a
-        >, купленным за 140 тысяч рублей. Пока я внутрь него не залезал, но
-        планирую увеличить объём ОЗУ в будущем.
-    </p>
-
-    <p>Конфигурация ноутбука следующая:</p>
-
-    <table class="table table-hover">
-        <tbody>
-            <tr>
-                <th scope="row">Процессор</th>
-                <td>
-                    <a
-                        href="https://www.amd.com/ru/products/apu/amd-ryzen-7-5800h"
-                        target="_blank"
-                        >AMD Ryzen 7 5800H</a
-                    >
-                </td>
-            </tr>
-            <tr>
-                <th scope="row">Оперативная память</th>
-                <td>
-                    2 плашки памяти DDR4-3200 по
-                    <strong>8 ГБ</strong> (всего <strong>16 ГБ</strong>)
-                </td>
-            </tr>
-            <tr>
-                <th scope="row">Видеокарта</th>
-                <td>
-                    <ul>
-                        <li>Встроенная AMD Radeon Graphics</li>
-                        <li>
-                            Дискретная NVIDIA GeForce RTX 3070 для ноутбуков с 8
-                            ГБ видеопамяти GDDR6
-                        </li>
-                    </ul>
-                </td>
-            </tr>
-            <tr>
-                <th scope="row">Постоянное хранилище</th>
-                <td>M.2 NVMe-накопитель на <strong>1 ТБ</strong></td>
-            </tr>
-            <tr>
-                <th scope="row">ОС</th>
-                <td>
-                    Windows 11 и Arch Linux
-                    <small>(увы, есть проблемы с дискретной видеокартой)</small>
-                </td>
-            </tr>
-            <tr>
-                <th scope="row">Мониторы</th>
-                <td>
-                    <ul>
-                        <li>
-                            Экран ноутбука диагональю 16,1 дюймов с частотой 144
-                            Гц и разрешением <strong>1920x1080</strong> (16:9)
-                        </li>
-                        <li>
-                            Внешний монитор ViewSonic VX2452MH c разрешением
-                            <strong>1920x1080</strong> (16:9)
-                        </li>
-                    </ul>
-                </td>
-            </tr>
-        </tbody>
-    </table>
-
-    <h2 class="display-6 mb-4">Компьютер</h2>
-    <p>
-        Так сложилось, что мой компьютер — покупной блок аж из 2013 года. Он
-        собран компанией USN в линейке IGROMIR (и да, в 2013-м я был на Игромире
-        и после большой толпы и очередей зарёкся туда ходить). Судя по
-        <a href="http://www.dailycomm.ru/m/24594/" target="_blank"
-            >данной статье</a
-        >, точная модель — USN IGROMIR V1, хотя заявленного SSD-шника там не
-        было. Главное, что данный компьютер и сегодня хорошо справляется со
-        своими задачами.
-    </p>
-    <p>
-        Естественно, компьютер за такой долгий срок обновлялся, сначала я
-        добавил терабайтник от старого компа, потом заказал SSD с алика, а в
-        2020-м я решился на замену ОЗУ и видеокарты. В 2022 я заменил два диска
-        по 1 ТБ на один диск на 2 ТБ, так как у первых двух срок службы подходил
-        к концу. (только новый почему-то постоянно останавлиется и заново
-        раскручивается...)
-    </p>
-    <p>
-        В настоящее время компьютер мало используется в связи с появлением
-        ноутбука.
-    </p>
-
-    <p>Сегодняшняя конфигурация следующая:</p>
-
-    <table class="table table-hover">
-        <tbody>
-            <tr>
-                <th scope="row">Материнская плата</th>
-                <td>
-                    <a
-                        href="https://www.gigabyte.ru/products/page/mb/ga-b75-d3vrev_11"
-                        target="_blank"
-                        >GIGABYTE GA-B75-D3V</a
-                    >
-                </td>
-            </tr>
-            <tr>
-                <th scope="row">Процессор</th>
-                <td>
-                    <a
-                        href="https://ark.intel.com/content/www/ru/ru/ark/products/65719/intel-core-i7-3770-processor-8m-cache-up-to-3-90-ghz.html"
-                        target="_blank"
-                        >Intel Core i7-3770</a
-                    >
-                </td>
-            </tr>
-            <tr>
-                <th scope="row">Оперативная память</th>
-                <td>
-                    2 плашки памяти Patriot PSD38G16002 DDR3 по
-                    <strong>8 ГБ</strong> (всего <strong>16 ГБ</strong>)
-                </td>
-            </tr>
-            <tr>
-                <th scope="row">Видеокарта</th>
-                <td>
-                    GIGABYTE GeForce GTX 1650 SUPER WINDFORCE OC 4G
-                    <a
-                        href="https://www.gigabyte.com/ru/Graphics-Card/GV-N165SWF2OC-4GD"
-                        target="_blank"
-                        >[GV-N165SWF2OC-4GD]</a
-                    >
-                </td>
-            </tr>
-            <tr>
-                <th scope="row">Постоянное хранилище</th>
-                <td>
-                    <ul>
-                        <li>KingDian S370 на <strong>128 ГБ</strong></li>
-                        <li>
-                            Western Digital Blue WD20EZBX на
-                            <strong>2 ТБ</strong>
-                        </li>
-                        <del>
-                            <li>
-                                Seagate Barracuda ST1000DM003 на
-                                <strong>1 ТБ</strong>
-                            </li>
-                        </del>
-                        <del>
-                            <li>
-                                Western Digital AV-GP WD10EVDS на
-                                <strong>1 ТБ</strong>
-                            </li>
-                        </del>
-                    </ul>
-                </td>
-            </tr>
-            <tr>
-                <th scope="row">ОС</th>
-                <td>
-                    Manjaro Linux <small>(всем советую)</small> и Windows 10
-                </td>
-            </tr>
-            <tr>
-                <th scope="row">Мониторы</th>
-                <td>
-                    <ul>
-                        <li>
-                            ViewSonic VX2452MH c разрешением
-                            <strong>1920x1080</strong> (16:9)
-                        </li>
-                        <li>
-                            BenQ E910 c разрешением
-                            <strong>1280x1024</strong> (5:4)
-                        </li>
-                    </ul>
-                </td>
-            </tr>
-        </tbody>
-    </table>
-</section>
--- a/static/android-chrome-192x192.png
+++ b/static/android-chrome-192x192.png
--- a/static/android-chrome-512x512.png
+++ b/static/android-chrome-512x512.png
--- a/static/apple-touch-icon.png
+++ b/static/apple-touch-icon.png
--- a/static/assets/images/dm_photo.jpg
+++ b/static/assets/images/dm_photo.jpg
--- a/static/assets/scripts/change_language.js
+++ b/static/assets/scripts/change_language.js
--- a/static/browserconfig.xml
+++ b/static/browserconfig.xml
--- a/static/favicon-16x16.png
+++ b/static/favicon-16x16.png
--- a/static/favicon-32x32.png
+++ b/static/favicon-32x32.png
--- a/static/favicon.ico
+++ b/static/favicon.ico
--- a/static/mstile-150x150.png
+++ b/static/mstile-150x150.png
--- a/static/safari-pinned-tab.svg
+++ b/static/safari-pinned-tab.svg
--- a/static/site.webmanifest
+++ b/static/site.webmanifest
--- a/templates/404.html
+++ b/templates/404.html
@ -1,12 +1,11 @@
---
-layout: default
-permalink: /404.html
-title: Ошибка 404
---
-
+{% extends "base.html" %}
+{% block title %}Ошибка 404{% endblock title %}
+{% block content -%}
 <section class="d-flex align-items-center justify-content-center vh-100">
    <div>
        <h1 class="display-3">Ошибка 404</h1>
        <p>Здесь ничего нет, зря ищешь.</p>
    </div>
 </section>
+{%- endblock content %}
+
--- a/_layouts/default-en.html
+++ b/_layouts/default-en.html
@ -1,9 +1,17 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="{{ lang }}">
    <head>
        <meta charset="UTF-8" />
        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <title>{{ page.title }}</title>
+        <title>
+            {% block title %}
+                {% if section.title %}
+                    {{ section.title }}
+                {% else %}
+                    {{ page.title }}
+                {% endif %}
+            {% endblock title %}
+        </title>
        <script
            src="https://kit.fontawesome.com/48d163f212.js"
            crossorigin="anonymous"
@ -47,13 +55,20 @@
        <meta name="msapplication-TileColor" content="#2d89ef" />
        <meta name="theme-color" content="#ffffff" />
        <script src="/assets/scripts/change_language.js"></script>
-        {% feed_meta %} {% seo %}
    </head>

    <body class="d-flex flex-column h-100">
-        {% include header-en.html %}
-        <main class="flex-shrink-0">{{ content }}</main>
-        {% include footer.html %}
+        {% include "header.html" %}
+        <main class="flex-shrink-0">
+            {% block content %}
+                {% if section.content %}
+                    {{ section.content | safe }}
+                {% else %}
+                    {{ page.content | safe }}
+                {% endif %}
+            {% endblock %}
+        </main>
+        {% include "footer.html" %}
        <script
            src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta2/dist/js/bootstrap.bundle.min.js"
            integrity="sha384-b5kHyXgcpbZJO/tY9Ul7kGkf1S0CWuKcCD38l8YkeH8z8QjE0GmW1gYU5S9FOnJ0"
--- a/templates/footer.html
+++ b/templates/footer.html
@ -14,6 +14,6 @@
                ><i class="fab fa-mastodon"></i
            ></a>
        </div>
-        <p>WerySkok.ru, 2021–2023</p>
+        <p>WerySkok.ru, 2021–2024</p>
    </div>
 </footer>
--- a/templates/header.html
+++ b/templates/header.html
@ -1,16 +1,22 @@
+{% if lang == "en" %}
+    {% set data = load_data(path="data/navigation-en.yml") %}
+{% else %}
+    {% set data = load_data(path="data/navigation.yml") %}
+{% endif %}
+
 <nav class="navbar sticky-top navbar-expand-lg navbar-dark bg-dark">
    <div class="container">
-        <a class="navbar-brand" href="/">WerySkok.ru</a>
+        <a class="navbar-brand" href={% if lang == "en" %}"/en/"{% else %}"/"{% endif %}>WerySkok.ru</a>
        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent"
-            aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Открыть меню">
+            aria-controls="navbarSupportedContent" aria-expanded="false" aria-label={% if lang == "en" %}"Open menu"{% else %}"Открыть меню"{% endif %}>
            <span class="navbar-toggler-icon"></span>
        </button>
        <div class="collapse navbar-collapse" id="navbarSupportedContent">
            <ul class="navbar-nav me-auto mb-2 mb-lg-0">
-                {% for item in site.data.navigation %}
+                {% for item in data %}
                <li class="nav-item">
-                    <a href="{{ item.link }}" class="nav-link{% if page.url==item.link %} active{% endif %}" {% if
-                        page.url==item.link %}aria-current="page" {% endif %}>{{ item.name }}</a>
+                    <a href="{{ item.link }}" class="nav-link{% if current_url and current_url == item.link %} active{% endif %}" {% if
+                        current_url and current_url == item.link %}aria-current="page" {% endif %}>{{ item.name | safe }}</a>
                </li>
                {% endfor %}
                <li class="nav-item">
@ -19,11 +25,11 @@
            </ul>
            <span class="navbar-nav dropdown">
                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                    <i class="fas fa-globe"></i>&nbsp;Русский
+                    <i class="fas fa-globe"></i>&nbsp;{% if lang == "en" %}English{% else %}Русский{% endif %}
                </a>
                <ul class="dropdown-menu" aria-labelledby="navbarDropdown">
-                  <li><a class="dropdown-item active" onclick="usePrefferedLanguage('ru'); return false;" href="/">Русский</a></li>
-                  <li><a class="dropdown-item" onclick="usePrefferedLanguage('en'); return false;" href="/en/">English</a></li>
+                  <li><a class="dropdown-item {% if lang == "ru" %}active{% endif %}" onclick="usePrefferedLanguage('ru'); return false;" href="/">Русский</a></li>
+                  <li><a class="dropdown-item {% if lang == "en" %}active{% endif %}" onclick="usePrefferedLanguage('en'); return false;" href="/en/">English</a></li>
                </ul>
              </li>
            </span>
--- a/templates/index.html
+++ b/templates/index.html
@ -0,0 +1 @@
+{% extends "base.html" %}
--- a/templates/page.html
+++ b/templates/page.html
@ -0,0 +1,6 @@
+{% extends "base.html" %}
+{% block content %}
+<section class="container mb-5">
+    {{ page.content | safe }}
+</section>
+{% endblock content %}