From 2615d405c8b4d4a049243fc70a5e8e3e804ba9d8 Mon Sep 17 00:00:00 2001
From: RGBCube <RGBCube@users.noreply.github.com>
Date: Thu, 14 Dec 2023 10:53:56 +0300
Subject: [PATCH] Don't do inputsRaw hack

---
 flake.nix               | 44 ++++++++++++++++++++---------------------
 modules/nix/default.nix |  8 ++++----
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/flake.nix b/flake.nix
index fd80cba..f4a8105 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,23 @@
-let
-  inputsRaw = {
+{
+  description = "All my NixOS configurations.";
+
+  nixConfig = {
+    extra-substituters = ''
+      https://nix-community.cachix.org/
+      https://hyprland.cachix.org/
+      https://cache.privatevoid.net/
+      https://cache.garnix.io/
+    '';
+
+    extra-trusted-public-keys = ''
+      nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
+      hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=
+      cache.privatevoid.net-1:SErQ8bvNWANeAvtsOESUwVYr2VJynfuc9JRwlzTTkVg=
+      cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=
+    '';
+  };
+
+  inputs = {
     nixSuper = {
       url = "github:privatevoid-net/nix-super";
     };
@@ -53,26 +71,6 @@ let
       url = "github:RGBCube/ThemeNix";
     };
   };
-in {
-  description = "All my NixOS configurations.";
-
-  nixConfig = {
-    extra-substituters = ''
-      https://nix-community.cachix.org/
-      https://hyprland.cachix.org/
-      https://cache.privatevoid.net/
-      https://cache.garnix.io/
-    '';
-
-    extra-trusted-public-keys = ''
-      nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
-      hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=
-      cache.privatevoid.net-1:SErQ8bvNWANeAvtsOESUwVYr2VJynfuc9JRwlzTTkVg=
-      cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=
-    '';
-  };
-
-  inputs = inputsRaw;
 
   outputs = {
     nixSuper,
@@ -129,7 +127,7 @@ in {
     in lib.nixosSystem {
       inherit system;
 
-      specialArgs = { inherit inputsRaw inputs ulib upkgs theme; };
+      specialArgs = { inherit inputs ulib upkgs theme; };
       modules     = [
         homeManager.nixosModules.default
         defaultConfiguration
diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index e7d1e7e..d191cba 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -1,4 +1,4 @@
-{ inputsRaw, inputs, lib, ulib, upkgs, ... }: with ulib;
+{ inputs, lib, ulib, upkgs, ... }: with ulib;
 
 systemConfiguration {
   nix = {
@@ -18,9 +18,9 @@ systemConfiguration {
     registry = (lib.filterAttrs
       (name: value: value != {})
       (builtins.mapAttrs
-        (name: value: lib.mkIf value.flake or true {
-          flake = inputs.${name};
-        }) inputsRaw)) // { default.flake = inputs.nixpkgs; };
+        (name: value: lib.mkIf (value ? "sourceInfo") {
+          flake = value;
+        }) inputs)) // { default.flake = inputs.nixpkgs; };
 
     settings.experimental-features = [
       "fetch-tree"