willemml/dotfiles.nix
1
0
Fork 0
mirror of https://github.com/willemml/dotfiles.nix.git synced 2025-04-12 19:27:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

make apps also output as programs

Browse source
This commit is contained in:
willemml 2023-03-17 01:12:50 -07:00
parent f130fd10df
commit 64b1f20745
Signed by: willemml
GPG key ID: C3DE5DF6198DACBD
3 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
flake-parts/apps.nix
View file

@ -2,14 +2,15 @@
flake = flake =
let let
buildProgram = system: definition: (withSystem system ({ pkgs, self', ... }: definition self.lib pkgs)); buildProgram = system: definition: (withSystem system ({ pkgs, self', ... }: definition self.lib pkgs));
createApp = { definition, system }: { type = "app"; program = lib.getExe (buildProgram system definition); }; defineProgram = system: name: definition: { ${system}.${name} = buildProgram system definition; };
defineApp = system: name: definition: { ${system}.${name} = createApp { definition = definition; system = system; }; };
appsDir = self.lib.importDirToAttrs ../apps; appsDir = self.lib.importDirToAttrs ../apps;
builtApps = lib.mapAttrsToList (name: value: (lib.forEach value.systems (system: defineApp system name value.definition))) appsDir; builtPrograms = lib.mapAttrsToList (name: value: (lib.forEach value.systems (system: defineProgram system name value.definition))) appsDir;
flattened = lib.flatten builtApps; flattenedPrograms = lib.flatten builtPrograms;
assembled = builtins.foldl' (a: b: lib.recursiveUpdate a b) { } flattened; assembledPrograms = builtins.foldl' (a: b: lib.recursiveUpdate a b) { } flattenedPrograms;
assembledApps = lib.mapAttrsRecursiveCond (as: !(as ? "type" && as.type == "derivation")) (path: value: { type = "app"; program = lib.getExe value; }) assembledPrograms;
in in
{ {
apps = assembled; apps = assembledApps;
programs = assembledPrograms;
}; };
} }

8
flake-parts/home-manager/users.nix
View file

@ -18,9 +18,9 @@
}; };
}; };
}; };
packages = lib.pipe activationPackages [ # packages = lib.pipe activationPackages [
(lib.filterAttrs (_: drv: pkgs.system == drv.system)) # (lib.filterAttrs (_: drv: pkgs.system == drv.system))
(lib.mapAttrs' (username: lib.nameValuePair "home-${username}")) # (lib.mapAttrs' (username: lib.nameValuePair "home-${username}"))
]; # ];
}; };
} }

9
testing.nix Normal file
View file

@ -0,0 +1,9 @@
{ withSystem, ... }:
{
flake = {
packages.aarch64-darwin.test = (withSystem "aarch64-darwin" ({ pkgs, ... }: pkgs.writeScriptBin "runme" ''
echo "I am currently being run!"
''));
};
}