From b80c7eef65ce7e4cd61b0d1aa466a1407a2959c1 Mon Sep 17 00:00:00 2001 From: Leonard-Orlando Menzel <79226837+lomenzel@users.noreply.github.com> Date: Mon, 28 Jul 2025 18:49:32 +0000 Subject: [PATCH 1/3] maintainers: add Leonard Menzel --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b41f0ee6bdf9..64e96b14c8ae 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14617,6 +14617,13 @@ name = "legendofmiracles"; keys = [ { fingerprint = "CC50 F82C 985D 2679 0703 AF15 19B0 82B3 DEFE 5451"; } ]; }; + lomenzel = { + name = "Leonard-Orlando Menzel"; + email = "leonard.menzel@tutanota.com"; + matrix = "@leonard:menzel.lol"; + github = "lomenzel"; + githubId = 79226837; + }; lonerOrz = { email = "2788892716@qq.com"; name = "lonerOrz"; From 62c24fa98c16cf031a44a5bd38f5e9aad876b71c Mon Sep 17 00:00:00 2001 From: Leonard-Orlando Jonathan Menzel Date: Fri, 19 Sep 2025 10:56:12 +0000 Subject: [PATCH 2/3] ankiAddons: always create user_files --- pkgs/games/anki/addons/anki-utils.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/games/anki/addons/anki-utils.nix b/pkgs/games/anki/addons/anki-utils.nix index 56096cf0f4c0..f27d4f511c57 100644 --- a/pkgs/games/anki/addons/anki-utils.nix +++ b/pkgs/games/anki/addons/anki-utils.nix @@ -54,7 +54,7 @@ installPhase = '' runHook preInstall - mkdir -p "$out/$installPrefix" + mkdir -p "$out/$installPrefix/user_files" find . -mindepth 1 -maxdepth 1 | xargs -d'\n' mv -t "$out/$installPrefix/" runHook postInstall @@ -89,7 +89,6 @@ rm -f meta.json ln -s ${addonMetaConfig} meta.json - mkdir -p user_files ${ if (userFiles != null) then '' From 1553eb90fddb488527be385d5ae60eb9983806f2 Mon Sep 17 00:00:00 2001 From: Leonard-Orlando Jonathan Menzel Date: Fri, 19 Sep 2025 21:51:17 +0000 Subject: [PATCH 3/3] ankiAddons.puppy-reinforcement: init at 1.1.1 --- pkgs/games/anki/addons/default.nix | 2 + .../addons/puppy-reinforcement/default.nix | 39 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/games/anki/addons/puppy-reinforcement/default.nix diff --git a/pkgs/games/anki/addons/default.nix b/pkgs/games/anki/addons/default.nix index d602b1ea877e..67799dbc771d 100644 --- a/pkgs/games/anki/addons/default.nix +++ b/pkgs/games/anki/addons/default.nix @@ -10,6 +10,8 @@ passfail2 = callPackage ./passfail2 { }; + puppy-reinforcement = callPackage ./puppy-reinforcement { }; + recolor = callPackage ./recolor { }; reviewer-refocus-card = callPackage ./reviewer-refocus-card { }; diff --git a/pkgs/games/anki/addons/puppy-reinforcement/default.nix b/pkgs/games/anki/addons/puppy-reinforcement/default.nix new file mode 100644 index 000000000000..f4550d60bec8 --- /dev/null +++ b/pkgs/games/anki/addons/puppy-reinforcement/default.nix @@ -0,0 +1,39 @@ +{ + lib, + anki-utils, + fetchFromGitHub, + nix-update-script, +}: +anki-utils.buildAnkiAddon (finalAttrs: { + pname = "puppy-reinforcement"; + version = "1.1.1"; + src = fetchFromGitHub { + owner = "glutanimate"; + repo = "puppy-reinforcement"; + tag = "v${finalAttrs.version}"; + hash = "sha256-y52AjmYrFTcTwd4QAcJzK5R9wwxUSlvnN3C2O/r5cHk="; + }; + sourceRoot = "${finalAttrs.src.name}/src/puppy_reinforcement"; + passthru.updateScript = nix-update-script { }; + meta = { + description = "Encourage learners with pictures of cute puppies"; + longDescription = '' + The options to configure this add-on can be found [here](https://github.com/glutanimate/puppy-reinforcement/blob/v${finalAttrs.version}/src/puppy_reinforcement/config.md). + Extra images can also be added with `userFiles`. + + Example: + + ```nix + pkgs.ankiAddons.puppy-reinforcement.withConfig { + config = { + encourage_every = 5; + }; + userFiles = ./my-folder-of-the-most-cute-dogos; + } + ``` + ''; + homepage = "https://ankiweb.net/shared/info/1722658993"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ lomenzel ]; + }; +})