From 2e0ec36c0a53ae2f3bf48a448d223ba4a16747a8 Mon Sep 17 00:00:00 2001
From: Daylin Morgan <daylinmorgan@gmail.com>
Date: Wed, 21 Feb 2024 14:36:33 -0600
Subject: [PATCH] less in flake.nix because why not

---
 flake.lock      | 78 ++++++++++++++++++++++++-------------------------
 flake.nix       | 23 +++++----------
 lib/default.nix |  9 +++++-
 3 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/flake.lock b/flake.lock
index 146dfd6..05de55d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -15,10 +15,31 @@
         "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": [
-          "inputs",
+          "flake-inputs",
           "nix-eval-jobs",
           "nixpkgs"
         ]
@@ -60,7 +81,7 @@
         "hyprland-protocols": "hyprland-protocols",
         "hyprlang": "hyprlang",
         "nixpkgs": [
-          "inputs",
+          "flake-inputs",
           "nixpkgs"
         ],
         "systems": "systems",
@@ -85,7 +106,7 @@
     "hyprland-contrib": {
       "inputs": {
         "nixpkgs": [
-          "inputs",
+          "flake-inputs",
           "nixpkgs"
         ]
       },
@@ -106,12 +127,12 @@
     "hyprland-protocols": {
       "inputs": {
         "nixpkgs": [
-          "inputs",
+          "flake-inputs",
           "hyprland",
           "nixpkgs"
         ],
         "systems": [
-          "inputs",
+          "flake-inputs",
           "hyprland",
           "systems"
         ]
@@ -133,7 +154,7 @@
     "hyprlang": {
       "inputs": {
         "nixpkgs": [
-          "inputs",
+          "flake-inputs",
           "hyprland",
           "nixpkgs"
         ]
@@ -155,7 +176,7 @@
     "hyprlang_2": {
       "inputs": {
         "nixpkgs": [
-          "inputs",
+          "flake-inputs",
           "hyprland",
           "xdph",
           "nixpkgs"
@@ -175,27 +196,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": {
-        "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": [
-          "inputs",
+          "flake-inputs",
           "nixpkgs"
         ],
         "treefmt-nix": "treefmt-nix"
@@ -242,7 +242,7 @@
     "nix-github-actions": {
       "inputs": {
         "nixpkgs": [
-          "inputs",
+          "flake-inputs",
           "nix-eval-jobs",
           "nixpkgs"
         ]
@@ -264,7 +264,7 @@
     "nix-index-database": {
       "inputs": {
         "nixpkgs": [
-          "inputs",
+          "flake-inputs",
           "nixpkgs"
         ]
       },
@@ -318,11 +318,11 @@
         "flake-compat": "flake-compat",
         "lib-aggregate": "lib-aggregate",
         "nix-eval-jobs": [
-          "inputs",
+          "flake-inputs",
           "nix-eval-jobs"
         ],
         "nixpkgs": [
-          "inputs",
+          "flake-inputs",
           "nixpkgs"
         ]
       },
@@ -343,7 +343,7 @@
     "pinix": {
       "inputs": {
         "nixpkgs": [
-          "inputs",
+          "flake-inputs",
           "nixpkgs"
         ]
       },
@@ -363,7 +363,7 @@
     },
     "root": {
       "inputs": {
-        "inputs": "inputs"
+        "flake-inputs": "flake-inputs"
       }
     },
     "systems": {
@@ -399,7 +399,7 @@
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
-          "inputs",
+          "flake-inputs",
           "nix-eval-jobs",
           "nixpkgs"
         ]
@@ -440,18 +440,18 @@
     "xdph": {
       "inputs": {
         "hyprland-protocols": [
-          "inputs",
+          "flake-inputs",
           "hyprland",
           "hyprland-protocols"
         ],
         "hyprlang": "hyprlang_2",
         "nixpkgs": [
-          "inputs",
+          "flake-inputs",
           "hyprland",
           "nixpkgs"
         ],
         "systems": [
-          "inputs",
+          "flake-inputs",
           "hyprland",
           "systems"
         ]
diff --git a/flake.nix b/flake.nix
index 1a21d0d..215138f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,23 +1,16 @@
 {
   description = "nix begat oizys";
 
-  # inputs.inputs.url = "github:daylinmorgan/oizys?dir=inputs";
-  inputs.inputs.url = "path:./inputs";
+  # inputs.flake-inputs.url = "github:daylinmorgan/oizys?dir=inputs";
+  inputs.flake-inputs.url = "path:./inputs";
 
   outputs = {
-    inputs,
     self,
-    ...
-  }: let
-    lib = import ./lib {
-      nixpkgs = inputs.inputs.nixpkgs;
-      inputs = inputs.inputs;
+    flake-inputs,
+  }:
+    (import ./lib {
       inherit self;
-    };
-    inherit (lib) findModules buildHosts buildOizys;
-  in {
-    nixosModules = findModules {};
-    nixosConfigurations = buildHosts {};
-    packages = buildOizys {};
-  };
+      inputs = flake-inputs.inputs;
+    })
+    .oizysFlake {};
 }
diff --git a/lib/default.nix b/lib/default.nix
index 02793b4..3d208eb 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,9 +1,9 @@
 {
   inputs,
-  nixpkgs,
   self,
   ...
 }: let
+  nixpkgs = inputs.nixpkgs;
   inherit (builtins) concatLists attrValues mapAttrs elemAt match readDir filter listToAttrs;
   inherit (nixpkgs.lib) hasSuffix nixosSystem genAttrs;
   inherit (nixpkgs.lib.filesystem) listFilesRecursive;
@@ -69,4 +69,11 @@ in rec {
           }
         ]
         else findModulesList (dir + "/${name}")) (readDir dir)));
+
+  oizysFlake = _: {
+    nixosModules = findModules {};
+    nixosConfigurations = buildHosts {};
+    packages = buildOizys {};
+    formatter = forAllSystems (pkgs: pkgs.alejandra);
+  };
 }