From f854b9a0553ac0f13e9ea5f04db9a6763eec4570 Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Thu, 15 Jan 2026 10:41:22 -0500 Subject: [PATCH 1/5] omnom: add changelog, downloadPage Signed-off-by: Ethan Carter Edwards --- pkgs/by-name/om/omnom/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/om/omnom/package.nix b/pkgs/by-name/om/omnom/package.nix index 77df852fc292..11cb12a4f0c1 100644 --- a/pkgs/by-name/om/omnom/package.nix +++ b/pkgs/by-name/om/omnom/package.nix @@ -85,7 +85,9 @@ buildGoModule (finalAttrs: { meta = { description = "Webpage bookmarking and snapshotting service"; - homepage = "https://github.com/asciimoo/omnom"; + homepage = "https://omnom.zone/"; + downloadPage = "https://github.com/asciimoo/omnom"; + changelog = "https://github.com/asciimoo/omnom/releases/tag/v${finalAttrs.version}"; license = lib.licenses.agpl3Only; teams = [ lib.teams.ngi ]; mainProgram = "omnom"; From 013a105c8318ba769c3e3eb2fad5a92925da03ba Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Thu, 15 Jan 2026 10:36:58 -0500 Subject: [PATCH 2/5] omnom: 0.7.0 -> 0.8.0 Changelog: https://github.com/asciimoo/omnom/releases/tag/v0.8.0 Signed-off-by: Ethan Carter Edwards --- pkgs/by-name/om/omnom/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/om/omnom/package.nix b/pkgs/by-name/om/omnom/package.nix index 11cb12a4f0c1..633ed7189977 100644 --- a/pkgs/by-name/om/omnom/package.nix +++ b/pkgs/by-name/om/omnom/package.nix @@ -13,17 +13,17 @@ buildGoModule (finalAttrs: { pname = "omnom"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "asciimoo"; repo = "omnom"; tag = "v${finalAttrs.version}"; - hash = "sha256-auujlRG3RKJYYTi/iptx0Y3Yzqmt6i9AlfjVcqn5YPc="; + hash = "sha256-Txqla3fivQdM8oQYGlyaYhSQhBLJRykWkftdmkHxlu8="; fetchSubmodules = true; }; - vendorHash = "sha256-0usbfvGz+9chLGyHHUUStUh7x91ZGfr/+gAXXVA5iNc="; + vendorHash = "sha256-meToyr93nmKLZ//h8Gc0rp2hc4vOV9ULU+FbBXmbDv8="; passthru.updateScript = nix-update-script { }; @@ -51,7 +51,7 @@ buildGoModule (finalAttrs: { pname = "omnom-addons"; inherit (finalAttrs) version src; - npmDepsHash = "sha256-sUn5IvcHWJ/yaqeGz9SGvGx9HHAlrcnS0lJxIxUVS6M="; + npmDepsHash = "sha256-CIzp6/mBTuSaEFv0lk3d/GZyq1VRDvCSoqrujz4AG/E="; sourceRoot = "${finalAttrs'.src.name}/ext"; npmPackFlags = [ "--ignore-scripts" ]; From 47b4216f78242cdc93c225cb7bd7f03528ca5997 Mon Sep 17 00:00:00 2001 From: eljamm Date: Wed, 28 Jan 2026 10:26:28 +0100 Subject: [PATCH 3/5] omnom: 0.8.0 -> 0.9.0 Changelog: https://github.com/asciimoo/omnom/releases/tag/v0.9.0 --- pkgs/by-name/om/omnom/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/om/omnom/package.nix b/pkgs/by-name/om/omnom/package.nix index 633ed7189977..bd2ff886101f 100644 --- a/pkgs/by-name/om/omnom/package.nix +++ b/pkgs/by-name/om/omnom/package.nix @@ -13,13 +13,13 @@ buildGoModule (finalAttrs: { pname = "omnom"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "asciimoo"; repo = "omnom"; tag = "v${finalAttrs.version}"; - hash = "sha256-Txqla3fivQdM8oQYGlyaYhSQhBLJRykWkftdmkHxlu8="; + hash = "sha256-cG+cAsarbDqi3BLrIiSnH4VQS0fdfyMgkvbQvzKUXNw="; fetchSubmodules = true; }; From a94e91b5513a4e078d977654d96ef156b73c6c9c Mon Sep 17 00:00:00 2001 From: eljamm Date: Wed, 28 Jan 2026 10:24:00 +0100 Subject: [PATCH 4/5] nixos/modules: add option for omnom's base_url setting which became mandatory starting from version `0.8.0`. --- nixos/modules/services/misc/omnom.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nixos/modules/services/misc/omnom.nix b/nixos/modules/services/misc/omnom.nix index 6e157ca3b014..48d7a326d3ac 100644 --- a/nixos/modules/services/misc/omnom.nix +++ b/nixos/modules/services/misc/omnom.nix @@ -92,6 +92,18 @@ in "127.0.0.1:''${config.services.omnom.port}" ''; }; + # NOTE: this can't be empty, because it will be overwritten by + # Omnom's internal default config. + base_url = lib.mkOption { + type = lib.types.str; + internal = true; + default = "http://127.0.0.1:${toString cfg.port}/"; + description = "Full server URL."; + example = "https://local.omnom/xy/"; + defaultText = lib.literalExpression '' + "http://''${config.services.omnom.settings.server.address}/" + ''; + }; secure_cookie = lib.mkOption { type = lib.types.bool; default = true; From cfc02bae23b2bc2bdc30d9c26c7695fbf2ad6d0d Mon Sep 17 00:00:00 2001 From: eljamm Date: Wed, 28 Jan 2026 14:56:47 +0100 Subject: [PATCH 5/5] nixos/tests: fix omnom xdotool coordinates --- nixos/tests/omnom/default.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/nixos/tests/omnom/default.nix b/nixos/tests/omnom/default.nix index 6f115037aca5..c90e6cfff595 100644 --- a/nixos/tests/omnom/default.nix +++ b/nixos/tests/omnom/default.nix @@ -28,18 +28,18 @@ def open_omnom(): # Add-ons Manager - server.succeed("xdotool mousemove --sync 960 90 click 1") + server.succeed("xdotool mousemove --sync 1221 83 click 1") server.sleep(10) # omnom - server.succeed("xdotool mousemove --sync 700 190 click 1") + server.succeed("xdotool mousemove --sync 877 184 click 1") server.sleep(10) - service_url = "http://127.0.0.1:${toString port}" + service_url = "http://127.0.0.1:${port}/" server.start() server.wait_for_unit("omnom.service") - server.wait_for_open_port(${toString port}) + server.wait_for_open_port(${port}) server.succeed(f"curl -sf '{service_url}'") output = server.succeed("omnom create-user user user@example.com") @@ -59,23 +59,23 @@ open_omnom() # token - server.succeed("xdotool mousemove --sync 700 350 click 1") + server.succeed("xdotool mousemove --sync 943 345 click 1") server.succeed(f"xdotool type {token}") server.sleep(10) # url - server.succeed("xdotool mousemove --sync 700 470 click 1") + server.succeed("xdotool mousemove --sync 943 452 click 1") server.succeed(f"xdotool type '{service_url}'") server.sleep(10) # submit - server.succeed("xdotool mousemove --sync 900 520 click 1") + server.succeed("xdotool mousemove --sync 1156 485 click 1") server.sleep(10) open_omnom() # save - server.succeed("xdotool mousemove --sync 900 520 click 1") + server.succeed("xdotool mousemove --sync 1151 459 click 1") server.sleep(10) # refresh @@ -85,19 +85,19 @@ server.screenshot("home.png") # view bookmarks - server.succeed("xdotool mousemove --sync 300 130 click 1") + server.succeed("xdotool mousemove --sync 377 133 click 1") server.sleep(10) # view snapshot - server.succeed("xdotool mousemove --sync 970 230 click 1") + server.succeed("xdotool mousemove --sync 414 307 click 1") server.sleep(10) - server.succeed("xdotool mousemove --sync 160 340 click 1") + server.succeed("xdotool mousemove --sync 993 510 click 1") server.sleep(10) server.screenshot("screenshot.png") # view details - server.succeed("xdotool mousemove --sync 290 200 click 1") + server.succeed("xdotool mousemove --sync 400 230 click 1") server.sleep(10) server.screenshot("snapshot_details.png")