nullbite/nixfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make adb module portable

Browse Source
This commit is contained in:
NullBite 2024-01-20 23:05:52 +01:00
parent abe4903e6b
commit 6cb0dfaea3
Signed by: nullbite
GPG Key ID: 6C4D545385D4925A
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.nix
View File

@ -82,6 +82,10 @@
}; };
}; };
moduleInputs = {
inherit mkExtraPkgs;
};
in { in {
# for repl debugging via :lf . # for repl debugging via :lf .
inherit inputs; inherit inputs;
@ -89,8 +93,8 @@
inherit lib username; inherit lib username;
}; };
nixosModules = import ./modules/nixos; nixosModules = (import ./modules/nixos) moduleInputs;
homeManagerModules = import ./modules/home-manager; homeManagerModules = (import ./modules/home-manager) moduleInputs;
nixosConfigurations = { nixosConfigurations = {
slab = lib.nixosSystem rec { slab = lib.nixosSystem rec {

9
modules/nixos/adb-old.nix
View File

@ -1,9 +1,10 @@
{ config, lib, pkgs, extraPkgs, ... }: {...}@moduleInputs:
# TODO extraPkgs isn't a normal argument, make this somehow accessible if { config, lib, pkgs, ... }:
# imported into a different configuration; maybe a wrapper function in the flake
with lib; with lib;
let
extraPkgs = (moduleInputs.mkExtraPkgs pkgs.system);
in
{ {
meta.maintainers = [ maintainers.mic92 ]; meta.maintainers = [ maintainers.mic92 ];

3
modules/nixos/default.nix
View File

@ -1,3 +1,4 @@
{...}@moduleInputs:
{ {
adb = import ./adb-old.nix; adb = (import ./adb-old.nix) moduleInputs;
} }