From fb6d498ad5f2e58f93d733274268bc1b695709f1 Mon Sep 17 00:00:00 2001 From: Bill Ewanick Date: Sun, 4 Jan 2026 01:46:24 -0500 Subject: [PATCH] Add emanotes flake part --- flake.lock | 213 ++++++++++++++++++++++++++++++++ flake.nix | 17 +++ nixos-apps/default.nix | 2 +- nixos-apps/ewanick.com.nix | 7 +- nixos-apps/ewanick.com/index.md | 1 + test.sh | 7 +- 6 files changed, 239 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 559a94e..2ffe7b1 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,106 @@ { "nodes": { + "commonmark-simple": { + "flake": false, + "locked": { + "lastModified": 1755566927, + "narHash": "sha256-2WE5SjwgwjKdsHxDRfQIb2WRrVYoNPiCIyG4HZd8Znk=", + "owner": "srid", + "repo": "commonmark-simple", + "rev": "81dc7a66b2490a701bfc87e6e892307665e6336e", + "type": "github" + }, + "original": { + "owner": "srid", + "ref": "0.2.0.0", + "repo": "commonmark-simple", + "type": "github" + } + }, + "commonmark-wikilink": { + "flake": false, + "locked": { + "lastModified": 1755567049, + "narHash": "sha256-MWOb0Ojc4EQd9fOnQEveRDdbH5Cr6kjUt04uWzBPLGQ=", + "owner": "srid", + "repo": "commonmark-wikilink", + "rev": "5ab01515939047b58943cc1234e7ee0cb82d1c22", + "type": "github" + }, + "original": { + "owner": "srid", + "ref": "0.2.0.0", + "repo": "commonmark-wikilink", + "type": "github" + } + }, + "ema": { + "flake": false, + "locked": { + "lastModified": 1753226458, + "narHash": "sha256-vDhjw+Cm7HniaiIHirwM0B2yzzLYLO3HHMaZsQRL3uw=", + "owner": "srid", + "repo": "ema", + "rev": "7ff434cf8f494c62de7fe6c1a36d8681929beb93", + "type": "github" + }, + "original": { + "owner": "srid", + "ref": "0.12.0.0", + "repo": "ema", + "type": "github" + } + }, + "emanote": { + "inputs": { + "commonmark-simple": "commonmark-simple", + "commonmark-wikilink": "commonmark-wikilink", + "ema": "ema", + "emanote-template": "emanote-template", + "flake-parts": [ + "flake-parts" + ], + "fourmolu-nix": "fourmolu-nix", + "git-hooks": "git-hooks", + "haskell-flake": "haskell-flake", + "heist-extra": "heist-extra", + "lvar": "lvar", + "nixos-unified": "nixos-unified", + "nixpkgs": [ + "nixpkgs" + ], + "unionmount": "unionmount" + }, + "locked": { + "lastModified": 1766432517, + "narHash": "sha256-2y58CyRlcPIQgVvPxsxKOp6aFO6S16CyYOJxFfBaKE8=", + "owner": "srid", + "repo": "emanote", + "rev": "6deb47e5db07221709d5214820ff4456e2bda92d", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "emanote", + "type": "github" + } + }, + "emanote-template": { + "flake": false, + "locked": { + "lastModified": 1745726040, + "narHash": "sha256-cLL9ylGe1OoN/KSX7+FRW3j8rm5iPTCleOJGSdOfdE0=", + "owner": "srid", + "repo": "emanote-template", + "rev": "1475b182fc136fc5da3a3b3e2b9be90795af19bb", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "emanote-template", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -34,6 +135,37 @@ "type": "github" } }, + "fourmolu-nix": { + "locked": { + "lastModified": 1707266073, + "narHash": "sha256-tCFzZQJicDdYjnuJiNK4hiiRAH7c2wQzMhOCdUMbVKE=", + "owner": "jedimahdi", + "repo": "fourmolu-nix", + "rev": "717f5a91b0d7b97b1be7ecc3a0fd42d37ffe1c9b", + "type": "github" + }, + "original": { + "owner": "jedimahdi", + "repo": "fourmolu-nix", + "type": "github" + } + }, + "git-hooks": { + "flake": false, + "locked": { + "lastModified": 1748731907, + "narHash": "sha256-KVgK2PB1h5RNhHJzGn090XcW1i9Mq0FVh6qTVKsg2RU=", + "owner": "bmrips", + "repo": "git-hooks.nix", + "rev": "2749fc9197fd12231746ef685225eaf85fe087fd", + "type": "github" + }, + "original": { + "owner": "bmrips", + "repo": "git-hooks.nix", + "type": "github" + } + }, "git-hooks-nix": { "inputs": { "flake-compat": "flake-compat", @@ -77,6 +209,69 @@ "type": "github" } }, + "haskell-flake": { + "locked": { + "lastModified": 1752499668, + "narHash": "sha256-Yif99ho8GNgXP0l9vxPHCKi7X16Cf7rwVd+HW1cMVeQ=", + "owner": "srid", + "repo": "haskell-flake", + "rev": "39065472d2587af93a502423276bfb98c2c6fb09", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "haskell-flake", + "type": "github" + } + }, + "heist-extra": { + "flake": false, + "locked": { + "lastModified": 1766109391, + "narHash": "sha256-ytHgIoRlkI5K0SDq33znlY0wjlqcwoQCe1z9JfHT/Fw=", + "owner": "srid", + "repo": "heist-extra", + "rev": "81f1ea0cf1226215430171dbe613a2988c6cc46a", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "heist-extra", + "type": "github" + } + }, + "lvar": { + "flake": false, + "locked": { + "lastModified": 1753226155, + "narHash": "sha256-Uwg5s0SlxLp83bXHA+6TIQV+L+lu8lwMpBdNuiuk7hg=", + "owner": "srid", + "repo": "lvar", + "rev": "cd110d4823ee7b8bbbf115a47c79bc304c3309cd", + "type": "github" + }, + "original": { + "owner": "srid", + "ref": "0.2.0.0", + "repo": "lvar", + "type": "github" + } + }, + "nixos-unified": { + "locked": { + "lastModified": 1751174231, + "narHash": "sha256-OLPo3ZI/gKH0C6P6l2W9RYm1ow/Jl4qBrasQ3rjAA0E=", + "owner": "srid", + "repo": "nixos-unified", + "rev": "05eb3d59d3b48460ea01c419702d4fc0c3210805", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "nixos-unified", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1767325753, @@ -110,6 +305,7 @@ }, "root": { "inputs": { + "emanote": "emanote", "flake-parts": "flake-parts", "git-hooks-nix": "git-hooks-nix", "nixpkgs": "nixpkgs", @@ -135,6 +331,23 @@ "repo": "treefmt-nix", "type": "github" } + }, + "unionmount": { + "flake": false, + "locked": { + "lastModified": 1755566785, + "narHash": "sha256-1TBIhcgbQxBF48ET7Dy+PM3U2lCROBDVg5PhOtm2Q/M=", + "owner": "srid", + "repo": "unionmount", + "rev": "4387cdeca64d22ff02da318b1527ff8817123ced", + "type": "github" + }, + "original": { + "owner": "srid", + "ref": "0.3.0.0", + "repo": "unionmount", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 490df78..4db40ad 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,9 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; flake-parts.url = "github:hercules-ci/flake-parts"; + emanote.url = "github:srid/emanote"; + emanote.inputs.nixpkgs.follows = "nixpkgs"; + emanote.inputs.flake-parts.follows = "flake-parts"; git-hooks-nix.url = "github:cachix/git-hooks.nix"; git-hooks-nix.inputs.nixpkgs.follows = "nixpkgs"; treefmt-nix.url = "github:numtide/treefmt-nix"; @@ -18,6 +21,7 @@ # 1. Add foo to inputs # 2. Add foo as a parameter to the outputs function # 3. Add here: foo.flakeModule + inputs.emanote.flakeModule inputs.git-hooks-nix.flakeModule inputs.treefmt-nix.flakeModule ]; @@ -66,6 +70,19 @@ # module parameters provide easy access to attributes of the same # system. + emanote.sites = { + osds-site = { + layers = [ + { + # path = ./nixos-apps/ewanick.com; + # pathString = "nixos-apps/ewanick.com"; + } + ]; + baseUrl = "ewanick.com"; + port = 5567; + }; + }; + # Equivalent to inputs'.nixpkgs.legacyPackages.hello; # packages.default = pkgs.hello; diff --git a/nixos-apps/default.nix b/nixos-apps/default.nix index 8091cf4..cdba9be 100644 --- a/nixos-apps/default.nix +++ b/nixos-apps/default.nix @@ -5,7 +5,7 @@ ./cutesealfanpage.love.nix - ./ewanick.com.nix + # ./ewanick.com.nix ./git.ewanick.com.nix # ./paperless.ewanick.com.nix diff --git a/nixos-apps/ewanick.com.nix b/nixos-apps/ewanick.com.nix index 37ade7c..ed5fc1b 100644 --- a/nixos-apps/ewanick.com.nix +++ b/nixos-apps/ewanick.com.nix @@ -1,8 +1,9 @@ {pkgs, ...}: let + description = "A blog powered by Emanote running solely on Markdown files."; PROJECT_ROOT = "/workspace/deployed-nixos-server-and-apps/nixos-apps/ewanick.com"; - PORT = "5567"; HOST = "localhost"; - emanote-version = "1.2.0"; + PORT = 5567; + emanote-version = "1.4.0"; in { services.caddy = { enable = true; @@ -10,7 +11,7 @@ in { "ewanick.com" = { serverAliases = ["www.ewanick.com"]; extraConfig = '' - reverse_proxy ${HOST}:${PORT} + reverse_proxy ${HOST}:${toString PORT} ''; }; }; diff --git a/nixos-apps/ewanick.com/index.md b/nixos-apps/ewanick.com/index.md index 4338efa..79a6491 100644 --- a/nixos-apps/ewanick.com/index.md +++ b/nixos-apps/ewanick.com/index.md @@ -13,4 +13,5 @@ See what I'm currently tinkering with at:\ :::{.photoframe-center} + !\[[profile.jpg]\] diff --git a/test.sh b/test.sh index 2467d4e..81a6d38 100755 --- a/test.sh +++ b/test.sh @@ -1,6 +1,5 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p bash -sudo \ - nixos-rebuild test \ - --option eval-cache false \ - --flake /workspace/deployed-nixos-server-and-apps#linode-nixos +nixos-rebuild test \ + --option eval-cache false \ + --flake /workspace/deployed-nixos-server-and-apps#linode-nixos