fix(#1): merge 'follows' directives with mkDep
All checks were successful
Discord / discord commits (push) Has been skipped

This commit is contained in:
matt1432 2024-08-02 23:28:04 -04:00
parent 24aa4b9842
commit 2861935ddd
4 changed files with 28 additions and 4 deletions

View file

@ -1,4 +1,8 @@
deviceName: {config, self, ...}: let deviceName: {
config,
self,
...
}: let
inherit (config.vars) mainUser hostName; inherit (config.vars) mainUser hostName;
clusterIP = config.services.pcsd.virtualIps.caddy-vip.ip; clusterIP = config.services.pcsd.virtualIps.caddy-vip.ip;

Binary file not shown.

BIN
flake.nix

Binary file not shown.

View file

@ -3,9 +3,29 @@ let
# Misc functions # Misc functions
mkInput = {type ? "github", ...} @ info: info // {inherit type;}; mkInput = {type ? "github", ...} @ info: info // {inherit type;};
mkDep = info: (mkInput info) // {inputs.nixpkgs.follows = "nixpkgs";}; mkDep = info:
mkHyprDep = info: (mkInput info) // {inputs.hyprland.follows = "hyprland";}; mkInput (info
mkSrc = info: (mkInput info) // {flake = false;}; // {
inputs =
{nixpkgs.follows = "nixpkgs";}
// (
if builtins.hasAttr "inputs" info
then info.inputs
else {}
);
});
mkHyprDep = info:
mkInput (info
// {
inputs =
{hyprland.follows = "hyprland";}
// (
if builtins.hasAttr "inputs" info
then info.inputs
else {}
);
});
mkSrc = info: mkInput (info // {flake = false;});
# Inputs # Inputs
nixTools = { nixTools = {