From 2f233bab422398cde4a25f44be59690fe418268b Mon Sep 17 00:00:00 2001 From: Bill Ewanick Date: Sat, 3 Jan 2026 22:43:52 -0500 Subject: [PATCH 01/10] Trying out Lemmy. Yes I read the comment, actually need to upgrade the version else it won't compile --- .vscode/settings.json | 1 + nixos-apps/fancytypist.com.nix | 15 +++++++++------ server-config/configuration.nix | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 8d7b269..d9f5fd8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -27,6 +27,7 @@ "jitsi", "jquery", "keymap", + "lemmy", "longview", "maths", "mdformat", diff --git a/nixos-apps/fancytypist.com.nix b/nixos-apps/fancytypist.com.nix index 7f409f7..eed7ebd 100644 --- a/nixos-apps/fancytypist.com.nix +++ b/nixos-apps/fancytypist.com.nix @@ -26,12 +26,6 @@ in { ''; }; - "helpme.fancytypist.ca" = { - extraConfig = '' - respond "Welcome to only other subdomain...helpme!" - ''; - }; - "osds.fancytypist.dev" = { serverAliases = ["osds.fancytypist.dev"]; extraConfig = '' @@ -55,4 +49,13 @@ in { ''; }; }; + + services.lemmy = { + enable = true; + settings = { + hostname = "helpme.fancytypist.ca"; + database.createLocally = true; + }; + caddy.enable = true; + }; } diff --git a/server-config/configuration.nix b/server-config/configuration.nix index 7ea12fa..54ab20f 100644 --- a/server-config/configuration.nix +++ b/server-config/configuration.nix @@ -139,5 +139,5 @@ # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.05"; # Did you read the comment? + system.stateVersion = "25.11"; # Did you read the comment? } From 63224ce9173c2913fc79e29ee8bbd09fc66bffd5 Mon Sep 17 00:00:00 2001 From: Bill Ewanick Date: Sat, 3 Jan 2026 23:09:00 -0500 Subject: [PATCH 02/10] Downgrade to 25.11, more stable for server --- .pre-commit-config.yaml | 2 +- flake.lock | 8 ++++---- flake.nix | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 459e8a5..e2755be 120000 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1 +1 @@ -/nix/store/gr5dfsr20jqrim8w0lbhicgdnpwwwhs2-pre-commit-config.json \ No newline at end of file +/nix/store/30f0pr8v6hd0qy799gvjx6vw1zha8v8w-pre-commit-config.json \ No newline at end of file diff --git a/flake.lock b/flake.lock index dec88d9..559a94e 100644 --- a/flake.lock +++ b/flake.lock @@ -79,16 +79,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767364772, - "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", + "lastModified": 1767325753, + "narHash": "sha256-yA/CuWyqm+AQo2ivGy6PlYrjZBQm7jfbe461+4HF2fo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", + "rev": "64049ca74d63e971b627b5f3178d95642e61cedd", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index d4389f7..490df78 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Flake.parts System flake for Linode NixOS server"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; flake-parts.url = "github:hercules-ci/flake-parts"; git-hooks-nix.url = "github:cachix/git-hooks.nix"; From 5cb2dce159c6340df0a064c2afb2e0a9b891fadf Mon Sep 17 00:00:00 2001 From: Bill Ewanick Date: Sun, 4 Jan 2026 00:00:02 -0500 Subject: [PATCH 03/10] Switch to user services, for alice to run scripts, and use systemctl --user cuteseal... to find services. Runs much better --- nixos-apps/cutesealfanpage.love.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos-apps/cutesealfanpage.love.nix b/nixos-apps/cutesealfanpage.love.nix index aada46d..f708e36 100644 --- a/nixos-apps/cutesealfanpage.love.nix +++ b/nixos-apps/cutesealfanpage.love.nix @@ -14,7 +14,7 @@ in { }; }; - systemd.services = { + systemd.user.services = { cutesealfanpage-hakyll-site = { enable = true; description = "The hakyll executable that rebuilds the site when a new blog post is created."; From 203fad17d16fc65f98bac47c04c7e89289b59342 Mon Sep 17 00:00:00 2001 From: Bill Ewanick Date: Sun, 4 Jan 2026 01:07:50 -0500 Subject: [PATCH 04/10] Update running/testing for deployment scripts --- run.sh | 8 ++++---- test.sh | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) create mode 100755 test.sh diff --git a/run.sh b/run.sh index cf324c4..920deaf 100755 --- a/run.sh +++ b/run.sh @@ -1,6 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p bash -sudo nixos-rebuild \ - --option eval-cache false \ - --flake /workspace/deployed-nixos-server-and-apps \ - switch +sudo \ + nixos-rebuild switch \ + --option eval-cache false \ + --flake /workspace/deployed-nixos-server-and-apps#linode-nixos diff --git a/test.sh b/test.sh new file mode 100755 index 0000000..2467d4e --- /dev/null +++ b/test.sh @@ -0,0 +1,6 @@ +#! /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 From fb6d498ad5f2e58f93d733274268bc1b695709f1 Mon Sep 17 00:00:00 2001 From: Bill Ewanick Date: Sun, 4 Jan 2026 01:46:24 -0500 Subject: [PATCH 05/10] 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 From 2a05e1888bd9ed963f8c246f8b042b5c4962366e Mon Sep 17 00:00:00 2001 From: Bill Ewanick Date: Sun, 4 Jan 2026 02:12:20 -0500 Subject: [PATCH 06/10] Update some parts --- flake.nix | 5 ++--- nixos-apps/cutesealfanpage.love.nix | 2 +- nixos-apps/default.nix | 5 +++-- nixos-apps/ewanick.com.nix | 13 +++++++------ 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index 4db40ad..8c647a7 100644 --- a/flake.nix +++ b/flake.nix @@ -74,11 +74,10 @@ osds-site = { layers = [ { - # path = ./nixos-apps/ewanick.com; - # pathString = "nixos-apps/ewanick.com"; + path = ./nixos-apps/ewanick.com; + pathString = "nixos-apps/ewanick.com"; } ]; - baseUrl = "ewanick.com"; port = 5567; }; }; diff --git a/nixos-apps/cutesealfanpage.love.nix b/nixos-apps/cutesealfanpage.love.nix index f708e36..aada46d 100644 --- a/nixos-apps/cutesealfanpage.love.nix +++ b/nixos-apps/cutesealfanpage.love.nix @@ -14,7 +14,7 @@ in { }; }; - systemd.user.services = { + systemd.services = { cutesealfanpage-hakyll-site = { enable = true; description = "The hakyll executable that rebuilds the site when a new blog post is created."; diff --git a/nixos-apps/default.nix b/nixos-apps/default.nix index cdba9be..55f17e6 100644 --- a/nixos-apps/default.nix +++ b/nixos-apps/default.nix @@ -5,11 +5,12 @@ ./cutesealfanpage.love.nix - # ./ewanick.com.nix + ./ewanick.com.nix ./git.ewanick.com.nix - # ./paperless.ewanick.com.nix ./fancytypist.com.nix + + # ./paperless.ewanick.com.nix ]; # when in doubt, clear away the certs with diff --git a/nixos-apps/ewanick.com.nix b/nixos-apps/ewanick.com.nix index ed5fc1b..6c9ef71 100644 --- a/nixos-apps/ewanick.com.nix +++ b/nixos-apps/ewanick.com.nix @@ -3,7 +3,7 @@ PROJECT_ROOT = "/workspace/deployed-nixos-server-and-apps/nixos-apps/ewanick.com"; HOST = "localhost"; PORT = 5567; - emanote-version = "1.4.0"; + emanote-version = "1.4.0.0"; in { services.caddy = { enable = true; @@ -21,13 +21,14 @@ in { ewanick-site = { enable = true; description = "A blog powered by Emanote running solely on Markdown files."; - path = with pkgs; [ - nix - git - ]; + path = with pkgs; [nix git]; + wantedBy = ["multi-user.target"]; script = '' cd ${PROJECT_ROOT} - nix run github:srid/emanote/${emanote-version} -- run --port ${PORT} --host ${HOST} + nix run github:srid/emanote/${emanote-version} \ + -- run \ + --port ${toString PORT} \ + --host ${HOST} ''; }; }; From ee4ac1d7c81cfcba12dd3fb624ef6130bfae6fcd Mon Sep 17 00:00:00 2001 From: Bill Ewanick Date: Sun, 11 Jan 2026 23:37:09 -0500 Subject: [PATCH 07/10] Try using forgejo instead of gitea --- .vscode/settings.json | 1 + nixos-apps/git.ewanick.com.nix | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index d9f5fd8..64d45fa 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -14,6 +14,7 @@ "emanote", "Ewanick", "fancytypist", + "forgejo", "ghcid", "gitea", "gnused", diff --git a/nixos-apps/git.ewanick.com.nix b/nixos-apps/git.ewanick.com.nix index c91a73c..8dce372 100644 --- a/nixos-apps/git.ewanick.com.nix +++ b/nixos-apps/git.ewanick.com.nix @@ -2,9 +2,9 @@ baseUrl = "git.ewanick.com"; PROJECT_ROOT = "/workspace/deployed-nixos-server-and-apps/nixos-apps/git.ewanick.com"; in { - services.gitea = { + services.forgejo = { enable = true; - appName = "Bill's Gitea server, hosted on Linode using NixOS"; + database.type = "postgres"; lfs.enable = true; settings = { server = { @@ -12,6 +12,7 @@ in { ROOT_URL = "https://${baseUrl}/"; HTTP_PORT = 3000; }; + DEFAULT.APP_NAME = "Bill's Forgejo server, hosted on Linode using NixOS"; service.DISABLE_REGISTRATION = true; actions = { @@ -22,6 +23,7 @@ in { }; services.gitea-actions-runner = { + package = pkgs.forgejo-runner; instances.default = { enable = true; name = "linode-nixos"; From 4a38f292737d4e7758886b4654e004b0e84614c6 Mon Sep 17 00:00:00 2001 From: Bill Ewanick Date: Sun, 11 Jan 2026 23:44:36 -0500 Subject: [PATCH 08/10] Remove emanote from flake.parts --- flake.lock | 213 ----------------------------------------------------- flake.nix | 16 ---- 2 files changed, 229 deletions(-) diff --git a/flake.lock b/flake.lock index 2ffe7b1..559a94e 100644 --- a/flake.lock +++ b/flake.lock @@ -1,106 +1,5 @@ { "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": { @@ -135,37 +34,6 @@ "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", @@ -209,69 +77,6 @@ "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, @@ -305,7 +110,6 @@ }, "root": { "inputs": { - "emanote": "emanote", "flake-parts": "flake-parts", "git-hooks-nix": "git-hooks-nix", "nixpkgs": "nixpkgs", @@ -331,23 +135,6 @@ "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 8c647a7..490df78 100644 --- a/flake.nix +++ b/flake.nix @@ -5,9 +5,6 @@ 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"; @@ -21,7 +18,6 @@ # 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 ]; @@ -70,18 +66,6 @@ # 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"; - } - ]; - port = 5567; - }; - }; - # Equivalent to inputs'.nixpkgs.legacyPackages.hello; # packages.default = pkgs.hello; From 536bf095b95e728d90ce1642aae9cbfdb5c4943e Mon Sep 17 00:00:00 2001 From: Bill Ewanick Date: Mon, 12 Jan 2026 00:07:36 -0500 Subject: [PATCH 09/10] Remove emanote from everything --- nixos-apps/ewanick.com.nix | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/nixos-apps/ewanick.com.nix b/nixos-apps/ewanick.com.nix index 6c9ef71..f743538 100644 --- a/nixos-apps/ewanick.com.nix +++ b/nixos-apps/ewanick.com.nix @@ -1,9 +1,8 @@ {pkgs, ...}: let - description = "A blog powered by Emanote running solely on Markdown files."; + description = "A future blog powered running solely on Markdown files."; PROJECT_ROOT = "/workspace/deployed-nixos-server-and-apps/nixos-apps/ewanick.com"; HOST = "localhost"; PORT = 5567; - emanote-version = "1.4.0.0"; in { services.caddy = { enable = true; @@ -16,20 +15,4 @@ in { }; }; }; - - systemd.services = { - ewanick-site = { - enable = true; - description = "A blog powered by Emanote running solely on Markdown files."; - path = with pkgs; [nix git]; - wantedBy = ["multi-user.target"]; - script = '' - cd ${PROJECT_ROOT} - nix run github:srid/emanote/${emanote-version} \ - -- run \ - --port ${toString PORT} \ - --host ${HOST} - ''; - }; - }; } From 43327a567e597b92caee6bfce5737a335dcbb46f Mon Sep 17 00:00:00 2001 From: Bill Ewanick Date: Mon, 12 Jan 2026 00:13:03 -0500 Subject: [PATCH 10/10] Update runner script --- test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.sh b/test.sh index 81a6d38..f2b3c71 100755 --- a/test.sh +++ b/test.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p bash -nixos-rebuild test \ +nixos-rebuild build \ --option eval-cache false \ --flake /workspace/deployed-nixos-server-and-apps#linode-nixos