Skip to content

Commit

Permalink
feat(nix-droid): using utility mkDroidConfiguration
Browse files Browse the repository at this point in the history
  • Loading branch information
r17x committed Nov 3, 2024
1 parent d9c9e76 commit 1db9752
Showing 1 changed file with 35 additions and 27 deletions.
62 changes: 35 additions & 27 deletions nix/hosts/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
self,
withSystem,
inputs,
nixpkgs,
nix,
...
}:

Expand Down Expand Up @@ -86,6 +88,24 @@ let
);

mkDarwinConfigurations = configurations: builtins.mapAttrs mkDarwin configurations;

mkDroidConfiguration =
{
system,
modules ? [ ],
}:
withSystem system (
ctx:
inputs.nix-on-droid.lib.nixOnDroidConfiguration {
inherit (ctx) pkgs;
modules = [
{
inherit (ctx) nix;
nixpkgs = removeAttrs ctx.nixpkgs [ "hostPlatform" ];
}
] ++ modules;
}
);
in

{
Expand All @@ -109,32 +129,20 @@ in
eR17x = { };
};

flake.nixOnDroidConfigurations.default =
let
stateVersion = "24.05";
in
inputs.nix-on-droid.lib.nixOnDroidConfiguration {
pkgs = import inputs.nixpkgs {
system = "aarch64-linux";
overlays = inputs.nixpkgs.lib.attrValues self.overlays;
};
modules = [
{
system.stateVersion = stateVersion;
nix.extraOptions = ''
experimental-features = nix-command flakes
'';
home-manager.useGlobalPkgs = true;
home-manager.config = {
home.stateVersion = stateVersion;
imports = [
self.homeManagerModules.r17-shell
self.homeManagerModules.r17-packages
];
};
}
];
}
flake.nixOnDroidConfigurations.default = mkDroidConfiguration {
system = "aarch64-linux";
modules = [
{
system.stateVersion = "24.05";
home-manager.useGlobalPkgs = true;
home-manager.config = {
home.stateVersion = "24.05";
imports = [
self.homeManagerModules.r17-shell
];
};
}
];
};

;
}

0 comments on commit 1db9752

Please sign in to comment.