diff --git a/flake.lock b/flake.lock index 551ce4dc..53040a5f 100644 Binary files a/flake.lock and b/flake.lock differ diff --git a/flake.nix b/flake.nix index 5ce1be92..f82fdf47 100644 Binary files a/flake.nix and b/flake.nix differ diff --git a/inputs/default.nix b/inputs/default.nix index 655e51b3..c4b918e5 100644 --- a/inputs/default.nix +++ b/inputs/default.nix @@ -29,7 +29,11 @@ let repo = "nurl"; }; - # These are here to make sure all 'systems' are the same + # These are here to make sure all 'systems' and popular inputs are the same + flake-compat = mkInput { + owner = "edolstra"; + repo = "flake-compat"; + }; flake-utils = mkInput { owner = "numtide"; repo = "flake-utils"; @@ -47,6 +51,15 @@ let owner = "nix-community"; repo = "lib-aggregate"; }; + nix-github-actions = mkDep { + owner = "nix-community"; + repo = "nix-github-actions"; + }; + pre-commit-hooks = mkDep { + owner = "cachix"; + repo = "git-hooks.nix"; + inputs.flake-compat.follows = "flake-compat"; + }; }; overlays = { @@ -133,11 +146,10 @@ let repo = "hyprpaper"; inputs = { + hyprgraphics.follows = "hyprland/hyprgraphics"; hyprlang.follows = "hyprland/hyprlang"; hyprutils.follows = "hyprland/hyprutils"; hyprwayland-scanner.follows = "hyprland/hyprwayland-scanner"; - nixpkgs.follows = "hyprland/nixpkgs"; - systems.follows = "hyprland/systems"; }; }; diff --git a/inputs/lib.nix b/inputs/lib.nix index 112c802e..adc160b7 100644 --- a/inputs/lib.nix +++ b/inputs/lib.nix @@ -34,11 +34,14 @@ in rec { info {inherit type;} (mkOverride "systems") + (mkOverride "flake-compat") (mkOverride "flake-utils") (mkOverride "flake-parts") - (mkOverride "treefmt-nix") (mkOverride "lib-aggregate") (mkOverride "nix-eval-jobs") + (mkOverride "nix-github-actions") + (mkOverride "pre-commit-hooks") + (mkOverride "treefmt-nix") ]; mkDep = info: mkInput (recursiveUpdate info {inputs.nixpkgs.follows = "nixpkgs";});