From 64c86bfe3c4c8bb502a05703371b879f0f8dd58a Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Sat, 5 Aug 2023 22:27:20 -0400
Subject: [PATCH] cleaned up nix settings

---
 modules/nix.nix     | 26 ++++++++++++++++++++++----
 modules/pinning.nix | 11 -----------
 2 files changed, 22 insertions(+), 15 deletions(-)
 delete mode 100644 modules/pinning.nix

diff --git a/modules/nix.nix b/modules/nix.nix
index 09e6bc6..2c0b798 100644
--- a/modules/nix.nix
+++ b/modules/nix.nix
@@ -1,5 +1,24 @@
-inputs: {pkgs, ...}: {
-  #other nix settings
+inputs: {
+  pkgs,
+  lib,
+  ...
+}:
+#
+# Flake registry and $NIX_PATH pinning
+#
+let
+  alias = inputs // {nixpkgs = inputs.unstable;};
+  flakes = lib.filterAttrs (_: v: v._type == "flake") alias;
+in {
+  nix.nixPath = lib.mapAttrsToList (x: _: "${x}=flake:${x}") flakes;
+  nix.registry = lib.mapAttrs (_: flake: {inherit flake;}) flakes;
+  #
+  # Ignore global registry
+  #
+  nix.settings.flake-registry = builtins.toFile "empty-flake-registry.json" ''{"flakes":[],"version":2}'';
+  #
+  # Other nix settings
+  #
   nix = {
     package = inputs.nix.packages.${pkgs.system}.default;
     settings = {
@@ -10,8 +29,6 @@ inputs: {pkgs, ...}: {
       ];
       auto-optimise-store = true;
       warn-dirty = false;
-      #ignore global registry
-      flake-registry = builtins.toFile "empty-flake-registry.json" ''{"flakes":[],"version":2}'';
       #use for testing
       #allow-import-from-derivation = false;
       trusted-users = [
@@ -22,6 +39,7 @@ inputs: {pkgs, ...}: {
       use-xdg-base-directories = true;
     };
   };
+
   #fix for use-xdg-base-directories
   environment.profiles = [
     "\${XDG_STATE_HOME:-$HOME/.local/state}/nix/profile"
diff --git a/modules/pinning.nix b/modules/pinning.nix
deleted file mode 100644
index a8f6f2d..0000000
--- a/modules/pinning.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-inputs: {lib, ...}: let
-  alias = inputs // {nixpkgs = inputs.unstable;};
-in
-  lib.pipe alias [
-    (lib.filterAttrs (_: v: v._type == "flake"))
-    (lib.mapAttrsToList (n: input: {
-      nix.nixPath = ["${n}=flake:${n}"];
-      nix.registry.${n}.flake = input;
-    }))
-    lib.mkMerge
-  ]