From 6ddeafa4035f22a91f1d0e7cc51337ea0dd8588b Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Tue, 11 Jun 2024 19:17:20 -0400
Subject: [PATCH] fix(hm): switch back to upstream

---
 .../arion/media/seerr/images/jellyseerr.nix   |  4 ++--
 flake.in.nix                                  |  6 +-----
 flake.lock                                    | 21 +++++++++----------
 flake.nix                                     |  3 +--
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/devices/nos/modules/arion/media/seerr/images/jellyseerr.nix b/devices/nos/modules/arion/media/seerr/images/jellyseerr.nix
index 976220dd..b9cc620a 100644
--- a/devices/nos/modules/arion/media/seerr/images/jellyseerr.nix
+++ b/devices/nos/modules/arion/media/seerr/images/jellyseerr.nix
@@ -1,8 +1,8 @@
 pkgs:
 pkgs.dockerTools.pullImage {
   imageName = "ghcr.io/fallenbagel/jellyseerr";
-  imageDigest = "sha256:0bb9f0c6e110ed2d621972054ae221b8a46364ea69922781ccf0821722c6831a";
-  sha256 = "132i3dy8r97yamdgfnj8hbrjp121r9pxgs71khsjs2jd2l4kh0yi";
+  imageDigest = "sha256:dbd97b5111d8655df32f8874d249b243ac1d4375649a2868bcc8e6a0f05aa09d";
+  sha256 = "04d1kz9qm3j4mnz5ixzm2mkj84cf6bx8rlw8iszp1sk5mwyncwci";
   finalImageName = "ghcr.io/fallenbagel/jellyseerr";
   finalImageTag = "develop";
 }
diff --git a/flake.in.nix b/flake.in.nix
index f5c8cc6d..89d236f2 100644
--- a/flake.in.nix
+++ b/flake.in.nix
@@ -10,12 +10,8 @@
       };
 
       home-manager = mkDep {
-        # owner = "nix-community";
-        owner = "matt1432";
+        owner = "nix-community";
         repo = "home-manager";
-
-        # FIXME: go back to upstream once https://github.com/nix-community/home-manager/pull/5524 is accepted
-        ref = "fix-mpv-pkg";
       };
 
       nix-on-droid = mkDep {
diff --git a/flake.lock b/flake.lock
index be52aad6..e1c8b1ff 100644
--- a/flake.lock
+++ b/flake.lock
@@ -682,11 +682,11 @@
     "gtk-theme-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1717453135,
-        "narHash": "sha256-KkKmiLENEiZSe56TRP8zMiGt6i9uaFCLJ+ajap0asZc=",
+        "lastModified": 1718141070,
+        "narHash": "sha256-azwkng3JTTBlSaisbJUdh9NlMZfDbD3OvTQP++J0oO8=",
         "owner": "dracula",
         "repo": "gtk",
-        "rev": "48bdcc5e37c90d74e7e2139412a89209cc05a672",
+        "rev": "4a5fe924a2b17f82a617f79ef661f1783cacc988",
         "type": "github"
       },
       "original": {
@@ -783,16 +783,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1718107325,
+        "lastModified": 1718141734,
         "narHash": "sha256-cA+6l8ZCZ7MXGijVuY/1f55+wF/RT4PlTR9+g4bx86w=",
-        "owner": "matt1432",
+        "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "79b29db481bd2ac1fefd7ae8a8a1a79d95dd14d8",
+        "rev": "892f76bd0aa09a0f7f73eb41834b8a904b6d0fad",
         "type": "github"
       },
       "original": {
-        "owner": "matt1432",
-        "ref": "fix-mpv-pkg",
+        "owner": "nix-community",
         "repo": "home-manager",
         "type": "github"
       }
@@ -2114,11 +2113,11 @@
         "nixpkgs-stable": "nixpkgs-stable_3"
       },
       "locked": {
-        "lastModified": 1718058322,
-        "narHash": "sha256-d5jLlAwVi4NzT9yc5UrPiOpDxTRhu8GGh0IIfeFcdrM=",
+        "lastModified": 1718137936,
+        "narHash": "sha256-psA+1Q5fPaK6yI3vzlLINNtb6EeXj111zQWnZYyJS9c=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "d071c74a7de1e26d211b69b6fbae37ae2e31a87f",
+        "rev": "c279dec105dd53df13a5e57525da97905cc0f0d6",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 582b8bdd..38efb35c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -106,8 +106,7 @@
     };
     home-manager = {
       inputs.nixpkgs.follows = "nixpkgs";
-      owner = "matt1432";
-      ref = "fix-mpv-pkg";
+      owner = "nix-community";
       repo = "home-manager";
       type = "github";
     };