refactor: move all inputs to
All checks were successful
Discord / discord commits (push) Has been skipped

This commit is contained in:
matt1432 2025-01-27 18:16:37 -05:00
parent 957053bcb0
commit 0fd37a9919
2 changed files with 60 additions and 66 deletions

View file

@ -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 @ { outputs = inputs @ {
self, self,

View file

@ -4,6 +4,43 @@ let
inherit (builtins) listToAttrs map removeAttrs; inherit (builtins) listToAttrs map removeAttrs;
# Inputs # 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 = { nixTools = {
nix-fast-build = mkInput { nix-fast-build = mkInput {
owner = "Mic92"; owner = "Mic92";
@ -385,28 +422,25 @@ let
repo = "sioyek"; repo = "sioyek";
} }
]; ];
in { in
inherit mkInput mkSrc; {
flakegen = {
extraInputs = url = "github:jorsn/flakegen";
{ inputs.systems.follows = "systems";
flakegen = { };
url = "github:jorsn/flakegen"; }
inputs.systems.follows = "systems"; // mainInputs
}; // nixTools
} // overlays
// nixTools // nvimInputs
// overlays // clusterInputs
// nvimInputs // serviviInputs
// clusterInputs // nosInputs
// serviviInputs // bbsteamieInputs
// nosInputs // desktopInputs.hyprlandInputs
// bbsteamieInputs // desktopInputs.agsInputs
// desktopInputs.hyprlandInputs // (listToAttrs (map (x: {
// desktopInputs.agsInputs name = x.name or "${x.repo}-src";
// (listToAttrs (map (x: { value = mkSrc (removeAttrs x ["name"]);
name = x.name or "${x.repo}-src"; })
value = mkSrc (removeAttrs x ["name"]); srcs))
})
srcs));
}