From f95fef13218ebc72f9ea8f2fac7f0a303a4ac034 Mon Sep 17 00:00:00 2001
From: Daylin Morgan <daylinmorgan@gmail.com>
Date: Thu, 29 Feb 2024 15:41:05 -0600
Subject: [PATCH] use a standard inputs womp womp

---
 flake.lock       | 58 +++++++++---------------------------------------
 flake.nix        | 48 +++++++++++++++++++++++++++++++++++----
 inputs/flake.nix | 44 ------------------------------------
 3 files changed, 54 insertions(+), 96 deletions(-)
 delete mode 100644 inputs/flake.nix

diff --git a/flake.lock b/flake.lock
index c688219..bc0df14 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,7 +18,6 @@
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
-          "inputs",
           "nix-eval-jobs",
           "nixpkgs"
         ]
@@ -60,7 +59,6 @@
         "hyprland-protocols": "hyprland-protocols",
         "hyprlang": "hyprlang",
         "nixpkgs": [
-          "inputs",
           "nixpkgs"
         ],
         "systems": "systems",
@@ -68,11 +66,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1709227424,
-        "narHash": "sha256-/RC/4TDKW6FABeSPMIeHbPf81k6ZOI8SoNBFOTDyy9c=",
+        "lastModified": 1709242419,
+        "narHash": "sha256-KrgZzmNe5JTtbK1DAmarghdB7A4VqhehsofgXgp6Xg0=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "1698d336f2511ee7c93d0a520c7ba3491c831e8d",
+        "rev": "f801d15947e151a8129ff82c99abb208e4767322",
         "type": "github"
       },
       "original": {
@@ -85,7 +83,6 @@
     "hyprland-contrib": {
       "inputs": {
         "nixpkgs": [
-          "inputs",
           "nixpkgs"
         ]
       },
@@ -106,12 +103,10 @@
     "hyprland-protocols": {
       "inputs": {
         "nixpkgs": [
-          "inputs",
           "hyprland",
           "nixpkgs"
         ],
         "systems": [
-          "inputs",
           "hyprland",
           "systems"
         ]
@@ -133,12 +128,10 @@
     "hyprlang": {
       "inputs": {
         "nixpkgs": [
-          "inputs",
           "hyprland",
           "nixpkgs"
         ],
         "systems": [
-          "inputs",
           "hyprland",
           "systems"
         ]
@@ -157,32 +150,6 @@
         "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": {
-        "dir": "inputs",
-        "lastModified": 1709062040,
-        "narHash": "sha256-/WnKTvmM3LFJ76+zFhlx2bMVL5PrRJ5ImeSTKtjtDPE=",
-        "owner": "daylinmorgan",
-        "repo": "oizys",
-        "rev": "8766668a1c2a01a68982ee2e25f696662a679fdf",
-        "type": "github"
-      },
-      "original": {
-        "dir": "inputs",
-        "owner": "daylinmorgan",
-        "repo": "oizys",
-        "type": "github"
-      }
-    },
     "lib-aggregate": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -207,7 +174,6 @@
         "flake-parts": "flake-parts",
         "nix-github-actions": "nix-github-actions",
         "nixpkgs": [
-          "inputs",
           "nixpkgs"
         ],
         "treefmt-nix": "treefmt-nix"
@@ -229,7 +195,6 @@
     "nix-github-actions": {
       "inputs": {
         "nixpkgs": [
-          "inputs",
           "nix-eval-jobs",
           "nixpkgs"
         ]
@@ -251,7 +216,6 @@
     "nix-index-database": {
       "inputs": {
         "nixpkgs": [
-          "inputs",
           "nixpkgs"
         ]
       },
@@ -305,11 +269,9 @@
         "flake-compat": "flake-compat",
         "lib-aggregate": "lib-aggregate",
         "nix-eval-jobs": [
-          "inputs",
           "nix-eval-jobs"
         ],
         "nixpkgs": [
-          "inputs",
           "nixpkgs"
         ]
       },
@@ -330,7 +292,6 @@
     "pinix": {
       "inputs": {
         "nixpkgs": [
-          "inputs",
           "nixpkgs"
         ]
       },
@@ -350,7 +311,13 @@
     },
     "root": {
       "inputs": {
-        "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"
       }
     },
     "systems": {
@@ -386,7 +353,6 @@
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
-          "inputs",
           "nix-eval-jobs",
           "nixpkgs"
         ]
@@ -427,22 +393,18 @@
     "xdph": {
       "inputs": {
         "hyprland-protocols": [
-          "inputs",
           "hyprland",
           "hyprland-protocols"
         ],
         "hyprlang": [
-          "inputs",
           "hyprland",
           "hyprlang"
         ],
         "nixpkgs": [
-          "inputs",
           "hyprland",
           "nixpkgs"
         ],
         "systems": [
-          "inputs",
           "hyprland",
           "systems"
         ]
diff --git a/flake.nix b/flake.nix
index d3ac6a2..3a87756 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,13 +1,53 @@
 {
   description = "nix begat oizys";
-  inputs.inputs.url = "github:daylinmorgan/oizys?dir=inputs";
-  outputs = {
-    inputs,
+  outputs = inputs@{
     self,
+    ...
   }:
     (import ./lib {
-      inherit (inputs) inputs;
+      inherit inputs;
       inherit self;
     })
     .oizysFlake {};
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+
+    hyprland.url = "github:hyprwm/Hyprland/main";
+    hyprland.inputs.nixpkgs.follows = "nixpkgs";
+
+    hyprland-contrib.url = "github:hyprwm/contrib";
+    hyprland-contrib.inputs.nixpkgs.follows = "nixpkgs";
+
+    nixpkgs-wayland = {
+      url = "github:nix-community/nixpkgs-wayland";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nix-eval-jobs.follows = "nix-eval-jobs";
+    };
+
+    nix-eval-jobs.url = "github:nix-community/nix-eval-jobs";
+    nix-eval-jobs.inputs.nixpkgs.follows = "nixpkgs";
+
+    pinix.url = "github:remi-dupre/pinix";
+    pinix.inputs.nixpkgs.follows = "nixpkgs";
+
+    nix-index-database.url = "github:nix-community/nix-index-database";
+    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
+  };
+
+  nixConfig = {
+    extra-substituters = [
+      "https://hyprland.cachix.org"
+      "https://nixpkgs-wayland.cachix.org"
+      "https://daylin.cachix.org"
+      "https://cache.garnix.io"
+    ];
+    extra-trusted-public-keys = [
+      "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+      "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
+      "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k="
+      "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+    ];
+  };
 }
+
diff --git a/inputs/flake.nix b/inputs/flake.nix
deleted file mode 100644
index f60b11f..0000000
--- a/inputs/flake.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  description = "oizys inputs";
-
-  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-
-    hyprland.url = "github:hyprwm/Hyprland/main";
-    hyprland.inputs.nixpkgs.follows = "nixpkgs";
-
-    hyprland-contrib.url = "github:hyprwm/contrib";
-    hyprland-contrib.inputs.nixpkgs.follows = "nixpkgs";
-
-    nixpkgs-wayland = {
-      url = "github:nix-community/nixpkgs-wayland";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.nix-eval-jobs.follows = "nix-eval-jobs";
-    };
-
-    nix-eval-jobs.url = "github:nix-community/nix-eval-jobs";
-    nix-eval-jobs.inputs.nixpkgs.follows = "nixpkgs";
-
-    pinix.url = "github:remi-dupre/pinix";
-    pinix.inputs.nixpkgs.follows = "nixpkgs";
-
-    nix-index-database.url = "github:nix-community/nix-index-database";
-    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
-  };
-
-  nixConfig = {
-    extra-substituters = [
-      "https://hyprland.cachix.org"
-      "https://nixpkgs-wayland.cachix.org"
-      # "https://daylin.cachix.org"
-      "https://cache.garnix.io"
-    ];
-    extra-trusted-public-keys = [
-      "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
-      "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
-      # "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k="
-      "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
-    ];
-  };
-  outputs = _: {};
-}