From cc59392716e6ec1f72ee7321ee1b3c2f6bbb115b Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Sat, 10 Aug 2024 17:59:19 +0200 Subject: [PATCH] chore: adapt machine creation to meta module --- default.nix | 10 +++++----- modules/deployment/default.nix | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/default.nix b/default.nix index 6f221e7..db54ef1 100644 --- a/default.nix +++ b/default.nix @@ -10,10 +10,10 @@ let lib = (import "${inputs.nixpkgs}/lib").extend (import ./lib inputs_final); mkLibForMachine = 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 ( 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; @@ -40,9 +40,9 @@ rec { inherit name; host-config = value; modules = nixosModules; - nixpkgs = lib.luj.machines.${name}.nixpkgs_version; - system = lib.luj.machines.${name}.arch; - home-manager = lib.luj.machines.${name}.hm_version; + nixpkgs = lib.snowfield.${name}.nixpkgs_version; + system = lib.snowfield.${name}.arch; + home-manager = lib.snowfield.${name}.hm_version; }) ) (lib.importConfig ./machines); diff --git a/modules/deployment/default.nix b/modules/deployment/default.nix index 00ff41d..0eafa30 100644 --- a/modules/deployment/default.nix +++ b/modules/deployment/default.nix @@ -11,7 +11,7 @@ in config = mkIf cfg.enable { deployment = { - targetHost = "${hostname}.${lib.luj.machines.${hostname}.tld}"; + targetHost = "${hostname}.${config.machine.meta.tld}"; targetPort = 45; targetUser = "root"; allowLocalDeployment = true; @@ -20,4 +20,3 @@ in }; } -