From 34ab3e472c58a1effdef30d2cdd1ef2c18e6cabc Mon Sep 17 00:00:00 2001 From: Ladas552 Date: Tue, 4 Aug 2026 09:50:11 +0500 Subject: [PATCH] now on 1.2 --- content/meta/index.norg | 4 +- content/nix/index.norg | 2 - content/posts/index.norg | 4 +- flake.lock | 80 ++++++++++++++++++++++++++++++++--- flake.nix | 8 ++-- norgolith.toml | 16 ++++++- templates/.gitkeep | 0 theme/templates/404.html | 9 ++++ theme/templates/500.html | 12 ++++++ theme/templates/base.html | 12 +++--- theme/templates/home-nix.html | 30 +++++++++++++ theme/templates/home.html | 2 +- theme/templates/rss.xml | 2 +- 13 files changed, 156 insertions(+), 25 deletions(-) create mode 100644 templates/.gitkeep create mode 100644 theme/templates/404.html create mode 100644 theme/templates/500.html diff --git a/content/meta/index.norg b/content/meta/index.norg index c1da9ac..bc4fbd2 100644 --- a/content/meta/index.norg +++ b/content/meta/index.norg @@ -1,12 +1,12 @@ @document.meta -title: index +title: Index description: authors: ladas552 categories: [ !Hub ] created: 2025-06-13T04:10:58 -updated: 2026-06-23T13:40:48 +updated: 2026-08-04T07:29:40 version: 1.1.1 layout: post @end diff --git a/content/nix/index.norg b/content/nix/index.norg index 62990ff..f87ddc0 100644 --- a/content/nix/index.norg +++ b/content/nix/index.norg @@ -15,5 +15,3 @@ version: 1.1.1 * Nix Yourself This section of the site contains guides and explanations for my {https://tangled.org/ladas552.me/Flake-ocean}[NixOS config]. Articles below are more centered on providing actual information and mostly serve as references when someone ask a question and I am too lazy to explain the thing a second time. - - {https://nix.ladas552.me/Nvfetcher}[Nvfetcher] - how I use Nvfetcher in my config and why even use it if there are flakes; - - {https://nix.ladas552.me/Impermanence}[Impermanence setup with ZFS+tmpfs] - My approach to Impermanence. How to set it up, some useful abstractions, and tips to follow; diff --git a/content/posts/index.norg b/content/posts/index.norg index 57c9eca..6731902 100644 --- a/content/posts/index.norg +++ b/content/posts/index.norg @@ -1,12 +1,12 @@ @document.meta -title: index +title: Index description: authors: ladas552 categories: [ !Hub ] created: 2025-06-13T03:56:49 -updated: 2026-06-23T13:40:52 +updated: 2026-08-04T07:30:07 version: 1.1.1 layout: posts @end diff --git a/flake.lock b/flake.lock index 189bb3f..3cbf573 100644 --- a/flake.lock +++ b/flake.lock @@ -1,23 +1,91 @@ { "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1782939632, - "narHash": "sha256-T/bHHdrgRHqJXpS7asstnMjJf8QVnqJcp4Upn22WNDA=", - "owner": "ladas552", + "lastModified": 1785692966, + "narHash": "sha256-1+YGJM7PLfvTsbUxDHKj0NcuEXYFHfZBDuajujCcVmY=", + "rev": "643809054d65fdd466a63e3155b8c498cb483c04", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1046609.643809054d65/nixexprs.tar.xz" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1781074563, + "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "e8eeb909d60d6c52fc3cae5c28b77e44fd9505f6", + "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca", "type": "github" }, "original": { - "owner": "ladas552", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, + "norgolith": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1785181166, + "narHash": "sha256-wQCtk/raWl8akJxiwnp9pjEutkUkrq1FV7z/3Krsveg=", + "owner": "norgolith", + "repo": "core", + "rev": "34d3add667eb00924e53a44caa6e21d3316fc589", + "type": "github" + }, + "original": { + "owner": "norgolith", + "ref": "norgolith-v1.2.0", + "repo": "core", + "type": "github" + } + }, "root": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "norgolith": "norgolith" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index fd6ea13..86485cb 100644 --- a/flake.nix +++ b/flake.nix @@ -2,12 +2,12 @@ description = "Shell with norgolith"; inputs = { - # nixpkgs.url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"; - nixpkgs.url = "github:ladas552/nixpkgs"; + nixpkgs.url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"; + norgolith.url = "github:norgolith/core/norgolith-v1.2.0"; }; outputs = - { nixpkgs, ... }: + { nixpkgs, norgolith,... }: { packages.aarch64-linux.default = nixpkgs.legacyPackages.aarch64-linux.norgolith; @@ -19,7 +19,7 @@ { default = pkgs.mkShell { packages = [ - pkgs.norgolith + norgolith.packages.x86_64-linux.default (pk "serve" "lith dev --drafts") (pk "serveh" # bash '' diff --git a/norgolith.toml b/norgolith.toml index 74d4ff0..3c1df0b 100644 --- a/norgolith.toml +++ b/norgolith.toml @@ -15,6 +15,20 @@ description = 'Latest posts' ttl = 60 image = '/assets/nix-snowflake-rainbow.svg' +[seo] +sitemap = true +open_graph = true +twitter_site = "@ladas552" +twitter_creator = "@ladas552" + +[[collections]] +name = "posts" +dir = "posts" + +[[collections]] +name = "nix" +dir = "nix" + # Content Scheme ## Global options [content_schema] @@ -22,7 +36,7 @@ required = [ "title", "description", "authors", "categories" ] ## field rules [content_schema.fields] -title = { type = "string", max_length = 40 } +title = { type = "string", max_length = 40, pattern = "^[A-Z].*" } description = { type = "string", max_length = 100 } categories = { type = "array", items = { type = "string" }, min_items = 1 } diff --git a/templates/.gitkeep b/templates/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/theme/templates/404.html b/theme/templates/404.html new file mode 100644 index 0000000..05f0243 --- /dev/null +++ b/theme/templates/404.html @@ -0,0 +1,9 @@ +{% extends "base.html" %} +{% block title %}404 Not Found{% endblock title %} +{% block content %} +
+

404

+

Page not found, skill issue

+ Go home, bozo +
+{% endblock content %} diff --git a/theme/templates/500.html b/theme/templates/500.html new file mode 100644 index 0000000..4dcfafe --- /dev/null +++ b/theme/templates/500.html @@ -0,0 +1,12 @@ +{% extends "base.html" %} +{% block title %}500 Internal Server Error{% endblock title %} +{% block content %} +
+

500

+

Internal server error

+ {% if error_message %} + 
{{ error_message }}
+ {% endif %} + Go home, bozo +
+{% endblock content %} diff --git a/theme/templates/base.html b/theme/templates/base.html index 67c913f..b615fae 100644 --- a/theme/templates/base.html +++ b/theme/templates/base.html @@ -3,14 +3,14 @@ {% block head %} - {% if metadata.description and not metadata.description == "nil" %} - + {% if metadata?.description and not metadata?.description == "nil" %} + {% endif %} - {% if metadata.authors %} + {% if metadata?.authors %} {% endif %} - {% if metadata.categories %} - + {% if metadata?.categories %} + {% endif %} {# PrismJS #} @@ -40,7 +40,7 @@
{% block content %}{% endblock content %}
- {% if metadata.title %} + {% if metadata?.title %} {# footer bar #}