From f744f77732474de8b2b4f8a48f7ac6bb3ab262f5 Mon Sep 17 00:00:00 2001
From: Jack O'Sullivan <jackos1998@gmail.com>
Date: Fri, 17 Jun 2022 22:48:47 +0100
Subject: [PATCH] Fix pkgs ref in home-manager / NixOS registry.json

---
 home-manager/modules/common.nix | 20 +++++++++++---------
 nixos/modules/common.nix        |  9 +++++++++
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/home-manager/modules/common.nix b/home-manager/modules/common.nix
index b358ad8..fa393f6 100644
--- a/home-manager/modules/common.nix
+++ b/home-manager/modules/common.nix
@@ -47,15 +47,6 @@ in
 
       nix = {
         package = pkgs.nix;
-        registry = {
-          pkgs = {
-            to = {
-              type = "path";
-              path = toString pkgs.path;
-            };
-            exact = true;
-          };
-        };
         settings = {
           experimental-features = [ "nix-command" "flakes" "ca-derivations" ];
           max-jobs = mkDefault "auto";
@@ -227,6 +218,17 @@ in
           allowUnfree = true;
         };
       };
+      nix = {
+        registry = {
+          pkgs = {
+            to = {
+              type = "path";
+              path = "${pkgs.path}";
+            };
+            exact = true;
+          };
+        };
+      };
     })
     (mkIf config.my.isStandalone {
       my = {
diff --git a/nixos/modules/common.nix b/nixos/modules/common.nix
index df7fbd6..1f7b25c 100644
--- a/nixos/modules/common.nix
+++ b/nixos/modules/common.nix
@@ -49,6 +49,15 @@ in
           trusted-users = [ "@wheel" ];
           experimental-features = [ "nix-command" "flakes" "ca-derivations" ];
         };
+        registry = {
+          pkgs = {
+            to = {
+              type = "path";
+              path = "${pkgs.path}";
+            };
+            exact = true;
+          };
+        };
         gc = {
           options = mkDefault "--max-freed $((8 * 1024**3))";
           automatic = mkDefault true;