one pkgs to rule them all
This commit is contained in:
parent
144fcda288
commit
81eaf7a9e7
@ -8,6 +8,12 @@ let
|
|||||||
"${user-name}/1systems/${system-name}.nix"
|
"${user-name}/1systems/${system-name}.nix"
|
||||||
"${user-name}/3modules"
|
"${user-name}/3modules"
|
||||||
"krebs/3modules"
|
"krebs/3modules"
|
||||||
|
] ++ [
|
||||||
|
({ lib, pkgs, ... }: {
|
||||||
|
_module.args.pkgs =
|
||||||
|
(import ./krebs/5pkgs { inherit lib pkgs; }) //
|
||||||
|
(import (./. + "/${user-name}/5pkgs") { inherit lib pkgs; });
|
||||||
|
})
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -61,9 +61,9 @@ let
|
|||||||
${cfg.ssh-identity-file} \
|
${cfg.ssh-identity-file} \
|
||||||
"$ssh_identity_file_target"
|
"$ssh_identity_file_target"
|
||||||
|
|
||||||
ln -snf ${kpkgs.github-known_hosts} ${cfg.dataDir}/.ssh/known_hosts
|
ln -snf ${pkgs.github-known_hosts} ${cfg.dataDir}/.ssh/known_hosts
|
||||||
'';
|
'';
|
||||||
ExecStart = "${kpkgs.github-hosts-sync}/bin/github-hosts-sync";
|
ExecStart = "${pkgs.github-hosts-sync}/bin/github-hosts-sync";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -77,7 +77,5 @@ let
|
|||||||
name = "github-hosts-sync";
|
name = "github-hosts-sync";
|
||||||
uid = 3220554646; # genid github-hosts-sync
|
uid = 3220554646; # genid github-hosts-sync
|
||||||
};
|
};
|
||||||
|
|
||||||
kpkgs = import ../../krebs/5pkgs { inherit lib pkgs; };
|
|
||||||
in
|
in
|
||||||
out
|
out
|
||||||
|
@ -6,7 +6,6 @@ let
|
|||||||
inherit (pkgs) callPackage;
|
inherit (pkgs) callPackage;
|
||||||
in
|
in
|
||||||
|
|
||||||
pkgs //
|
|
||||||
rec {
|
rec {
|
||||||
cac = callPackage ./cac.nix {};
|
cac = callPackage ./cac.nix {};
|
||||||
dic = callPackage ./dic.nix {};
|
dic = callPackage ./dic.nix {};
|
||||||
|
Loading…
Reference in New Issue
Block a user