From 28aa480c5037b86dc0969c7ffed6b661c0390a47 Mon Sep 17 00:00:00 2001
From: akosnad <akos@nadudvari.org>
Date: Wed, 23 Oct 2024 12:01:55 +0200
Subject: [PATCH] chore(flake): use sops-nix upstream again

Mic92/sops-nix#637 was merged
---
 flake.lock | 10 +++++-----
 flake.nix  |  5 +----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6062f80..7e67375 100644
--- a/flake.lock
+++ b/flake.lock
@@ -643,15 +643,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1729035011,
-        "narHash": "sha256-8sBpG9CFaqruTEZRQyggVhFHBB8z+t263UvrpFLDRRw=",
-        "owner": "munnik",
+        "lastModified": 1729669122,
+        "narHash": "sha256-SpS3rSwYcskdOpx+jeCv1lcZDdkT/K5qT8dlenCBQ8c=",
+        "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "c916d48f9546e0b42bf7604f77efc60fb9357a96",
+        "rev": "a4c33bfecb93458d90f9eb26f1cf695b47285243",
         "type": "github"
       },
       "original": {
-        "owner": "munnik",
+        "owner": "Mic92",
         "repo": "sops-nix",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 479f24d..2a1b785 100644
--- a/flake.nix
+++ b/flake.nix
@@ -46,10 +46,7 @@
     };
 
     sops-nix = {
-      # we use munnik's fork until https://github.com/Mic92/sops-nix/pull/637 is merged
-      # this allows for setting explicit uid and gid for secret files
-      # url = "github:Mic92/sops-nix";
-      url = "github:munnik/sops-nix";
+      url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.nixpkgs-stable.follows = "nixpkgs";
     };