1
1
mirror of https://github.com/divnix/digga.git synced 2024-12-23 16:11:51 +03:00

Move library code to src/ and cleanup folders

This commit is contained in:
Pacman99 2021-05-12 14:54:47 -07:00 committed by Parthiv Seetharaman
parent d5a1955553
commit a489a954fd
20 changed files with 9 additions and 48 deletions

View File

@ -1,14 +0,0 @@
let
rev = "e7e5d481a0e15dcd459396e55327749989e04ce0";
flake = (import
(
fetchTarball {
url = "https://github.com/edolstra/flake-compat/archive/${rev}.tar.gz";
sha256 = "0zd3x46fswh5n6faq4x2kkpy6p3c6j593xbdlbsl40ppkclwc80x";
}
)
{
src = ../../.;
});
in
flake

View File

@ -1,10 +0,0 @@
{ ... }:
let
inherit (default.inputs.nixos) lib;
host = configs.${hostname} or configs.NixOS;
configs = default.nixosConfigurations;
default = (import ../.).defaultNix;
hostname = lib.fileContents /etc/hostname;
in
host

View File

@ -1,15 +0,0 @@
{ lib }:
nixosConfigurations:
with lib;
let
mkHomes = hostName: host:
mapAttrs' (user: v: nameValuePair "${user}@${hostName}" v.home)
# So this function is useful for non-devos hosts
(host.config.system.build.homes or host.config.home-manager.users);
hmConfigs = mapAttrs mkHomes nixosConfigurations;
in
foldl recursiveUpdate { } (attrValues hmConfigs)

View File

@ -14,23 +14,23 @@
let combinedLib = nixpkgs.lib // self; in
with self;
utils.lib // {
attrs = import ./attrs.nix { lib = combinedLib; };
lists = import ./lists.nix { lib = combinedLib; };
strings = import ./strings.nix { lib = combinedLib; };
modules = import ./modules.nix { lib = combinedLib; };
importers = import ./importers.nix { lib = combinedLib; };
attrs = import ./src/attrs.nix { lib = combinedLib; };
lists = import ./src/lists.nix { lib = combinedLib; };
strings = import ./src/strings.nix { lib = combinedLib; };
modules = import ./src/modules.nix { lib = combinedLib; };
importers = import ./src/importers.nix { lib = combinedLib; };
generators = import ./generators.nix {
generators = import ./src/generators.nix {
lib = combinedLib;
inherit deploy;
};
mkFlake = {
__functor = import ./mkFlake { lib = combinedLib; };
evalArgs = import ./mkFlake/evalArgs.nix { lib = combinedLib; };
__functor = import ./src/mkFlake { lib = combinedLib; };
evalArgs = import ./src/mkFlake/evalArgs.nix { lib = combinedLib; };
};
pkgs-lib = import ./pkgs-lib {
pkgs-lib = import ./src/pkgs-lib {
lib = combinedLib;
inherit deploy devshell;
};