From 9563498926e8026068e2dc22cc6e0caf7291365c Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Sun, 25 Aug 2024 19:22:49 +1000 Subject: [PATCH] chore(daedalus): use flake binaries --- outputs.nix | 3 +++ profiles/daedalus.nix | 16 ++++++---------- profiles/desktop_common.nix | 1 + 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/outputs.nix b/outputs.nix index bb4b9b7..f395c7a 100644 --- a/outputs.nix +++ b/outputs.nix @@ -34,6 +34,9 @@ in { overlays = []; }; }; + defaults = { + _module.args.inputs = inputs; + }; airgead = { imports = [ hosts/airgead diff --git a/profiles/daedalus.nix b/profiles/daedalus.nix index cb875cc..cdc4733 100644 --- a/profiles/daedalus.nix +++ b/profiles/daedalus.nix @@ -1,18 +1,14 @@ # NixOps configuration for the hosts running Daedalus { config, - pkgs, + inputs, lib, + pkgs, ... -}: let - flake = builtins.getFlake (toString ../.); - daedalusMainnet = import flake.inputs.daedalus.packages."${pkgs.system}".daedalus-mainnet; - #daedalusPreview = import flake.inputs.daedalus.packages."${pkgs.system}".daedalus-preview; - #daedalusPreprod = import flake.inputs.daedalus.packages."${pkgs.system}".daedalus-preprod; -in { +}: { environment.systemPackages = [ - daedalusMainnet - #daedalusPreview - #daedalusPreprod + inputs.daedalus.packages."${pkgs.system}".daedalus-mainnet + #inputs.daedalus.packages."${pkgs.system}".daedalus-preprod + #inputs.daedalus.packages."${pkgs.system}".daedalus-preview ]; } diff --git a/profiles/desktop_common.nix b/profiles/desktop_common.nix index edf8d2b..42799e7 100644 --- a/profiles/desktop_common.nix +++ b/profiles/desktop_common.nix @@ -1,5 +1,6 @@ # Common configuration for MIO desktops { + inputs, config, pkgs, ...