From 63e2f483baf016ac319e786d10c5d09d4ab48706 Mon Sep 17 00:00:00 2001
From: notgne2 <gen2@gen2.space>
Date: Mon, 5 Dec 2022 19:03:23 -0700
Subject: [PATCH] update, fix mopidy-local, fix the fucking scanning

---
 flake.lock                       | 36 ++++++++++++++++----------------
 home-manager/modules/ezpcusr.nix | 11 +++++++++-
 modules/fuckingprint.nix         |  1 -
 3 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/flake.lock b/flake.lock
index 716d9fa..230e00a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -51,11 +51,11 @@
     "base16-rofi": {
       "flake": false,
       "locked": {
-        "lastModified": 1666937130,
-        "narHash": "sha256-21G6lHjPO4M91HJE8cjSm7sj84iUH4AnzhI9wvcIPlQ=",
+        "lastModified": 1668291378,
+        "narHash": "sha256-RZpjCQ8KGO3cv9A/lNNoTE+WJ9sNk5sz0zJq02zzxA8=",
         "owner": "tinted-theming",
         "repo": "base16-rofi",
-        "rev": "7b651f86714134e9770f8965342120f3f763be34",
+        "rev": "3f64a9f8d8cb7db796557b516682b255172c4ab4",
         "type": "github"
       },
       "original": {
@@ -99,11 +99,11 @@
     "bemoji": {
       "flake": false,
       "locked": {
-        "lastModified": 1664305304,
-        "narHash": "sha256-yis9SPtMtKxmoAniwwEYt5hCroRvpGkkl4s3yX/580A=",
+        "lastModified": 1668093135,
+        "narHash": "sha256-DhsJX5HlyTh0QLlHy1OwyaYg4vxWpBSsF71D9fxqPWE=",
         "owner": "marty-oehme",
         "repo": "bemoji",
-        "rev": "d03068dba7a1c5708c2779921d7a945eb55377b4",
+        "rev": "4209b906699191df611a3420e410f3711c5a0540",
         "type": "github"
       },
       "original": {
@@ -131,11 +131,11 @@
     "firenvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1667394363,
-        "narHash": "sha256-RdrBb4U0GjUdNj+HSPx+CV5lUmqFxLlEcKbirdBOVw8=",
+        "lastModified": 1668086619,
+        "narHash": "sha256-/25Q6+8UhvJu9ckDMJi1EzKPi8JTR+Mkdy6yH+iunLs=",
         "owner": "glacambre",
         "repo": "firenvim",
-        "rev": "eeaddd0b503f841fa24f60cebd14fa93d2b33f77",
+        "rev": "17a189f0f1e2d4197e00cd56dbeaed8c268bac8c",
         "type": "github"
       },
       "original": {
@@ -205,11 +205,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1667231093,
-        "narHash": "sha256-RERXruzBEBuf0c7OfZeX1hxEKB+PTCUNxWeB6C1jd8Y=",
+        "lastModified": 1669791787,
+        "narHash": "sha256-KBfoA2fOI5+wCrm7PR+j7jHqXeTkVRPQ0m5fcKchyuU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d40fea9aeb8840fea0d377baa4b38e39b9582458",
+        "rev": "e76c78d20685a043d23f5f9e0ccd2203997f1fb1",
         "type": "github"
       },
       "original": {
@@ -253,11 +253,11 @@
     "npmlock2nix": {
       "flake": false,
       "locked": {
-        "lastModified": 1666460237,
-        "narHash": "sha256-HME6rnysvCwUVtH+BDWDGahmweMaLgD2wqHeRuGp6QI=",
+        "lastModified": 1670017395,
+        "narHash": "sha256-Vr1e2hVoNXO3aS/viikjeUwCAijwiro+MwicfKRHB/Q=",
         "owner": "nix-community",
         "repo": "npmlock2nix",
-        "rev": "eeed152290ec2425f96c5e74e469c40b621e1468",
+        "rev": "12ce9223a9ae8ed5830710d5897e4d08e1cb9ac1",
         "type": "github"
       },
       "original": {
@@ -307,11 +307,11 @@
     "rycee": {
       "flake": false,
       "locked": {
-        "lastModified": 1667361759,
-        "narHash": "sha256-PSrfcBDZpvVUr7A2JMrXUI8cnxl1/SC5uCvs3HBhrI8=",
+        "lastModified": 1669992865,
+        "narHash": "sha256-WnntkZOUg1IvGHhTusjMiN6x8i9TlQgj3uZNRlkYN8k=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "6315cb4c514b07e8b66ad79f2f1f9a349408953c",
+        "rev": "8f857c12f9c297f00d1cbe198464070c43a818c2",
         "type": "gitlab"
       },
       "original": {
diff --git a/home-manager/modules/ezpcusr.nix b/home-manager/modules/ezpcusr.nix
index 4cbb086..137daad 100644
--- a/home-manager/modules/ezpcusr.nix
+++ b/home-manager/modules/ezpcusr.nix
@@ -581,7 +581,16 @@ in {
       enable = lib.mkDefault true;
       extensionPackages = with pkgs; [
         mopidy-youtube
-        mopidy-local
+        (mopidy-local.overrideAttrs (oldAttrs: {
+          patches = [
+            # Fix tests with newer Mopidy versions >=3.4.0 -- mopidy/mopidy-local#69
+            (fetchpatch {
+              name = "update-tests-for-mopidy-3.4.0.patch";
+              url = "https://github.com/mopidy/mopidy-local/commit/f2c198f8eb253f62100afc58f652e73a76d5a090.patch";
+              hash = "sha256-jrlZc/pd00S5q9nOfV1OXu+uP/SvH+Xbi7U52aZajj4=";
+            })
+          ];
+        }))
         mopidy-mpd
       ];
       settings = {
diff --git a/modules/fuckingprint.nix b/modules/fuckingprint.nix
index 43bcebc..fdc7dd1 100644
--- a/modules/fuckingprint.nix
+++ b/modules/fuckingprint.nix
@@ -102,7 +102,6 @@ in {
       dsseries.enable = true;
       drivers.scanSnap.enable = true;
       extraBackends = with pkgs; [
-        utsushi
         epkowa
         hplipWithPlugin
       ];