From 151777ecbb6cd4e6026e184ae27c43e070048885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= <lotte@chir.rs>
Date: Thu, 16 Jun 2022 21:47:46 +0100
Subject: [PATCH] git pushadd plover-plugins-manager

---
 config/programs/plover.nix     | 10 ++++---
 config/workarounds/default.nix | 49 ----------------------------------
 flake.lock                     | 24 ++++++++---------
 3 files changed, 19 insertions(+), 64 deletions(-)

diff --git a/config/programs/plover.nix b/config/programs/plover.nix
index 307d7721..34dfd92c 100644
--- a/config/programs/plover.nix
+++ b/config/programs/plover.nix
@@ -1,9 +1,12 @@
 {
   lib,
   pkgs,
+  nix-packages,
+  system,
   ...
 }: let
-  plover-src = pkgs.plover.dev.src;
+  inherit (nix-packages.packages.${system}) plover plover-plugins-manager;
+  plover-src = plover.src;
   plover-dictionaries = [
     {
       enabled = true;
@@ -58,7 +61,8 @@
   });
 in {
   home.packages = [
-    pkgs.plover.dev
+    plover
+    plover-plugins-manager
   ];
   home.activation.ploverSettings = lib.hm.dag.entryAfter ["writeBoundary"] ''
     $DRY_RUN_CMD mkdir $VERBOSE_ARG -p $HOME/.config/plover
@@ -77,7 +81,7 @@ in {
       WantedBy = ["graphical-session.target"];
     };
     Service = {
-      ExecStart = "${pkgs.plover.dev}/bin/plover";
+      ExecStart = "${plover}/bin/plover";
     };
   };
 }
diff --git a/config/workarounds/default.nix b/config/workarounds/default.nix
index 010201bc..d9f1fb0e 100644
--- a/config/workarounds/default.nix
+++ b/config/workarounds/default.nix
@@ -20,55 +20,6 @@ with pkgs; let
         sha256 = "1l5pfrggil9knk58r2r84i9msm7mdhddl87hkfk54qqk2sqzc06g";
       };
     };
-  plover-stroke = with python3Packages;
-    buildPythonPackage rec {
-      pname = "plover_stroke";
-      version = "1.0.1";
-      src = fetchFromGitHub {
-        owner = "benoit-pierre";
-        repo = pname;
-        rev = version;
-        sha256 = "15by14gn2grvn7835hcrijfmccy4bqwvbg38rn8fvgyl6n2zhwzn";
-      };
-    };
-  plover = with python3Packages;
-    libsForQt5.mkDerivationWith buildPythonPackage rec {
-      pname = "plover-wayland";
-      version = "2022-04-03";
-      src = fetchFromGitHub {
-        owner = "benoit-pierre";
-        repo = "plover";
-        rev = "9aa7c562ba8c6cf8fdd56b0a8304865cc58bc322";
-        sha256 = "0y3mdfqjv3vmv5c0cpvfa2mqdylan44iw1js480sxvklq8sxq6yv";
-      };
-      postPatch = ''
-        sed -i /PyQt5/d setup.cfg
-        sed -i 's|/usr/share/wayland|${wayland}/share/wayland|' plover_build_utils/setup.py
-        sed -i 's|pywayland==|pywayland>=|' reqs/dist.txt
-      '';
-      checkInputs = [pytest mock];
-      propagatedBuildInputs = [
-        Babel
-        pyqt5
-        xlib
-        pyserial
-        appdirs
-        wcwidth
-        setuptools
-        pywayland
-        pkg-config
-        plover-stroke
-        rtf-tokenize
-      ];
-      dontWrapQtApps = true;
-      preBuild = ''
-        export PKG_CONFIG="${pkg-config}/bin/pkg-config"
-      '';
-      preFixup = ''
-        makeWrapperArgs+=("''${qtWrapperArgs[@]}")
-      '';
-      installCheckPhase = "true";
-    };
   noto-variable = import nixpkgs-noto-variable {inherit system;};
   go116 = import nixpkgs-go116 {inherit system;};
 in {
diff --git a/flake.lock b/flake.lock
index 65d6e529..81d911cb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -224,11 +224,11 @@
     "hosts-list": {
       "flake": false,
       "locked": {
-        "lastModified": 1655232672,
-        "narHash": "sha256-7imp/EaxoPMLqbkfVPw7pZUS4MRsXSJC39HCmBZQmsU=",
+        "lastModified": 1655412657,
+        "narHash": "sha256-h7xFp96Bm55RzHxXfIvHMpJuJXpGiyG3EJ72jBPYU/c=",
         "owner": "StevenBlack",
         "repo": "hosts",
-        "rev": "82c2c7839b30fa646531f81297968ef2ff9912a7",
+        "rev": "4a345dc95f06eb999ab7c69bd1e2e692506cf728",
         "type": "github"
       },
       "original": {
@@ -445,11 +445,11 @@
         "plover": "plover"
       },
       "locked": {
-        "lastModified": 1655396165,
-        "narHash": "sha256-2uqU46rs5d0i0PmqaFvNPWbj5VFytb9y9HM0h2JKEm8=",
+        "lastModified": 1655412749,
+        "narHash": "sha256-IVjKpwiCDBwwb8IsCO4JkHQnKEuqnghaUfoG+PE+568=",
         "owner": "DarkKirb",
         "repo": "nix-packages",
-        "rev": "47c9b99394c9940950ce1dd34680c368616ae206",
+        "rev": "b20db5c5501eeb39ab793d8e396e7a7368d73412",
         "type": "github"
       },
       "original": {
@@ -616,11 +616,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1655407221,
-        "narHash": "sha256-LYS7V0+ucGTXd3q2RsYYaGnIfm9yQUYtQsTb9HXSNdI=",
+        "lastModified": 1655409759,
+        "narHash": "sha256-J6tBBk/d8EdUmGBdC9P0v7lG5jnFhgZpQm2pn1UjmGw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3ae0e9c86e057fe50852c2b311e6a489d81c14c9",
+        "rev": "1f949558617ebb18bbf7005c1c4dc3407d391e93",
         "type": "github"
       },
       "original": {
@@ -631,11 +631,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1655398971,
-        "narHash": "sha256-yWtHgYPnv1/kPAxqjXnInGz7863lxJVa5pcGCJb3aRc=",
+        "lastModified": 1655412011,
+        "narHash": "sha256-aS9nN+Oem3JAs3sK8Lei/aSd5kWDqpfmzMO3aSSreTM=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "104471891ad659384eaec9f9cf4a17668612c3b4",
+        "rev": "ed2b67eada53a93fd337e283e679c6bc7f28ffbd",
         "type": "github"
       },
       "original": {