refactor: move all inputs to

_outputs.nix

@@ -1,45 +1,5 @@
 {
-  inputs = let
+  inputs = import ./inputs;
-    inherit (import ./inputs) mkInput extraInputs;
-
-    mainInputs = {
-      systems = mkInput {
-        owner = "nix-systems";
-        repo = "default-linux";
-      };
-
-      nixpkgs = mkInput {
-        owner = "NixOS";
-        repo = "nixpkgs";
-        ref = "nixos-unstable-small";
-      };
-
-      home-manager = mkInput {
-        owner = "nix-community";
-        repo = "home-manager";
-      };
-
-      nix-on-droid = mkInput {
-        owner = "nix-community";
-        repo = "nix-on-droid";
-
-        inputs.home-manager.follows = "home-manager";
-      };
-
-      sops-nix = mkInput {
-        owner = "Mic92";
-        repo = "sops-nix";
-      };
-
-      secrets = mkInput {
-        type = "git";
-        url = "ssh://git@git.nelim.org/matt1432/nixos-secrets";
-
-        inputs.sops-nix.follows = "sops-nix";
-      };
-    };
-  in
-    mainInputs // extraInputs;
 
   outputs = inputs @ {
     self,

inputs/default.nix

@@ -4,6 +4,43 @@ let
   inherit (builtins) listToAttrs map removeAttrs;
 
   # Inputs
+  mainInputs = {
+    systems = mkInput {
+      owner = "nix-systems";
+      repo = "default-linux";
+    };
+
+    nixpkgs = mkInput {
+      owner = "NixOS";
+      repo = "nixpkgs";
+      ref = "nixos-unstable-small";
+    };
+
+    home-manager = mkInput {
+      owner = "nix-community";
+      repo = "home-manager";
+    };
+
+    nix-on-droid = mkInput {
+      owner = "nix-community";
+      repo = "nix-on-droid";
+
+      inputs.home-manager.follows = "home-manager";
+    };
+
+    sops-nix = mkInput {
+      owner = "Mic92";
+      repo = "sops-nix";
+    };
+
+    secrets = mkInput {
+      type = "git";
+      url = "ssh://git@git.nelim.org/matt1432/nixos-secrets";
+
+      inputs.sops-nix.follows = "sops-nix";
+    };
+  };
+
   nixTools = {
     nix-fast-build = mkInput {
       owner = "Mic92";
@@ -385,16 +422,14 @@ let
       repo = "sioyek";
     }
   ];
-in {
+in
-  inherit mkInput mkSrc;
-
-  extraInputs =
   {
     flakegen = {
       url = "github:jorsn/flakegen";
       inputs.systems.follows = "systems";
     };
   }
+  // mainInputs
   // nixTools
   // overlays
   // nvimInputs
@@ -408,5 +443,4 @@ in {
       name = x.name or "${x.repo}-src";
       value = mkSrc (removeAttrs x ["name"]);
     })
-      srcs));
+    srcs))
-}