diff --git a/.gitignore b/.gitignore index ff51edf..dee1460 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -.direnv \ No newline at end of file +.direnv +result \ No newline at end of file diff --git a/dolls.doll b/dolls.doll new file mode 100644 index 0000000..d4a11ae --- /dev/null +++ b/dolls.doll @@ -0,0 +1,7 @@ +--- +title: 41666 dolls +--- + +this is a companion page to [link(https://noe.sh/system.html):~noe/system.html] + +&hold its a wip \ No newline at end of file diff --git a/flake.lock b/flake.lock index 44d3109..8a98d3e 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,20 @@ { "nodes": { + "crane": { + "locked": { + "lastModified": 1744386647, + "narHash": "sha256-DXwQEJllxpYeVOiSlBhQuGjfvkoGHTtILLYO2FvcyzQ=", + "owner": "ipetkov", + "repo": "crane", + "rev": "d02c1cdd7ec539699aa44e6ff912e15535969803", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -18,6 +33,63 @@ "type": "github" } }, + "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" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "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" + } + }, + "markdoll": { + "inputs": { + "crane": "crane", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_2", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1745093370, + "narHash": "sha256-M4Nal2SQ9hW08VVjgV80V5KqC3W/8flsc9hUluIYdYM=", + "ref": "refs/heads/main", + "rev": "fb42921ee9a4592b5f055a4e8c4fe244275e4fef", + "revCount": 79, + "type": "git", + "url": "https://codeberg.org/0x57e11a/markdoll.git" + }, + "original": { + "type": "git", + "url": "https://codeberg.org/0x57e11a/markdoll.git" + } + }, "nixpkgs": { "locked": { "lastModified": 1741379970, @@ -49,10 +121,115 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1744536153, + "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1744868846, + "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "teapot": "teapot" + } + }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "teapot", + "markdoll", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1744770893, + "narHash": "sha256-RMyTyFHN3w8zwfpgvcfRHQ4vX4zTqhuZbif/MXROtx8=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "1633514603fc0ed15ea0aef7327e26736ec003c0", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "teapot": { + "inputs": { + "flake-utils": "flake-utils", + "markdoll": "markdoll", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1745288767, + "narHash": "sha256-TuqV9R4/QcNTGrACmohYP7LKbYoLanOKFGRmcFiYvco=", + "ref": "refs/heads/main", + "rev": "317dd961a2fa7d10f7a32c784c7076b0889bbb19", + "revCount": 4, + "type": "git", + "url": "https://git.sapphic.engineer/noe/teapot" + }, + "original": { + "type": "git", + "url": "https://git.sapphic.engineer/noe/teapot" } } }, diff --git a/flake.nix b/flake.nix index 2b4279f..4d48bd5 100644 --- a/flake.nix +++ b/flake.nix @@ -4,19 +4,20 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; flake-parts.url = "github:hercules-ci/flake-parts"; + teapot.url = "git+https://git.sapphic.engineer/noe/teapot"; }; outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } { systems = [ "x86_64-linux" "aarch64-linux" ]; - perSystem = { config, self', pkgs, lib, system, ... }: { + perSystem = { config, self', pkgs, lib, system, ... }: let + in { devShells.default = import ./shell.nix { inherit pkgs; }; - packages.default = pkgs.stdenvNoCC.mkDerivation { + packages.default = inputs.teapot.packages.${system}.brewTea { name = "noe.sh"; + version = "0.0.0"; src = ./.; - installPhase = '' - cp -r . $out/ - ''; + layoutSrc = ./layouts; }; }; }; diff --git a/index.doll b/index.doll new file mode 100644 index 0000000..3916651 --- /dev/null +++ b/index.doll @@ -0,0 +1,5 @@ +--- +layout: index.html +--- +this isn't a real file. index has no %%CONTENT%% +we be silly \ No newline at end of file diff --git a/layouts/default.html b/layouts/default.html new file mode 100644 index 0000000..963f3c1 --- /dev/null +++ b/layouts/default.html @@ -0,0 +1,29 @@ + + + + %%TITLE%%:41666 + + %%HEAD%% + + +
%%CONTENT%%
+ diff --git a/index.html b/layouts/index.html similarity index 100% rename from index.html rename to layouts/index.html