From 19089ad9cce4e804a6d2f26d0dbf44f6092faa1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?James=20=E2=80=98Twey=E2=80=99=20Kay?= <twey@twey.co.uk>
Date: Wed, 9 Oct 2024 12:52:36 +0100
Subject: [PATCH 01/11] python3Packages.rtf-tokenize: init at 1.0.0

---
 .../python-modules/rtf-tokenize/default.nix   | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/python-modules/rtf-tokenize/default.nix

diff --git a/pkgs/development/python-modules/rtf-tokenize/default.nix b/pkgs/development/python-modules/rtf-tokenize/default.nix
new file mode 100644
index 000000000000000..fa002c4a9e94c8e
--- /dev/null
+++ b/pkgs/development/python-modules/rtf-tokenize/default.nix
@@ -0,0 +1,21 @@
+{
+  lib,
+  fetchPypi,
+  python3Packages,
+}:
+python3Packages.buildPythonPackage rec {
+  pname = "rtf-tokenize";
+  version = "1.0.0";
+
+  meta = with lib; {
+    description = "A simple RTF tokenizer";
+    maintainers = with maintainers; [ twey ];
+    license = licenses.gpl2Plus;
+  };
+
+  src = fetchPypi {
+    pname = "rtf_tokenize";
+    inherit version;
+    hash = "sha256-XD3zkNAEeb12N8gjv81v37Id3RuWroFUY95+HtOS1gg=";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1e667c9a029eca4..126baba56b87ee9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13837,6 +13837,8 @@ self: super: with self; {
 
   rstr = callPackage ../development/python-modules/rstr { };
 
+  rtf-tokenize = callPackage ../development/python-modules/rtf-tokenize { };
+
   rtmidi-python = callPackage ../development/python-modules/rtmidi-python {
     inherit (pkgs.darwin.apple_sdk.frameworks) CoreAudio CoreMIDI CoreServices;
   };

From 1bff1830bb405376a746c1c26f43c25a7dcdc444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?James=20=E2=80=98Twey=E2=80=99=20Kay?= <twey@twey.co.uk>
Date: Wed, 9 Oct 2024 12:53:29 +0100
Subject: [PATCH 02/11] python3Packages.plover-stroke: init at 1.1.0

---
 .../python-modules/plover-stroke/default.nix  | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/python-modules/plover-stroke/default.nix

diff --git a/pkgs/development/python-modules/plover-stroke/default.nix b/pkgs/development/python-modules/plover-stroke/default.nix
new file mode 100644
index 000000000000000..82afe67d877dfda
--- /dev/null
+++ b/pkgs/development/python-modules/plover-stroke/default.nix
@@ -0,0 +1,24 @@
+{
+  lib,
+  fetchPypi,
+  python3Packages,
+  setuptools,
+}:
+python3Packages.buildPythonPackage rec {
+  pname = "plover-stroke";
+  version = "1.1.0";
+  pyproject = true;
+  build-system = [ setuptools ];
+
+  meta = with lib; {
+    description = "Helper class for working with steno strokes";
+    maintainers = with maintainers; [ twey ];
+    license = licenses.gpl2Plus;
+  };
+
+  src = fetchPypi {
+    pname = "plover_stroke";
+    inherit version;
+    hash = "sha256-3gOyP0ruZrZfaffU7MQjNoG0NUFQLYa/FP3inqpy0VM=";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 126baba56b87ee9..c1c566d2a8b7f7d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9892,6 +9892,8 @@ self: super: with self; {
 
   pkg-about = callPackage ../development/python-modules/pkg-about { };
 
+  plover-stroke = callPackage ../development/python-modules/plover-stroke { };
+
   micloud = callPackage ../development/python-modules/micloud { };
 
   mqtt2influxdb = callPackage ../development/python-modules/mqtt2influxdb { };

From 639008470c0ec267f31846a8845d820f3bafb6ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?James=20=E2=80=98Twey=E2=80=99=20Kay?= <twey@twey.co.uk>
Date: Wed, 9 Oct 2024 12:53:46 +0100
Subject: [PATCH 03/11] plover: 4.0.0.dev10 -> 4.0.0rc2

---
 pkgs/applications/misc/plover/default.nix | 88 +++++++++++++++--------
 pkgs/top-level/all-packages.nix           |  4 +-
 2 files changed, 61 insertions(+), 31 deletions(-)

diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix
index 65161d713f29a98..f4fcdcb1648c9cc 100644
--- a/pkgs/applications/misc/plover/default.nix
+++ b/pkgs/applications/misc/plover/default.nix
@@ -1,37 +1,65 @@
-{ lib, fetchFromGitHub, python3Packages, wmctrl, qtbase, mkDerivationWith }:
-
 {
-  stable = throw "plover.stable was removed because it used Python 2. Use plover.dev instead."; # added 2022-06-05
-
-  dev = with python3Packages; mkDerivationWith buildPythonPackage rec {
-    pname = "plover";
-    version = "4.0.0.dev10";
-
-    meta = with lib; {
-      broken = stdenv.hostPlatform.isDarwin;
-      description = "OpenSteno Plover stenography software";
-      maintainers = with maintainers; [ twey kovirobi ];
-      license     = licenses.gpl2;
-    };
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  wmctrl,
+  buildPythonPackage,
+  pytest,
+  mock,
+  babel,
+  pyqt5,
+  xlib,
+  pyserial,
+  appdirs,
+  wcwidth,
+  setuptools,
+  rtf-tokenize,
+  plover-stroke,
+  wrapQtAppsHook,
+}:
+buildPythonPackage rec {
+  pname = "plover";
+  version = "4.0.0rc2";
 
-    src = fetchFromGitHub {
-      owner = "openstenoproject";
-      repo = "plover";
-      rev = "v${version}";
-      sha256 = "sha256-oJ7+R3ZWhUbNTTAw1AfMg2ur8vW1XEbsa5FgSTam1Ns=";
-    };
+  meta = with lib; {
+    broken = stdenv.hostPlatform.isDarwin;
+    description = "OpenSteno Plover stenography software";
+    maintainers = with maintainers; [
+      twey
+      kovirobi
+    ];
+    license = licenses.gpl2;
+  };
 
-    # I'm not sure why we don't find PyQt5 here but there's a similar
-    # sed on many of the platforms Plover builds for
-    postPatch = "sed -i /PyQt5/d setup.cfg";
+  src = fetchFromGitHub {
+    owner = "openstenoproject";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-rmMec/BbvOJ92u8Tmp3Kv2YezzJxB/L8UrDntTDSKj4=";
+  };
 
-    nativeCheckInputs           = [ pytest mock ];
-    propagatedBuildInputs = [ babel pyqt5 xlib pyserial appdirs wcwidth setuptools ];
+  # I'm not sure why we don't find PyQt5 here but there's a similar
+  # sed on many of the platforms Plover builds for
+  postPatch = "sed -i /PyQt5/d setup.cfg";
 
-    dontWrapQtApps = true;
+  nativeCheckInputs = [
+    pytest
+    mock
+  ];
+  nativeBuildInputs = [ wrapQtAppsHook ];
+  propagatedBuildInputs = [
+    babel
+    pyqt5
+    xlib
+    pyserial
+    appdirs
+    wcwidth
+    setuptools
+    rtf-tokenize
+    plover-stroke
+  ];
 
-    preFixup = ''
-      makeWrapperArgs+=("''${qtWrapperArgs[@]}")
-    '';
-  };
+  preFixup = ''
+    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+  '';
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89f44b0675e725e..04a4c22cb3afa28 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31986,7 +31986,9 @@ with pkgs;
 
   plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { };
 
-  plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { });
+  plover = python3Packages.callPackage ../applications/misc/plover {
+    inherit (libsForQt5) wrapQtAppsHook;
+  };
 
   plugdata = callPackage ../applications/audio/plugdata { };
 

From 1ed5f3428e744517ffb53efe1f1c77a365213ed7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?James=20=E2=80=98Twey=E2=80=99=20Kay?= <twey@twey.co.uk>
Date: Tue, 8 Oct 2024 22:23:19 +0100
Subject: [PATCH 04/11] plover: move to pythonPackages

---
 .../python-modules}/plover/default.nix        | 24 ++++---------------
 pkgs/top-level/all-packages.nix               |  4 +---
 pkgs/top-level/python-packages.nix            |  4 ++++
 3 files changed, 9 insertions(+), 23 deletions(-)
 rename pkgs/{applications/misc => development/python-modules}/plover/default.nix (74%)

diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/development/python-modules/plover/default.nix
similarity index 74%
rename from pkgs/applications/misc/plover/default.nix
rename to pkgs/development/python-modules/plover/default.nix
index f4fcdcb1648c9cc..2b0ad949724a9b3 100644
--- a/pkgs/applications/misc/plover/default.nix
+++ b/pkgs/development/python-modules/plover/default.nix
@@ -24,11 +24,8 @@ buildPythonPackage rec {
   meta = with lib; {
     broken = stdenv.hostPlatform.isDarwin;
     description = "OpenSteno Plover stenography software";
-    maintainers = with maintainers; [
-      twey
-      kovirobi
-    ];
-    license = licenses.gpl2;
+    maintainers = with maintainers; [ twey kovirobi ];
+    license     = licenses.gpl2;
   };
 
   src = fetchFromGitHub {
@@ -42,22 +39,9 @@ buildPythonPackage rec {
   # sed on many of the platforms Plover builds for
   postPatch = "sed -i /PyQt5/d setup.cfg";
 
-  nativeCheckInputs = [
-    pytest
-    mock
-  ];
+  nativeCheckInputs = [ pytest mock ];
   nativeBuildInputs = [ wrapQtAppsHook ];
-  propagatedBuildInputs = [
-    babel
-    pyqt5
-    xlib
-    pyserial
-    appdirs
-    wcwidth
-    setuptools
-    rtf-tokenize
-    plover-stroke
-  ];
+  propagatedBuildInputs = [ babel pyqt5 xlib pyserial appdirs wcwidth setuptools rtf-tokenize plover-stroke ];
 
   preFixup = ''
     makeWrapperArgs+=("''${qtWrapperArgs[@]}")
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04a4c22cb3afa28..aac405384dcca39 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31986,9 +31986,7 @@ with pkgs;
 
   plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { };
 
-  plover = python3Packages.callPackage ../applications/misc/plover {
-    inherit (libsForQt5) wrapQtAppsHook;
-  };
+  plover = python3Packages.plover;
 
   plugdata = callPackage ../applications/audio/plugdata { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c1c566d2a8b7f7d..ed6712ea9d90352 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9892,6 +9892,10 @@ self: super: with self; {
 
   pkg-about = callPackage ../development/python-modules/pkg-about { };
 
+  plover = callPackage ../development/python-modules/plover {
+    inherit (pkgs.libsForQt5) wrapQtAppsHook;
+  };
+
   plover-stroke = callPackage ../development/python-modules/plover-stroke { };
 
   micloud = callPackage ../development/python-modules/micloud { };

From cb217abbbf1b749db1cdb13644c97332e97de140 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?James=20=E2=80=98Twey=E2=80=99=20Kay?= <twey@twey.co.uk>
Date: Tue, 8 Oct 2024 22:25:17 +0100
Subject: [PATCH 05/11] python3Packages.plover: allow for plugins

---
 .../python-modules/plover/default.nix         | 79 +++++++++++++------
 1 file changed, 55 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/python-modules/plover/default.nix b/pkgs/development/python-modules/plover/default.nix
index 2b0ad949724a9b3..04993476eda918b 100644
--- a/pkgs/development/python-modules/plover/default.nix
+++ b/pkgs/development/python-modules/plover/default.nix
@@ -3,6 +3,7 @@
   lib,
   fetchFromGitHub,
   wmctrl,
+  python3Packages,
   buildPythonPackage,
   pytest,
   mock,
@@ -17,33 +18,63 @@
   plover-stroke,
   wrapQtAppsHook,
 }:
-buildPythonPackage rec {
-  pname = "plover";
-  version = "4.0.0rc2";
+let
+  plover = python3Packages.buildPythonPackage rec {
+    pname = "plover";
+    version = "4.0.0rc2";
+    pyproject = true;
+    build-system = [ setuptools ];
 
-  meta = with lib; {
-    broken = stdenv.hostPlatform.isDarwin;
-    description = "OpenSteno Plover stenography software";
-    maintainers = with maintainers; [ twey kovirobi ];
-    license     = licenses.gpl2;
-  };
+    meta = with lib; {
+      broken = stdenv.hostPlatform.isDarwin;
+      description = "OpenSteno Plover stenography software";
+      maintainers = with maintainers; [
+        twey
+        kovirobi
+      ];
+      license = licenses.gpl2;
+    };
 
-  src = fetchFromGitHub {
-    owner = "openstenoproject";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-rmMec/BbvOJ92u8Tmp3Kv2YezzJxB/L8UrDntTDSKj4=";
-  };
+    src = fetchFromGitHub {
+      owner = "openstenoproject";
+      repo = pname;
+      rev = "v${version}";
+      sha256 = "sha256-rmMec/BbvOJ92u8Tmp3Kv2YezzJxB/L8UrDntTDSKj4=";
+    };
 
-  # I'm not sure why we don't find PyQt5 here but there's a similar
-  # sed on many of the platforms Plover builds for
-  postPatch = "sed -i /PyQt5/d setup.cfg";
+    # I'm not sure why we don't find PyQt5 here but there's a similar
+    # sed on many of the platforms Plover builds for
+    postPatch = "sed -i /PyQt5/d setup.cfg";
 
-  nativeCheckInputs = [ pytest mock ];
-  nativeBuildInputs = [ wrapQtAppsHook ];
-  propagatedBuildInputs = [ babel pyqt5 xlib pyserial appdirs wcwidth setuptools rtf-tokenize plover-stroke ];
+    nativeCheckInputs = [
+      pytest
+      mock
+    ];
+    nativeBuildInputs = [ wrapQtAppsHook ];
+    propagatedBuildInputs = [
+      babel
+      pyqt5
+      xlib
+      pyserial
+      appdirs
+      wcwidth
+      setuptools
+      rtf-tokenize
+      plover-stroke
+    ];
+
+    preFixup = ''
+      makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+    '';
+  };
 
-  preFixup = ''
-    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
-  '';
+  plugins = lib.attrsets.mapAttrs' (name: value: {
+    name = builtins.substring 7 (builtins.stringLength name) name;
+    inherit value;
+  }) (lib.attrsets.filterAttrs (k: v: lib.strings.hasPrefix "plover-" k) python3Packages);
+in
+plover
+// {
+  inherit plugins;
+  withPlugins = ps: python3Packages.python.withPackages (_: ps plugins);
 }

From b2e52d8b14a059a5ada33c6cdd3da0308ef1d28d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?James=20=E2=80=98Twey=E2=80=99=20Kay?= <twey@twey.co.uk>
Date: Wed, 9 Oct 2024 12:55:40 +0100
Subject: [PATCH 06/11] python3Packages.plover-stitching: init at 0.1.0

---
 .../plover-stitching/default.nix              | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/plover-stitching/default.nix

diff --git a/pkgs/development/python-modules/plover-stitching/default.nix b/pkgs/development/python-modules/plover-stitching/default.nix
new file mode 100644
index 000000000000000..22c68233d987cf2
--- /dev/null
+++ b/pkgs/development/python-modules/plover-stitching/default.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  fetchPypi,
+  python3Packages,
+  plover,
+  setuptools,
+  pythonImportsCheckHook,
+}:
+python3Packages.buildPythonPackage rec {
+  pname = "plover-stitching";
+  version = "0.1.0";
+  pyproject = true;
+  build-system = [ setuptools ];
+
+  meta = with lib; {
+    description = "Write stitched words like T-H-I-S or define stitched sequences like heh-heh-heh";
+    maintainers = with maintainers; [ twey ];
+    license = licenses.gpl2Plus;
+  };
+
+  src = fetchPypi {
+    pname = "plover_stitching";
+    inherit version;
+    hash = "sha256-08wsVTf89kKattOM0Uj/R/heW9zSX7JQBcza8aJJwxc=";
+  };
+
+  # pytestCheckHook disabled because tests rely on an old Plover
+  # testing API
+  nativeCheckInputs = [
+    pythonImportsCheckHook
+  ];
+
+  propagatedBuildInputs = [ plover ];
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ed6712ea9d90352..81f00d5bc68f979 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9896,6 +9896,8 @@ self: super: with self; {
     inherit (pkgs.libsForQt5) wrapQtAppsHook;
   };
 
+  plover-stitching = callPackage ../development/python-modules/plover-stitching { };
+
   plover-stroke = callPackage ../development/python-modules/plover-stroke { };
 
   micloud = callPackage ../development/python-modules/micloud { };

From 77bd8f9cb0c9fabf419cdb4fea75a29861cdf1a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?James=20=E2=80=98Twey=E2=80=99=20Kay?= <twey@twey.co.uk>
Date: Wed, 9 Oct 2024 12:56:41 +0100
Subject: [PATCH 07/11] python3Packages.plover-dict-commands: init at 0.2.5

---
 .../plover-dict-commands/default.nix          | 36 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/python-modules/plover-dict-commands/default.nix

diff --git a/pkgs/development/python-modules/plover-dict-commands/default.nix b/pkgs/development/python-modules/plover-dict-commands/default.nix
new file mode 100644
index 000000000000000..2fe631d05ebbbe4
--- /dev/null
+++ b/pkgs/development/python-modules/plover-dict-commands/default.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  fetchPypi,
+  python3Packages,
+  plover,
+  setuptools,
+  setuptools-scm,
+  pythonImportsCheckHook,
+}:
+python3Packages.buildPythonPackage rec {
+  pname = "plover-dict-commands";
+  version = "0.2.5";
+  pyproject = true;
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  meta = with lib; {
+    description = "Plugin for enabling, disabling, and changing the priority of dictionaries in Plover";
+    maintainers = with maintainers; [ twey ];
+    license = licenses.gpl2Plus;
+  };
+
+  src = fetchPypi {
+    pname = "plover_dict_commands";
+    inherit version;
+    hash = "sha256-ki/M5V106YbQMjZQmkTNyBzFboVYi/x0hkLAXqPyk8Q=";
+  };
+
+  nativeCheckInputs = [
+    pythonImportsCheckHook
+  ];
+
+  propagatedBuildInputs = [ plover ];
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 81f00d5bc68f979..0c86778d5ffb644 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9896,6 +9896,8 @@ self: super: with self; {
     inherit (pkgs.libsForQt5) wrapQtAppsHook;
   };
 
+  plover-dict-commands = callPackage ../development/python-modules/plover-dict-commands { };
+
   plover-stitching = callPackage ../development/python-modules/plover-stitching { };
 
   plover-stroke = callPackage ../development/python-modules/plover-stroke { };

From b5225ba54808e1bd1e287cdc1194ffca90bf7ef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?James=20=E2=80=98Twey=E2=80=99=20Kay?= <twey@twey.co.uk>
Date: Wed, 9 Oct 2024 12:57:26 +0100
Subject: [PATCH 08/11] python3Packages.plover-last-translation: init at 0.0.2

---
 .../plover-last-translation/default.nix       | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/python-modules/plover-last-translation/default.nix

diff --git a/pkgs/development/python-modules/plover-last-translation/default.nix b/pkgs/development/python-modules/plover-last-translation/default.nix
new file mode 100644
index 000000000000000..becd0a96797b371
--- /dev/null
+++ b/pkgs/development/python-modules/plover-last-translation/default.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  fetchPypi,
+  python3Packages,
+  plover,
+  setuptools,
+  pythonImportsCheckHook,
+}:
+python3Packages.buildPythonPackage rec {
+  pname = "plover-last-translation";
+  version = "0.0.2";
+  pyproject = true;
+  build-system = [ setuptools ];
+
+  meta = with lib; {
+    description = "Macro plugins for Plover to repeat output";
+    maintainers = with maintainers; [ twey ];
+    license = licenses.gpl2Plus;
+  };
+
+  src = fetchPypi {
+    pname = "plover_last_translation";
+    inherit version;
+    hash = "sha256-lmgjbuwdqZ8eeU4m/d1akFwwj5CmliEaLmXEKAubjdk=";
+  };
+
+  nativeCheckInputs = [
+    pythonImportsCheckHook
+  ];
+
+  propagatedBuildInputs = [ plover ];
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0c86778d5ffb644..0f30954a7dcb6e7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9898,6 +9898,8 @@ self: super: with self; {
 
   plover-dict-commands = callPackage ../development/python-modules/plover-dict-commands { };
 
+  plover-last-translation = callPackage ../development/python-modules/plover-last-translation { };
+
   plover-stitching = callPackage ../development/python-modules/plover-stitching { };
 
   plover-stroke = callPackage ../development/python-modules/plover-stroke { };

From 37d3a6b556603e8af18c15e64f3620ae85bd6b85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?James=20=E2=80=98Twey=E2=80=99=20Kay?= <twey@twey.co.uk>
Date: Wed, 9 Oct 2024 12:58:35 +0100
Subject: [PATCH 09/11] python3Packages.plover-modal-dictionary: init at 0.0.3

---
 .../plover-modal-dictionary/default.nix       | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/plover-modal-dictionary/default.nix

diff --git a/pkgs/development/python-modules/plover-modal-dictionary/default.nix b/pkgs/development/python-modules/plover-modal-dictionary/default.nix
new file mode 100644
index 000000000000000..4bb434e23aeae64
--- /dev/null
+++ b/pkgs/development/python-modules/plover-modal-dictionary/default.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  fetchPypi,
+  python3Packages,
+  plover,
+  setuptools,
+  pythonImportsCheckHook,
+}:
+python3Packages.buildPythonPackage rec {
+  pname = "plover-modal-dictionary";
+  version = "0.0.3";
+  pyproject = true;
+  build-system = [ setuptools ];
+
+  meta = with lib; {
+    description = "Modal Dictionaries for Plover";
+    maintainers = with maintainers; [ twey ];
+    license = licenses.gpl2Plus;
+  };
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-qLr5H6ZvPhzG4Wa6dK45iReABO0EvA5+2afp2ctnc1A=";
+  };
+
+  nativeCheckInputs = [
+    pythonImportsCheckHook
+  ];
+
+  propagatedBuildInputs = [ plover ];
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0f30954a7dcb6e7..0978c7408d43514 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9900,6 +9900,8 @@ self: super: with self; {
 
   plover-last-translation = callPackage ../development/python-modules/plover-last-translation { };
 
+  plover-modal-dictionary = callPackage ../development/python-modules/plover-modal-dictionary { };
+
   plover-stitching = callPackage ../development/python-modules/plover-stitching { };
 
   plover-stroke = callPackage ../development/python-modules/plover-stroke { };

From 5714f0e577544d987e476d286091d268cfde3c7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?James=20=E2=80=98Twey=E2=80=99=20Kay?= <twey@twey.co.uk>
Date: Wed, 9 Oct 2024 12:59:21 +0100
Subject: [PATCH 10/11] python3Packages.plover-python-dictionary: init at 1.1.0

---
 .../plover-python-dictionary/default.nix      | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/plover-python-dictionary/default.nix

diff --git a/pkgs/development/python-modules/plover-python-dictionary/default.nix b/pkgs/development/python-modules/plover-python-dictionary/default.nix
new file mode 100644
index 000000000000000..890ca1c3b023a10
--- /dev/null
+++ b/pkgs/development/python-modules/plover-python-dictionary/default.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  fetchPypi,
+  python3Packages,
+  plover,
+  setuptools,
+  pytestCheckHook,
+  pythonImportsCheckHook,
+}:
+python3Packages.buildPythonPackage rec {
+  pname = "plover-python-dictionary";
+  version = "1.1.0";
+  pyproject = true;
+  build-system = [ setuptools ];
+
+  meta = with lib; {
+    description = "Add support for Python dictionaries to Plover.";
+    maintainers = with maintainers; [ twey ];
+    license = licenses.gpl2Plus;
+  };
+
+  src = fetchPypi {
+    pname = "plover_python_dictionary";
+    inherit version;
+    hash = "sha256-YlHTmMtKWUadObGbsrsF+PUspCB4Kr+amy57DQ4eCQs=";
+  };
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pythonImportsCheckHook
+  ];
+
+  propagatedBuildInputs = [ plover ];
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0978c7408d43514..b9e832c0b75b76c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9902,6 +9902,8 @@ self: super: with self; {
 
   plover-modal-dictionary = callPackage ../development/python-modules/plover-modal-dictionary { };
 
+  plover-python-dictionary = callPackage ../development/python-modules/plover-python-dictionary { };
+
   plover-stitching = callPackage ../development/python-modules/plover-stitching { };
 
   plover-stroke = callPackage ../development/python-modules/plover-stroke { };

From 76f9bb7c1ae4063aac303567ac9b0bdad64c8f4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?James=20=E2=80=98Twey=E2=80=99=20Kay?= <twey@twey.co.uk>
Date: Wed, 9 Oct 2024 12:59:38 +0100
Subject: [PATCH 11/11] python3Packages.plover-lapwing-aio: init at 1.3.4

---
 .../plover-lapwing-aio/default.nix            | 44 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/development/python-modules/plover-lapwing-aio/default.nix

diff --git a/pkgs/development/python-modules/plover-lapwing-aio/default.nix b/pkgs/development/python-modules/plover-lapwing-aio/default.nix
new file mode 100644
index 000000000000000..a0b0d749e49ea50
--- /dev/null
+++ b/pkgs/development/python-modules/plover-lapwing-aio/default.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  fetchPypi,
+  python3Packages,
+  plover,
+  plover-dict-commands,
+  plover-last-translation,
+  plover-modal-dictionary,
+  plover-python-dictionary,
+  plover-stitching,
+  setuptools,
+  pythonImportsCheckHook,
+}:
+python3Packages.buildPythonPackage rec {
+  pname = "plover-lapwing-aio";
+  version = "1.3.4";
+  pyproject = true;
+  build-system = [ setuptools ];
+
+  meta = with lib; {
+    description = "Automatically installs all the necessary plugins and dictionaries for using Lapwing theory with Plover";
+    maintainers = with maintainers; [ twey ];
+    license = licenses.gpl2Plus;
+  };
+
+  src = fetchPypi {
+    pname = "plover_lapwing_aio";
+    inherit version;
+    hash = "sha256-0GqmWGe5uN2JfnH/XMWrIH5As3xueREBU6nk3gGi3Vw=";
+  };
+
+  nativeCheckInputs = [
+    pythonImportsCheckHook
+  ];
+
+  propagatedBuildInputs = [
+    plover
+    plover-dict-commands
+    plover-last-translation
+    plover-modal-dictionary
+    plover-python-dictionary
+    plover-stitching
+  ];
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b9e832c0b75b76c..8ceff6d35059a11 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9898,6 +9898,8 @@ self: super: with self; {
 
   plover-dict-commands = callPackage ../development/python-modules/plover-dict-commands { };
 
+  plover-lapwing-aio = callPackage ../development/python-modules/plover-lapwing-aio { };
+
   plover-last-translation = callPackage ../development/python-modules/plover-last-translation { };
 
   plover-modal-dictionary = callPackage ../development/python-modules/plover-modal-dictionary { };