hektor/nix
1
0
Fork 0
Code Pull Requests Activity

chore(modules): add auto-import default.nix files

Browse Source
This commit is contained in:
Hektor Misplon
2026-05-22 20:19:10 +02:00
parent a9dc191c2f
commit bd8a8f7942
12 changed files with 193 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
home/modules/default.nix
View File

@@ -5,52 +5,40 @@
...
}:
let
moduleDirs = lib.filterAttrs (_: v: v == "directory") (builtins.readDir ./.);
dirHasEnableOption =
name:
{
imports =
let
nixFiles = lib.filterAttrs (n: v: v == "regular" && lib.hasSuffix ".nix" n) (
builtins.readDir ./${name}
);
dirs = lib.attrNames (lib.filterAttrs (_: v: v == "directory") (builtins.readDir ./.));
hasDef = name: builtins.pathExists ./${name}/default.nix;
in
!(builtins.pathExists ./${name}/default.nix)
|| lib.any (f: lib.hasInfix "mkEnableOption" (builtins.readFile ./${name}/${f})) (
builtins.attrNames nixFiles
);
withoutEnableOption = builtins.attrNames (
lib.filterAttrs (name: _: !dirHasEnableOption name) moduleDirs
);
in
lib.throwIf (withoutEnableOption != [ ])
"home modules missing enable option: ${lib.concatStringsSep ", " withoutEnableOption}"
{
options = {
host.username = lib.mkOption {
type = lib.types.str;
default = config.home.username;
};
map (name: ./${name}) (builtins.filter hasDef dirs);
nixgl.wrap = lib.mkOption {
type = lib.types.functionTo lib.types.package;
default = if config.lib ? nixGL then config.lib.nixGL.wrap else lib.id;
readOnly = true;
};
wrapApp = lib.mkOption {
type = lib.types.raw;
default =
pkg: flags:
if config.lib ? nixGL then
pkg.overrideAttrs (old: {
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.makeWrapper ];
postInstall = (old.postInstall or "") + ''
wrapProgram $out/bin/${pkg.meta.mainProgram} --add-flags "${flags}"
'';
})
else
pkg;
readOnly = true;
};
options = {
host.username = lib.mkOption {
type = lib.types.str;
default = config.home.username;
};
}
nixgl.wrap = lib.mkOption {
type = lib.types.functionTo lib.types.package;
default = if config.lib ? nixGL then config.lib.nixGL.wrap else lib.id;
readOnly = true;
};
wrapApp = lib.mkOption {
type = lib.types.raw;
default =
pkg: flags:
if config.lib ? nixGL then
pkg.overrideAttrs (old: {
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.makeWrapper ];
postInstall = (old.postInstall or "") + ''
wrapProgram $out/bin/${pkg.meta.mainProgram} --add-flags "${flags}"
'';
})
else
pkg;
readOnly = true;
};
};
}