From f30709cdea90f6f3f7451ef1f9f0b34c84b05c09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= <leana.jiang+git@icloud.com>
Date: Tue, 2 Sep 2025 18:51:52 +0800
Subject: [PATCH] overlays: refactor by using .asFlake attribute

---
 nix/overlays/agenix.nix |  4 +---
 nix/overlays/disko.nix  |  4 +---
 nix/overlays/dix.nix    |  4 +---
 nix/overlays/eepy.nix   |  4 +---
 nix/overlays/nil.nix    | 19 ++++++++++++++++---
 nix/overlays/nur.nix    |  7 +------
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/nix/overlays/agenix.nix b/nix/overlays/agenix.nix
index e89a4ad7..eded6cc7 100644
--- a/nix/overlays/agenix.nix
+++ b/nix/overlays/agenix.nix
@@ -1,9 +1,7 @@
 let
   sources = import ../../npins;
-  inherit (sources) agenix;
-  inherit (agenix.repository) owner repo;
 in
   final: _: {
     # Use flake so the package inputs is pinned
-    agenix = (builtins.getFlake "github:${owner}/${repo}/${agenix.revision}").packages.${final.system}.default;
+    agenix = sources.agenix.asFlake.packages.${final.system}.default;
   }
diff --git a/nix/overlays/disko.nix b/nix/overlays/disko.nix
index 7a7c539d..038ae26d 100644
--- a/nix/overlays/disko.nix
+++ b/nix/overlays/disko.nix
@@ -2,7 +2,5 @@ let
   sources = import ../../npins;
 in
   final: _: {
-    disko =
-      final.callPackage (sources.disko + "/package.nix")
-      {diskoVersion = sources.disko.version;};
+    disko = sources.disko.asFlake.packages.${final.system}.default;
   }
diff --git a/nix/overlays/dix.nix b/nix/overlays/dix.nix
index d5cba5e0..ada5e33a 100644
--- a/nix/overlays/dix.nix
+++ b/nix/overlays/dix.nix
@@ -1,8 +1,6 @@
 let
   sources = import ../../npins;
-  inherit (sources) dix;
-  inherit (dix.repository) owner repo;
 in
   final: _: {
-    dix = (builtins.getFlake "github:${owner}/${repo}/${dix.revision}").packages.${final.system}.default;
+    dix = sources.dix.asFlake.packages.${final.system}.default;
   }
diff --git a/nix/overlays/eepy.nix b/nix/overlays/eepy.nix
index 12bcfdc5..1c821d2b 100644
--- a/nix/overlays/eepy.nix
+++ b/nix/overlays/eepy.nix
@@ -1,8 +1,6 @@
 let
   sources = import ../../npins;
-  inherit (sources) eepy;
-  inherit (eepy.repository) owner repo;
 in
   final: _: {
-    eepy = (builtins.getFlake "github:${owner}/${repo}/${eepy.revision}").packages.${final.system}.default;
+    eepy = sources.eepy.asFlake.packages.${final.system}.default;
   }
diff --git a/nix/overlays/nil.nix b/nix/overlays/nil.nix
index daca3bf1..ab05b204 100644
--- a/nix/overlays/nil.nix
+++ b/nix/overlays/nil.nix
@@ -1,9 +1,22 @@
 # Run the one with my cool feature here for now
 let
   sources = import ../../npins;
-  inherit (sources) nil;
-  inherit (nil.repository) owner repo;
 in
   final: _: {
-    nil = (builtins.getFlake "github:${owner}/${repo}/${nil.revision}").packages.${final.system}.default;
+    nil = let
+      pkg = sources.nil.asFlake.packages.${final.system}.default;
+    in
+      pkg.overrideAttrs (
+        oldAttrs: {
+          patches =
+            oldAttrs.patches or []
+            ++ [
+              (final.fetchpatch {
+                name = "fix-handling-inherit-and-patfield-in-inline-assist";
+                url = "https://github.com/oxalica/nil/pull/178.patch";
+                hash = "sha256-4f7DeWJtt63IyOjqlwzz0f05rv1NBYZO4JWEkFeDimk=";
+              })
+            ];
+        }
+      );
   }
diff --git a/nix/overlays/nur.nix b/nix/overlays/nur.nix
index 57c2994f..f0ff694f 100644
--- a/nix/overlays/nur.nix
+++ b/nix/overlays/nur.nix
@@ -1,9 +1,4 @@
 let
   sources = import ../../npins;
 in
-  _: prev: {
-    nur = import sources.nur {
-      nurpkgs = prev;
-      pkgs = prev;
-    };
-  }
+  sources.nur.asFlake.overlays.default