Merged utils with lib

This commit is contained in:
Julien Malka 2021-12-29 16:41:31 +01:00
parent 35817544b1
commit 9889a415df
No known key found for this signature in database
GPG key ID: 3C68E13964FEA07F
3 changed files with 9 additions and 45 deletions

View file

@ -1,5 +1,6 @@
{ nixpkgs, home-manager, sops-nix, nixpkgs-unstable, inputs }:
with builtins;
inputs: final: prev:
with builtins; with inputs;
let
overlay-unstable = final: prev: {
@ -14,7 +15,7 @@ in
inherit inputs;
};
modules = builtins.attrValues modules ++ [
./base.nix
../base.nix
sops-nix.nixosModules.sops
host-config
home-manager.nixosModules.home-manager
@ -25,8 +26,8 @@ in
overlay-unstable
(final: prev:
{
tinystatus = prev.pkgs.callPackage ./packages/tinystatus {};
mosh = prev.pkgs.callPackage ./packages/mosh {};
tinystatus = prev.pkgs.callPackage ../packages/tinystatus {};
mosh = prev.pkgs.callPackage ../packages/mosh {};
})
];
}
@ -36,3 +37,4 @@ in
importConfig = with builtins; path: (mapAttrs (name: value: import (path + "/${name}/default.nix")) (readDir path));
}