Luj/snowfield
1
0
Fork 0
mirror of https://github.com/JulienMalka/snowfield.git synced 2025-03-30 08:40:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: adapt machine creation to meta module

Browse source
This commit is contained in:
Julien Malka 2024-08-10 17:59:19 +02:00
parent 9e9a7027e9
commit cc59392716
Signed by: Luj
GPG key ID: 6FC74C847011FD83
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
default.nix
View file

@ -10,10 +10,10 @@ let
lib = (import "${inputs.nixpkgs}/lib").extend (import ./lib inputs_final); lib = (import "${inputs.nixpkgs}/lib").extend (import ./lib inputs_final);
mkLibForMachine = mkLibForMachine =
machine: machine:
(import "${lib.luj.machines.${machine}.nixpkgs_version}/lib").extend (import ./lib inputs_final); (import "${lib.snowfield.${machine}.nixpkgs_version}/lib").extend (import ./lib inputs_final);
machines_plats = lib.lists.unique ( machines_plats = lib.lists.unique (
lib.mapAttrsToList (_name: value: value.arch) ( lib.mapAttrsToList (_name: value: value.arch) (
lib.filterAttrs (_n: v: builtins.hasAttr "arch" v) lib.luj.machines lib.filterAttrs (_n: v: builtins.hasAttr "arch" v) lib.snowfield
) )
); );
mkMachine = import ./lib/mkmachine.nix inputs_final lib; mkMachine = import ./lib/mkmachine.nix inputs_final lib;
@ -40,9 +40,9 @@ rec {
inherit name; inherit name;
host-config = value; host-config = value;
modules = nixosModules; modules = nixosModules;
nixpkgs = lib.luj.machines.${name}.nixpkgs_version; nixpkgs = lib.snowfield.${name}.nixpkgs_version;
system = lib.luj.machines.${name}.arch; system = lib.snowfield.${name}.arch;
home-manager = lib.luj.machines.${name}.hm_version; home-manager = lib.snowfield.${name}.hm_version;
}) })
) (lib.importConfig ./machines); ) (lib.importConfig ./machines);

3
modules/deployment/default.nix
View file

@ -11,7 +11,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
deployment = { deployment = {
targetHost = "${hostname}.${lib.luj.machines.${hostname}.tld}"; targetHost = "${hostname}.${config.machine.meta.tld}";
targetPort = 45; targetPort = 45;
targetUser = "root"; targetUser = "root";
allowLocalDeployment = true; allowLocalDeployment = true;
@ -20,4 +20,3 @@ in
}; };
} }