move mkmachine in separate file

This commit is contained in:
Luj 2023-11-06 10:20:10 +01:00
parent c400b68f47
commit cd7904bdd8
4 changed files with 82 additions and 85 deletions

View file

@ -7,7 +7,11 @@
home-manager = {
url = "github:nix-community/home-manager/release-23.05";
inputs.nixpkgs.follows = "unstable";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager-unstable = {
url = "github:nix-community/home-manager/master";
};
homepage = {
@ -17,6 +21,8 @@
unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
unstable-plus-patches.url = "github:JulienMalka/nixpkgs/unstable-plus-patches";
flake-utils.url = "github:numtide/flake-utils";
colmena.url = "github:zhaofengli/colmena";
@ -73,6 +79,7 @@
let
lib = nixpkgs.lib.extend (import ./lib inputs);
machines_plats = lib.mapAttrsToList (name: value: value.arch) (lib.filterAttrs (n: v: builtins.hasAttr "arch" v) lib.luj.machines);
mkMachine = import ./lib/mkmachine.nix inputs lib;
nixpkgs_plats = builtins.listToAttrs (builtins.map
(plat: {
@ -91,7 +98,7 @@
(builtins.attrNames (builtins.readDir ./modules)));
nixosConfigurations = builtins.mapAttrs
(name: value: (lib.mkMachine {
(name: value: (mkMachine {
host = name;
host-config = value;
modules = self.nixosModules;