From 066a793213fffde787a0796f8d24603b886245af Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Sat, 1 Feb 2025 22:49:44 -0500
Subject: shared/nix: drop input chicanery

---
 modules/shared/defaults/nix.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'modules/shared/defaults/nix.nix')

diff --git a/modules/shared/defaults/nix.nix b/modules/shared/defaults/nix.nix
index 8ecdfe1..c4cc2c3 100644
--- a/modules/shared/defaults/nix.nix
+++ b/modules/shared/defaults/nix.nix
@@ -14,10 +14,6 @@ let
     || lib.versionAtLeast config.nix.package.version "2.90.0"; # but not in lix yet
 
   hasAlwaysAllowSubstitutes = lib.versionAtLeast config.nix.package.version "2.19.0";
-
-  # Use systemd-tmpfiles on Linux
-  nixPathFromInput =
-    name: input: "${name}=${if isLinux then "/etc/nix/inputs/${name}" else input.outPath}";
 in
 {
   config = lib.mkMerge [
@@ -37,14 +33,16 @@ in
           options = lib.mkDefault "--delete-older-than 2d";
         };
 
+        registry = lib.mapAttrs (lib.const (flake: {
+          inherit flake;
+        })) inputs;
+
         # See comment below
-        nixPath = lib.mapAttrsToList nixPathFromInput inputs;
+        nixPath = lib.mapAttrsToList (name: lib.const "${name}=flake:${name}") inputs;
       };
 
       nixpkgs = {
         config.allowUnfree = lib.mkDefault true;
-        # The `flake:` syntax in `$NIX_PATH` seems to do some weird copying on Nix 2.24
-        flake.setNixPath = false;
       };
     }
 
-- 
cgit v1.2.3