From 35b7106b115cb16c1d2ae26355269af43700c8a8 Mon Sep 17 00:00:00 2001
From: Daylin Morgan <daylinmorgan@gmail.com>
Date: Wed, 21 Feb 2024 15:47:58 -0600
Subject: [PATCH] absolutely wacky flake.nix

---
 flake.lock      | 78 ++++++++++++++++++++++++-------------------------
 flake.nix       |  8 ++---
 lib/default.nix |  3 +-
 3 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/flake.lock b/flake.lock
index 05de55d..146dfd6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -15,31 +15,10 @@
         "type": "github"
       }
     },
-    "flake-inputs": {
-      "inputs": {
-        "hyprland": "hyprland",
-        "hyprland-contrib": "hyprland-contrib",
-        "nix-eval-jobs": "nix-eval-jobs",
-        "nix-index-database": "nix-index-database",
-        "nixpkgs": "nixpkgs",
-        "nixpkgs-wayland": "nixpkgs-wayland",
-        "pinix": "pinix"
-      },
-      "locked": {
-        "lastModified": 1,
-        "narHash": "sha256-pNq475t8Hbj+GhSfheiUYA7hVRMjFmTa3B8iAaLtE74=",
-        "path": "./inputs",
-        "type": "path"
-      },
-      "original": {
-        "path": "./inputs",
-        "type": "path"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
-          "flake-inputs",
+          "inputs",
           "nix-eval-jobs",
           "nixpkgs"
         ]
@@ -81,7 +60,7 @@
         "hyprland-protocols": "hyprland-protocols",
         "hyprlang": "hyprlang",
         "nixpkgs": [
-          "flake-inputs",
+          "inputs",
           "nixpkgs"
         ],
         "systems": "systems",
@@ -106,7 +85,7 @@
     "hyprland-contrib": {
       "inputs": {
         "nixpkgs": [
-          "flake-inputs",
+          "inputs",
           "nixpkgs"
         ]
       },
@@ -127,12 +106,12 @@
     "hyprland-protocols": {
       "inputs": {
         "nixpkgs": [
-          "flake-inputs",
+          "inputs",
           "hyprland",
           "nixpkgs"
         ],
         "systems": [
-          "flake-inputs",
+          "inputs",
           "hyprland",
           "systems"
         ]
@@ -154,7 +133,7 @@
     "hyprlang": {
       "inputs": {
         "nixpkgs": [
-          "flake-inputs",
+          "inputs",
           "hyprland",
           "nixpkgs"
         ]
@@ -176,7 +155,7 @@
     "hyprlang_2": {
       "inputs": {
         "nixpkgs": [
-          "flake-inputs",
+          "inputs",
           "hyprland",
           "xdph",
           "nixpkgs"
@@ -196,6 +175,27 @@
         "type": "github"
       }
     },
+    "inputs": {
+      "inputs": {
+        "hyprland": "hyprland",
+        "hyprland-contrib": "hyprland-contrib",
+        "nix-eval-jobs": "nix-eval-jobs",
+        "nix-index-database": "nix-index-database",
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-wayland": "nixpkgs-wayland",
+        "pinix": "pinix"
+      },
+      "locked": {
+        "lastModified": 1,
+        "narHash": "sha256-pNq475t8Hbj+GhSfheiUYA7hVRMjFmTa3B8iAaLtE74=",
+        "path": "./inputs",
+        "type": "path"
+      },
+      "original": {
+        "path": "./inputs",
+        "type": "path"
+      }
+    },
     "lib-aggregate": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -220,7 +220,7 @@
         "flake-parts": "flake-parts",
         "nix-github-actions": "nix-github-actions",
         "nixpkgs": [
-          "flake-inputs",
+          "inputs",
           "nixpkgs"
         ],
         "treefmt-nix": "treefmt-nix"
@@ -242,7 +242,7 @@
     "nix-github-actions": {
       "inputs": {
         "nixpkgs": [
-          "flake-inputs",
+          "inputs",
           "nix-eval-jobs",
           "nixpkgs"
         ]
@@ -264,7 +264,7 @@
     "nix-index-database": {
       "inputs": {
         "nixpkgs": [
-          "flake-inputs",
+          "inputs",
           "nixpkgs"
         ]
       },
@@ -318,11 +318,11 @@
         "flake-compat": "flake-compat",
         "lib-aggregate": "lib-aggregate",
         "nix-eval-jobs": [
-          "flake-inputs",
+          "inputs",
           "nix-eval-jobs"
         ],
         "nixpkgs": [
-          "flake-inputs",
+          "inputs",
           "nixpkgs"
         ]
       },
@@ -343,7 +343,7 @@
     "pinix": {
       "inputs": {
         "nixpkgs": [
-          "flake-inputs",
+          "inputs",
           "nixpkgs"
         ]
       },
@@ -363,7 +363,7 @@
     },
     "root": {
       "inputs": {
-        "flake-inputs": "flake-inputs"
+        "inputs": "inputs"
       }
     },
     "systems": {
@@ -399,7 +399,7 @@
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
-          "flake-inputs",
+          "inputs",
           "nix-eval-jobs",
           "nixpkgs"
         ]
@@ -440,18 +440,18 @@
     "xdph": {
       "inputs": {
         "hyprland-protocols": [
-          "flake-inputs",
+          "inputs",
           "hyprland",
           "hyprland-protocols"
         ],
         "hyprlang": "hyprlang_2",
         "nixpkgs": [
-          "flake-inputs",
+          "inputs",
           "hyprland",
           "nixpkgs"
         ],
         "systems": [
-          "flake-inputs",
+          "inputs",
           "hyprland",
           "systems"
         ]
diff --git a/flake.nix b/flake.nix
index 215138f..b4b7114 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,16 +1,14 @@
 {
   description = "nix begat oizys";
-
   # inputs.flake-inputs.url = "github:daylinmorgan/oizys?dir=inputs";
-  inputs.flake-inputs.url = "path:./inputs";
-
+  inputs.inputs.url = "path:./inputs";
   outputs = {
+    inputs,
     self,
-    flake-inputs,
   }:
     (import ./lib {
+      inherit (inputs) inputs;
       inherit self;
-      inputs = flake-inputs.inputs;
     })
     .oizysFlake {};
 }
diff --git a/lib/default.nix b/lib/default.nix
index 3d208eb..9a7248d 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,8 +1,9 @@
 {
   inputs,
   self,
-  ...
 }: let
+  # inputs = flake-inputs.inputs.inputs;
+  # self = flake-inputs.self;
   nixpkgs = inputs.nixpkgs;
   inherit (builtins) concatLists attrValues mapAttrs elemAt match readDir filter listToAttrs;
   inherit (nixpkgs.lib) hasSuffix nixosSystem genAttrs;