From 50f15f8b6234be058f7a1a87ca96e7d97198da11 Mon Sep 17 00:00:00 2001 From: Miran Bastaja Date: Sat, 4 Oct 2025 14:25:52 +0200 Subject: Update flake.lock, change theme to radion `no style, please!` seems to have disappeared off of gitlab and I'm too lazy to hunt the new repo down. (if it even exists) --- config.toml | 15 ++++++++-- content/_index.md | 1 + flake.lock | 79 +++++++++++++++++++++++++++------------------------- flake.nix | 15 +++++----- templates/base.html | 7 ++--- templates/index.html | 48 ++++++++++++++++++------------- 6 files changed, 94 insertions(+), 71 deletions(-) diff --git a/config.toml b/config.toml index a9cf441..c1b5459 100644 --- a/config.toml +++ b/config.toml @@ -7,17 +7,28 @@ compile_sass = true # Whether to build a search index to be used later on by a JavaScript library build_search_index = false -theme = "no style, please!" +theme = "radion" generate_feeds = true +taxonomies = [ + # You can enable/disable RSS + {name = "categories", feed = true}, + {name = "tags", feed = true}, +] + [markdown] # Whether to do syntax highlighting # Theme can be customised by setting the `highlight_theme` variable to a theme supported by Zola highlight_code = true [extra] -# Put all your custom variables here +radion_menu = [ + {url = "$BASE_URL", name = "Home"}, + {url = "$BASE_URL/categories", name = "Categories"}, + {url = "$BASE_URL/tags", name = "Tags"}, + {url = "https://google.com", name = "Google"}, +] [slugify] paths_keep_dates = true diff --git a/content/_index.md b/content/_index.md index b7159b1..de8afa0 100644 --- a/content/_index.md +++ b/content/_index.md @@ -4,4 +4,5 @@ description = "Random thoughts written down so I can come back to them later" template = "index.html" page_template = "blog-page.html" sort_by = "date" +paginate_by = 5 +++ diff --git a/flake.lock b/flake.lock index 13680b3..8afd998 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -21,11 +21,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1759362264, + "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", "type": "github" }, "original": { @@ -57,11 +57,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737062831, - "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -73,30 +73,17 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1735774519, - "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" - } - }, - "no-style-please": { - "flake": false, - "locked": { - "lastModified": 1731873530, - "narHash": "sha256-67iX9Y0kSrPCyzFKDxBOL/GnorE6BKOQCj79tT3/AhY=", - "owner": "atgumx", - "repo": "no-style-please", - "rev": "30dd31fbc558597110f373b3ef1e0c75ea350f75", - "type": "gitlab" + "lastModified": 1754788789, + "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", + "type": "github" }, "original": { - "owner": "atgumx", - "repo": "no-style-please", - "type": "gitlab" + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" } }, "pre-commit-hooks-nix": { @@ -108,11 +95,11 @@ ] }, "locked": { - "lastModified": 1737301351, - "narHash": "sha256-2UNmLCKORvdBRhPGI8Vx0b6l7M8/QBey/nHLIxOl4jE=", + "lastModified": 1759523803, + "narHash": "sha256-PTod9NG+i3XbbnBKMl/e5uHDBYpwIWivQ3gOWSEuIEM=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "15a87cedeb67e3dbc8d2f7b9831990dffcf4e69f", + "rev": "cfc9f7bb163ad8542029d303e599c0f7eee09835", "type": "github" }, "original": { @@ -121,12 +108,28 @@ "type": "github" } }, + "radion-theme": { + "flake": false, + "locked": { + "lastModified": 1759191307, + "narHash": "sha256-K6EJSD5fsBusgAtfpDhLnSJX3BXQaI2cqn2I07jDDrU=", + "owner": "micahkepe", + "repo": "radion", + "rev": "15b6545b788a3f1bd176cd86a5f4ad098629a51e", + "type": "github" + }, + "original": { + "owner": "micahkepe", + "repo": "radion", + "type": "github" + } + }, "root": { "inputs": { "flake-parts": "flake-parts", "nixpkgs": "nixpkgs", - "no-style-please": "no-style-please", "pre-commit-hooks-nix": "pre-commit-hooks-nix", + "radion-theme": "radion-theme", "treefmt-nix": "treefmt-nix" } }, @@ -137,11 +140,11 @@ ] }, "locked": { - "lastModified": 1737103437, - "narHash": "sha256-uPNWcYbhY2fjY3HOfRCR5jsfzdzemhfxLSxwjXYXqNc=", + "lastModified": 1758728421, + "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "d1ed3b385f8130e392870cfb1dbfaff8a63a1899", + "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 721ba56..a8879e9 100644 --- a/flake.nix +++ b/flake.nix @@ -12,8 +12,8 @@ url = "github:cachix/pre-commit-hooks.nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - no-style-please = { - url = "gitlab:atgumx/no-style-please"; + radion-theme = { + url = "github:micahkepe/radion"; flake = false; }; }; @@ -29,7 +29,8 @@ perSystem = { config, pkgs, ... }: let - themeName = ((builtins.fromTOML (builtins.readFile "${inputs.no-style-please}/theme.toml")).name); + theme = inputs.radion-theme; + themeName = ((builtins.fromTOML (builtins.readFile "${theme}/theme.toml")).name); in { packages = { @@ -37,12 +38,12 @@ website = pkgs.stdenv.mkDerivation { pname = "sorre-website"; - version = "2025-01-21"; + version = "2025-10-04"; src = ./.; nativeBuildInputs = [ pkgs.zola ]; configurePhase = '' mkdir -p "themes/${themeName}" - cp -r ${inputs.no-style-please}/* "themes/${themeName}" + cp -r ${theme}/* "themes/${themeName}" ''; buildPhase = "zola build"; installPhase = "cp -r public $out"; @@ -56,7 +57,7 @@ "8080/tcp" = { }; }; Cmd = [ - "${pkgs.pkgsStatic.busybox}/bin/httpd" + "${pkgs.pkgsStatic.darkhttpd}/bin/darkhttpd" "${config.packages.website}" "--port" "8080" @@ -84,7 +85,7 @@ packages = with pkgs; [ zola ] ++ builtins.attrValues config.treefmt.build.programs; shellHook = '' mkdir -p themes - ln -sn "${inputs.no-style-please}" "themes/${themeName}" + ln -sn "${theme}" "themes/${themeName}" ''; }; diff --git a/templates/base.html b/templates/base.html index 53a9db5..90b6918 100644 --- a/templates/base.html +++ b/templates/base.html @@ -5,7 +5,6 @@ - {% if page.title %} {% set title = page.title %} @@ -20,13 +19,13 @@ {% endif %} - + -
+
{% block content %} {% endblock %} -
+ diff --git a/templates/index.html b/templates/index.html index f57baf5..11ff2d2 100644 --- a/templates/index.html +++ b/templates/index.html @@ -2,31 +2,39 @@ {% block content %}

- {{ section.title }} + {{ section.title }}

{{ section.description }}

{% endblock %} \ No newline at end of file -- cgit v1.3.1