From a10b255a7169bffd16bb29f54365c12da8ef8575 Mon Sep 17 00:00:00 2001
From: imxyy_soope_ <imxyy1soope1@gmail.com>
Date: Tue, 14 Jul 2026 19:49:35 +0800
Subject: [PATCH] sops: use upstream

---
 flake.lock       | 7 +++----
 flake.nix        | 4 +---
 modules/sops.nix | 7 +++++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index d75aa2b..04d1322 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1004,16 +1004,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1776230713,
-        "narHash": "sha256-8Rv4J8M09NPJcq4pYfMyi0ibJJQD7/JzKjAqSp2LjZw=",
+        "lastModified": 1783174389,
+        "narHash": "sha256-aCWC8ngycU7OdJrU2+Je3qf+1a2ykuBvpPhZT/9tXMc=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "105ff9ba631f5e7ee75aac03df941981312d917e",
+        "rev": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9",
         "type": "github"
       },
       "original": {
         "owner": "Mic92",
-        "ref": "pull/779/merge",
         "repo": "sops-nix",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 0bd66d8..a35dd00 100644
--- a/flake.nix
+++ b/flake.nix
@@ -46,10 +46,8 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.home-manager.follows = "home-manager";
     };
-    # TODO: sops-nix: remove pr patch once merged
-    # https://github.com/Mic92/sops-nix/pull/779
     sops-nix = {
-      url = "github:Mic92/sops-nix/pull/779/merge";
+      url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     stylix = {
diff --git a/modules/sops.nix b/modules/sops.nix
index 7e11c59..3e32893 100644
--- a/modules/sops.nix
+++ b/modules/sops.nix
@@ -23,10 +23,13 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    sops.age.sshKeyFile = cfg.sshKeyFile;
+    sops.age.sshKeyPaths = [ cfg.sshKeyFile ];
+    # Inject environment directly to use native SSH key encryption
+    sops.environment.SOPS_AGE_SSH_PRIVATE_KEY_FILE = cfg.sshKeyFile;
     users.users.${username}.extraGroups = [ "keys" ];
     my.hm = {
-      sops.age.sshKeyFile = cfg.sshKeyFile;
+      sops.age.sshKeyPaths = [ cfg.sshKeyFile ];
+      sops.environment.SOPS_AGE_SSH_PRIVATE_KEY_FILE = cfg.sshKeyFile;
       home.packages = [
         pkgs.sops
       ];