mirror of
https://gitlab.com/rensa-nix/core.git
synced 2025-12-11 22:00:09 +01:00
chore: minor improvements & add blocks
This commit is contained in:
parent
3aeff518bb
commit
2774f3ea91
4 changed files with 14 additions and 9 deletions
|
|
@ -11,11 +11,8 @@
|
||||||
rensa.buildWith {
|
rensa.buildWith {
|
||||||
inherit inputs;
|
inherit inputs;
|
||||||
cellsFrom = ./cells;
|
cellsFrom = ./cells;
|
||||||
cellBlocks = [
|
cellBlocks = with rensa.blocks; [
|
||||||
{
|
(simple "test")
|
||||||
name = "test";
|
|
||||||
type = "test";
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
} {};
|
} {};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,11 @@
|
||||||
{
|
{
|
||||||
|
simple = name: {
|
||||||
|
inherit name;
|
||||||
|
type = name;
|
||||||
|
};
|
||||||
|
dynamic = name: {
|
||||||
|
inherit name;
|
||||||
|
type = name;
|
||||||
|
# TODO: dynamic actions
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,6 @@
|
||||||
}
|
}
|
||||||
else throw "Neither ${blockP.file} nor ${blockP.dir} exist, this shouldn't happen!";
|
else throw "Neither ${blockP.file} nor ${blockP.dir} exist, this shouldn't happen!";
|
||||||
|
|
||||||
targetTracer = name: l.traceVerbose "[ren] loading, system=${system} path=${importPaths.importPath} name=${name}";
|
|
||||||
imported = import' importPaths.importPath;
|
imported = import' importPaths.importPath;
|
||||||
isAttrs = builtins.isAttrs imported;
|
isAttrs = builtins.isAttrs imported;
|
||||||
|
|
||||||
|
|
@ -70,7 +69,7 @@
|
||||||
)
|
)
|
||||||
else {};
|
else {};
|
||||||
in {
|
in {
|
||||||
init = targetTracer name {
|
init = l.traceVerbose "[ren] loading, system=${system} path=${importPaths.importPath} name=${name}" {
|
||||||
inherit name;
|
inherit name;
|
||||||
actions =
|
actions =
|
||||||
l.mapAttrsToList (name: a: {
|
l.mapAttrsToList (name: a: {
|
||||||
|
|
|
||||||
|
|
@ -3,9 +3,9 @@
|
||||||
utils = import ./utils {inherit l;};
|
utils = import ./utils {inherit l;};
|
||||||
core = import ./core {inherit l utils;};
|
core = import ./core {inherit l utils;};
|
||||||
compat = import ./compat {inherit l;};
|
compat = import ./compat {inherit l;};
|
||||||
|
blocks = import ./blocks;
|
||||||
in {
|
in {
|
||||||
inherit (compat) filter select get;
|
inherit (compat) filter select get;
|
||||||
inherit (core) build buildWith;
|
inherit (core) build buildWith;
|
||||||
# TODO:
|
inherit blocks;
|
||||||
# blocks = import ./blocks;
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue