talexander/natter
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

base: talexander:b3929f22f3f1af0ab23baf854322ada82d3cc742
Branches Tags
talexander:main
talexander:v0.0.1
..
compare: talexander:3cdde0597574b86615e1514a68eb817dde0a3b2e
Branches Tags
talexander:main
talexander:v0.0.1

3 Commits
b3929f22f3 ... 3cdde05975

Author SHA1 Message Date
Tom Alexander
3cdde05975 Merge branch 'nix' 2026-07-10 23:12:15 -04:00
Tom Alexander
a50240ec57 Add support for building natter via nix. 2026-07-10 23:00:28 -04:00
Tom Alexander
a410a64236 Add english language attribute to html tag. 2026-07-10 22:36:20 -04:00
46 changed files with 300 additions and 83 deletions
Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -1 +1,2 @@
/target
/result

2
Cargo.toml
View File

@@ -48,7 +48,7 @@ default = ["tracing"]
tracing = ["dep:opentelemetry", "dep:opentelemetry-otlp", "dep:opentelemetry-semantic-conventions", "dep:tracing", "dep:tracing-opentelemetry", "dep:tracing-subscriber"]
# Optimized build for any sort of release.
[profile.release-lto]
[profile.lto]
inherits = "release"
lto = true
strip = "symbols"

2
default_environment/templates/html/main.dust
View File

@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html>
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />

48
flake.lock generated Normal file
View File

@@ -0,0 +1,48 @@
{
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1780749050,
"narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a799d3e3886da994fa307f817a6bc705ae538eeb",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay"
}
},
"rust-overlay": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1781407245,
"narHash": "sha256-VzJq4MmD0uyNDAceudSe1hHqcQMe9Tau0U4S+5iRGh0=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "d5f483210eb016d66102eef22baa128b3b3233fc",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
}
},
"root": "root",
"version": 7
}

86
flake.nix Normal file
View File

@@ -0,0 +1,86 @@
{
description = "Natter static site generator";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
rust-overlay = {
url = "github:oxalica/rust-overlay";
inputs = {
nixpkgs.follows = "nixpkgs";
};
};
};
outputs =
{
self,
nixpkgs,
rust-overlay,
}:
let
forAllSystems =
func:
builtins.listToAttrs (
map (system: {
name = system;
value = func system;
}) nixpkgs.lib.systems.flakeExposed
);
in
{
devShells = forAllSystems (
system:
let
overlays = [ (import rust-overlay) ];
pkgs = import nixpkgs {
inherit system overlays;
};
rustToolchain = (pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml);
in
{
default = pkgs.mkShell {
nativeBuildInputs = [
rustToolchain
];
buildInputs = with pkgs; [
];
};
}
);
packages = forAllSystems (
system:
let
overlays = [ (import rust-overlay) ];
pkgs = import nixpkgs {
inherit system overlays;
};
appliedOverlay = self.overlays.default pkgs pkgs;
in
rec {
default = release;
inherit (appliedOverlay.natter)
release
;
docker_env = pkgs.buildEnv {
name = "natter";
paths = with pkgs; [
appliedOverlay.natter.release
bash
uutils-coreutils-noprefix
# toybox # Smaller than uutils-coreutils?
];
};
}
);
overlays.default = final: prev: {
natter = final.lib.makeScope final.newScope (natterScope: {
release = (
natterScope.callPackage ./nix/package.nix {
inherit rust-overlay;
buildType = "lto";
}
);
});
};
};
}

82
nix/package.nix Normal file
View File

@@ -0,0 +1,82 @@
{
hello,
lib,
pkgs,
rust-overlay,
targetBins ? [ ],
features ? [ ],
cargoBuildTarget ? null,
buildType ? null,
buildLib ? false,
}:
let
cargoToml = (lib.importTOML ../Cargo.toml);
rustPlatformFor =
pkgs:
let
rust-bin = rust-overlay.lib.mkRustBin { } pkgs;
rustToolchain = (rust-bin.fromRustupToolchainFile ../rust-toolchain.toml).override (
if cargoBuildTarget != null then
{
targets = [ cargoBuildTarget ];
}
else
{ }
);
baseRustPlatform = (
pkgs.makeRustPlatform {
cargo = rustToolchain;
rustc = rustToolchain;
}
);
rustPlatform =
if cargoBuildTarget != null then
baseRustPlatform.overrideScope (
final: prev: {
cargoBuildHook = prev.cargoBuildHook.overrideDerivation (_: {
rustcTargetSpec = cargoBuildTarget;
});
cargoInstallHook = hello;
}
)
else
baseRustPlatform;
in
rustPlatform;
in
(rustPlatformFor pkgs).buildRustPackage (
# rustPlatform.buildRustPackage (
{
pname = "natter";
version = cargoToml.package.version;
src = lib.cleanSource ../.;
cargoLock.lockFile = ../Cargo.lock;
cargoBuildFlags = builtins.concatLists [
(builtins.concatMap (targetBin: [
"--bin"
targetBin
]) targetBins)
(if buildLib then [ "--lib" ] else [ ])
(
if features != [ ] then
[
"--features"
(builtins.concatStringsSep " " features)
]
else
[ ]
)
];
}
// (
if buildType != null then
{
buildType = buildType;
}
else
{ }
)
)

6
src/command/build/render.rs
View File

@@ -1,8 +1,8 @@
use std::ffi::OsStr;
use std::path::PathBuf;
use include_dir::Dir;
use include_dir::include_dir;
use include_dir::Dir;
use tokio::fs::DirEntry;
use tokio::task::JoinHandle;
@@ -15,15 +15,15 @@ use crate::context::RenderBlogStreamInput;
use crate::context::RenderContext;
use crate::context::RenderPage;
use crate::error::CustomError;
use crate::intermediate::get_web_path;
use crate::intermediate::BlogPost;
use crate::intermediate::IPage;
use crate::intermediate::PublishStatus;
use crate::intermediate::get_web_path;
use crate::render::DusterRenderer;
use crate::render::RendererIntegration;
use crate::walk_fs::walk_fs;
use crate::walk_fs::WalkAction;
use crate::walk_fs::WalkFsFilterResult;
use crate::walk_fs::walk_fs;
use super::stylesheet::Stylesheet;

6
src/command/build/runner.rs
View File

@@ -8,17 +8,17 @@ use crate::cli::parameters::BuildArgs;
use crate::command::build::render::SiteRenderer;
use crate::config::Config;
use crate::error::CustomError;
use crate::intermediate::get_org_files;
use crate::intermediate::BlogPost;
use crate::intermediate::IPage;
use crate::intermediate::IntermediateContext;
use crate::intermediate::PageInput;
use crate::intermediate::Registry;
use crate::intermediate::get_org_files;
use crate::walk_fs::walk_fs;
use crate::walk_fs::WalkAction;
use crate::walk_fs::WalkFsFilterResult;
use crate::walk_fs::walk_fs;
use include_dir::Dir;
use include_dir::include_dir;
use include_dir::Dir;
use tokio::fs::DirEntry;
static DEFAULT_STYLESHEETS: Dir =

4
src/context/ast_node.rs
View File

@@ -3,8 +3,6 @@ use serde::Serialize;
use crate::error::CustomError;
use crate::intermediate::IAstNode;
use super::RenderHeading;
use super::RenderSection;
use super::angle_link::RenderAngleLink;
use super::babel_call::RenderBabelCall;
use super::bold::RenderBold;
@@ -57,6 +55,8 @@ use super::timestamp::RenderTimestamp;
use super::underline::RenderUnderline;
use super::verbatim::RenderVerbatim;
use super::verse_block::RenderVerseBlock;
use super::RenderHeading;
use super::RenderSection;
#[derive(Debug, Serialize)]
#[serde(untagged)]

6
src/context/blog_post_page.rs
View File

@@ -5,15 +5,15 @@ use serde::Serialize;
use super::render_context::RenderContext;
use crate::context::macros::push_file;
use crate::error::CustomError;
use crate::intermediate::get_web_path;
use crate::intermediate::BlogPost;
use crate::intermediate::BlogPostPage;
use crate::intermediate::get_web_path;
use super::footnote_definition::RenderRealFootnoteDefinition;
use super::macros::render;
use super::GlobalSettings;
use super::PageHeader;
use super::RenderDocumentElement;
use super::footnote_definition::RenderRealFootnoteDefinition;
use super::macros::render;
#[derive(Debug)]
pub(crate) struct RenderBlogPostPageInput<'a> {

4
src/context/blog_stream.rs
View File

@@ -4,12 +4,12 @@ use serde::Serialize;
use super::macros::render;
use super::render_context::RenderContext;
use crate::context::macros::push_file;
use crate::context::RenderDocumentElement;
use crate::context::RenderRealFootnoteDefinition;
use crate::context::macros::push_file;
use crate::error::CustomError;
use crate::intermediate::BlogPost;
use crate::intermediate::get_web_path;
use crate::intermediate::BlogPost;
use super::GlobalSettings;
use super::PageHeader;

2
src/context/bold.rs
View File

@@ -3,9 +3,9 @@ use serde::Serialize;
use crate::error::CustomError;
use crate::intermediate::IBold;
use super::RenderObject;
use super::macros::render;
use super::render_context::RenderContext;
use super::RenderObject;
#[derive(Debug, Serialize)]
#[serde(tag = "type")]

2
src/context/document_element.rs
View File

@@ -4,9 +4,9 @@ use super::render_context::RenderContext;
use crate::error::CustomError;
use crate::intermediate::IDocumentElement;
use super::macros::render;
use super::RenderHeading;
use super::RenderSection;
use super::macros::render;
#[derive(Debug, Serialize)]
#[serde(untagged)]

2
src/context/heading.rs
View File

@@ -4,9 +4,9 @@ use super::render_context::RenderContext;
use crate::error::CustomError;
use crate::intermediate::IHeading;
use super::macros::render;
use super::RenderDocumentElement;
use super::RenderObject;
use super::macros::render;
#[derive(Debug, Serialize)]
#[serde(tag = "type")]

2
src/context/italic.rs
View File

@@ -4,8 +4,8 @@ use super::render_context::RenderContext;
use crate::error::CustomError;
use crate::intermediate::IItalic;
use super::RenderObject;
use super::macros::render;
use super::RenderObject;
#[derive(Debug, Serialize)]
#[serde(tag = "type")]

8
src/context/page.rs
View File

@@ -1,15 +1,15 @@
use std::collections::HashSet;
use super::GlobalSettings;
use super::PageHeader;
use super::RenderDocumentElement;
use super::footnote_definition::RenderRealFootnoteDefinition;
use super::macros::render;
use super::render_context::RenderContext;
use super::GlobalSettings;
use super::PageHeader;
use super::RenderDocumentElement;
use crate::context::macros::push_file;
use crate::error::CustomError;
use crate::intermediate::IPage;
use crate::intermediate::get_web_path;
use crate::intermediate::IPage;
use serde::Serialize;
#[derive(Debug, Serialize)]

2
src/context/paragraph.rs
View File

@@ -4,8 +4,8 @@ use super::render_context::RenderContext;
use crate::error::CustomError;
use crate::intermediate::IParagraph;
use super::RenderObject;
use super::macros::render;
use super::RenderObject;
#[derive(Debug, Serialize)]
#[serde(tag = "type")]

2
src/context/plain_list_item.rs
View File

@@ -4,9 +4,9 @@ use super::render_context::RenderContext;
use crate::error::CustomError;
use crate::intermediate::IPlainListItem;
use super::macros::render;
use super::RenderElement;
use super::RenderObject;
use super::macros::render;
#[derive(Debug, Serialize)]
#[serde(tag = "type")]

2
src/context/plain_list_simple_item.rs
View File

@@ -4,8 +4,8 @@ use super::render_context::RenderContext;
use crate::error::CustomError;
use crate::intermediate::IPlainListSimpleItem;
use super::RenderObject;
use super::macros::render;
use super::RenderObject;
/// Special case for list items with only paragraphs and sublists as their children. In those cases, the paragraph tags are omitted. This is equivalent to a Paragraph but in a different struct to have a different type tag.
#[derive(Debug, Serialize)]

2
src/context/quote_block.rs
View File

@@ -4,8 +4,8 @@ use super::render_context::RenderContext;
use crate::error::CustomError;
use crate::intermediate::IQuoteBlock;
use super::RenderElement;
use super::macros::render;
use super::RenderElement;
#[derive(Debug, Serialize)]
#[serde(tag = "type")]

2
src/context/regular_link.rs
View File

@@ -5,8 +5,8 @@ use crate::error::CustomError;
use crate::intermediate::IRegularLink;
use crate::intermediate::LinkTarget;
use super::RenderObject;
use super::macros::render;
use super::RenderObject;
#[derive(Debug, Serialize)]
#[serde(tag = "type")]

2
src/context/section.rs
View File

@@ -4,8 +4,8 @@ use super::render_context::RenderContext;
use crate::error::CustomError;
use crate::intermediate::ISection;
use super::RenderElement;
use super::macros::render;
use super::RenderElement;
#[derive(Debug, Serialize)]
#[serde(tag = "type")]

2
src/context/strike_through.rs
View File

@@ -4,8 +4,8 @@ use super::render_context::RenderContext;
use crate::error::CustomError;
use crate::intermediate::IStrikeThrough;
use super::RenderObject;
use super::macros::render;
use super::RenderObject;
#[derive(Debug, Serialize)]
#[serde(tag = "type")]

2
src/context/table_cell.rs
View File

@@ -4,8 +4,8 @@ use super::render_context::RenderContext;
use crate::error::CustomError;
use crate::intermediate::ITableCell;
use super::RenderObject;
use super::macros::render;
use super::RenderObject;
#[derive(Debug, Serialize)]
#[serde(tag = "type")]

2
src/context/underline.rs
View File

@@ -4,8 +4,8 @@ use super::render_context::RenderContext;
use crate::error::CustomError;
use crate::intermediate::IUnderline;
use super::RenderObject;
use super::macros::render;
use super::RenderObject;
#[derive(Debug, Serialize)]
#[serde(tag = "type")]

50
src/intermediate/ast_node.rs
View File

@@ -1,3 +1,28 @@
use super::angle_link::IAngleLink;
use super::bold::IBold;
use super::citation::ICitation;
use super::citation_reference::ICitationReference;
use super::code::ICode;
use super::comment::IComment;
use super::entity::IEntity;
use super::export_snippet::IExportSnippet;
use super::footnote_reference::IFootnoteReference;
use super::inline_babel_call::IInlineBabelCall;
use super::inline_source_block::IInlineSourceBlock;
use super::italic::IItalic;
use super::keyword::IKeyword;
use super::latex_fragment::ILatexFragment;
use super::line_break::ILineBreak;
use super::org_macro::IOrgMacro;
use super::plain_link::IPlainLink;
use super::plain_text::IPlainText;
use super::radio_link::IRadioLink;
use super::radio_target::IRadioTarget;
use super::regular_link::IRegularLink;
use super::statistics_cookie::IStatisticsCookie;
use super::strike_through::IStrikeThrough;
use super::subscript::ISubscript;
use super::superscript::ISuperscript;
use super::IBabelCall;
use super::ICenterBlock;
use super::IClock;
@@ -27,31 +52,6 @@ use super::IUnderline;
use super::IVerbatim;
use super::IVerseBlock;
use super::IntermediateContext;
use super::angle_link::IAngleLink;
use super::bold::IBold;
use super::citation::ICitation;
use super::citation_reference::ICitationReference;
use super::code::ICode;
use super::comment::IComment;
use super::entity::IEntity;
use super::export_snippet::IExportSnippet;
use super::footnote_reference::IFootnoteReference;
use super::inline_babel_call::IInlineBabelCall;
use super::inline_source_block::IInlineSourceBlock;
use super::italic::IItalic;
use super::keyword::IKeyword;
use super::latex_fragment::ILatexFragment;
use super::line_break::ILineBreak;
use super::org_macro::IOrgMacro;
use super::plain_link::IPlainLink;
use super::plain_text::IPlainText;
use super::radio_link::IRadioLink;
use super::radio_target::IRadioTarget;
use super::regular_link::IRegularLink;
use super::statistics_cookie::IStatisticsCookie;
use super::strike_through::IStrikeThrough;
use super::subscript::ISubscript;
use super::superscript::ISuperscript;
use crate::error::CustomError;
use futures::future::{BoxFuture, FutureExt};

4
src/intermediate/blog_post.rs
View File

@@ -7,12 +7,12 @@ use tokio::fs::DirEntry;
use tokio::task::JoinHandle;
use crate::error::CustomError;
use crate::intermediate::IntermediateContext;
use crate::intermediate::blog_post_page::BlogPostPageInput;
use crate::intermediate::registry::Registry;
use crate::intermediate::IntermediateContext;
use crate::walk_fs::walk_fs;
use crate::walk_fs::WalkAction;
use crate::walk_fs::WalkFsFilterResult;
use crate::walk_fs::walk_fs;
use super::BlogPostPage;

2
src/intermediate/blog_post_page.rs
View File

@@ -4,10 +4,10 @@ use crate::error::CustomError;
use super::footnote_definition::IRealFootnoteDefinition;
use super::macros::intermediate;
use super::IDocumentElement;
use super::IHeading;
use super::ISection;
use super::macros::intermediate;
#[derive(Debug)]
pub(crate) struct BlogPostPageInput<'b, 'parse> {

2
src/intermediate/bold.rs
View File

@@ -1,7 +1,7 @@
use organic::types::StandardProperties;
use super::IObject;
use super::macros::intermediate;
use super::IObject;
use crate::error::CustomError;

2
src/intermediate/element.rs
View File

@@ -1,7 +1,7 @@
use super::IPlainListSimpleItem;
use super::comment::IComment;
use super::keyword::IKeyword;
use super::macros::iselector;
use super::IPlainListSimpleItem;
use super::IBabelCall;
use super::ICenterBlock;

4
src/intermediate/footnote_definition.rs
View File

@@ -1,7 +1,7 @@
use super::IAstNode;
use super::IntermediateContext;
use super::macros::intermediate;
use super::registry::register_footnote_definition;
use super::IAstNode;
use super::IntermediateContext;
use crate::error::CustomError;
use organic::types::StandardProperties;

2
src/intermediate/heading.rs
View File

@@ -1,6 +1,6 @@
use super::macros::intermediate;
use super::IDocumentElement;
use super::IObject;
use super::macros::intermediate;
use crate::error::CustomError;
use organic::types::StandardProperties;

2
src/intermediate/italic.rs
View File

@@ -1,7 +1,7 @@
use organic::types::StandardProperties;
use super::IObject;
use super::macros::intermediate;
use super::IObject;
use crate::error::CustomError;

2
src/intermediate/mod.rs
View File

@@ -71,8 +71,8 @@ mod verse_block;
pub(crate) use angle_link::IAngleLink;
pub(crate) use ast_node::IAstNode;
pub(crate) use babel_call::IBabelCall;
pub(crate) use blog_post::BlogPost;
pub(crate) use blog_post::get_org_files;
pub(crate) use blog_post::BlogPost;
pub(crate) use blog_post_page::BlogPostPage;
pub(crate) use blog_post_page::PublishStatus;
pub(crate) use bold::IBold;

2
src/intermediate/object.rs
View File

@@ -21,7 +21,6 @@ use super::plain_text::IPlainText;
use super::radio_link::IRadioLink;
use super::radio_target::IRadioTarget;
use super::ITarget;
use super::regular_link::IRegularLink;
use super::statistics_cookie::IStatisticsCookie;
use super::strike_through::IStrikeThrough;
@@ -30,6 +29,7 @@ use super::superscript::ISuperscript;
use super::timestamp::ITimestamp;
use super::underline::IUnderline;
use super::verbatim::IVerbatim;
use super::ITarget;
use futures::future::{BoxFuture, FutureExt};
#[derive(Debug, Clone)]

8
src/intermediate/page.rs
View File

@@ -1,12 +1,12 @@
use super::IDocumentElement;
use super::IHeading;
use super::ISection;
use super::PublishStatus;
use super::blog_post_page::get_date;
use super::blog_post_page::get_publish_status;
use super::blog_post_page::get_title;
use super::footnote_definition::IRealFootnoteDefinition;
use super::macros::intermediate;
use super::IDocumentElement;
use super::IHeading;
use super::ISection;
use super::PublishStatus;
use crate::error::CustomError;
use std::path::PathBuf;

2
src/intermediate/paragraph.rs
View File

@@ -1,5 +1,5 @@
use super::IObject;
use super::macros::intermediate;
use super::IObject;
use crate::error::CustomError;
use organic::types::StandardProperties;

2
src/intermediate/plain_list.rs
View File

@@ -1,5 +1,5 @@
use super::IPlainListItem;
use super::macros::intermediate;
use super::IPlainListItem;
use crate::error::CustomError;
use organic::types::StandardProperties;

2
src/intermediate/plain_list_item.rs
View File

@@ -1,5 +1,5 @@
use super::IPlainListSimpleItem;
use super::macros::intermediate;
use super::IPlainListSimpleItem;
use super::IElement;
use super::IObject;

2
src/intermediate/plain_list_simple_item.rs
View File

@@ -1,5 +1,5 @@
use super::IObject;
use super::macros::intermediate;
use super::IObject;
use crate::error::CustomError;
use organic::types::StandardProperties;

2
src/intermediate/quote_block.rs
View File

@@ -1,5 +1,5 @@
use super::IElement;
use super::macros::intermediate;
use super::IElement;
use crate::error::CustomError;
use organic::types::StandardProperties;

4
src/intermediate/registry.rs
View File

@@ -3,11 +3,11 @@ use organic::types::Element;
use organic::types::Object;
use std::collections::HashMap;
use super::ast_node::IAstNode;
use super::ast_node::IntoIAstNode;
use super::IObject;
use super::IParagraph;
use super::IntermediateContext;
use super::ast_node::IAstNode;
use super::ast_node::IntoIAstNode;
type IdCounter = u16;

2
src/intermediate/regular_link.rs
View File

@@ -5,9 +5,9 @@ use organic::types::LinkType;
use organic::types::StandardProperties;
use url::Url;
use super::IntermediateContext;
use super::get_web_path;
use super::macros::intermediate;
use super::IntermediateContext;
use super::IObject;
use crate::context::RenderContext;

2
src/intermediate/section.rs
View File

@@ -1,5 +1,5 @@
use super::IElement;
use super::macros::intermediate;
use super::IElement;
use crate::error::CustomError;
use organic::types::StandardProperties;

2
src/intermediate/strike_through.rs
View File

@@ -1,7 +1,7 @@
use organic::types::StandardProperties;
use super::IObject;
use super::macros::intermediate;
use super::IObject;
use crate::error::CustomError;

2
src/intermediate/underline.rs
View File

@@ -1,7 +1,7 @@
use organic::types::StandardProperties;
use super::IObject;
use super::macros::intermediate;
use super::IObject;
use crate::error::CustomError;