summaryrefslogtreecommitdiff
path: root/hosts
diff options
context:
space:
mode:
Diffstat (limited to 'hosts')
-rw-r--r--hosts/ades/default.nix6
-rw-r--r--hosts/default.nix8
-rw-r--r--hosts/muspell/default.nix4
3 files changed, 12 insertions, 6 deletions
diff --git a/hosts/ades/default.nix b/hosts/ades/default.nix
index b4cae58..8f3f4e6 100644
--- a/hosts/ades/default.nix
+++ b/hosts/ades/default.nix
@@ -1,6 +1,8 @@
-{ mkHost, hosts, nixpkgs }:
+{ mkHost, hosts, inputs }:
-let inherit (nixpkgs.lib.attrsets)
+let
+ inherit (inputs) nixpkgs;
+ inherit (nixpkgs.lib.attrsets)
mergeAttrsList;
in
mergeAttrsList
diff --git a/hosts/default.nix b/hosts/default.nix
index 015e307..d5770c6 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -1,12 +1,14 @@
-{ nixpkgs, mobile-nixos }:
+{ inputs }:
let
+ inherit (inputs) nixpkgs;
+
mkHost = system: hostname: modules: {
"${hostname}" = nixpkgs.lib.nixosSystem {
inherit system;
modules = [ ../modules ../users ] ++ modules;
specialArgs = {
- inherit hostname nixpkgs mobile-nixos;
+ inherit hostname inputs;
};
};
};
@@ -30,7 +32,7 @@ let
hostsImport = file:
import file {
- inherit nixpkgs mkHost hosts;
+ inherit inputs mkHost hosts;
};
in
hosts {
diff --git a/hosts/muspell/default.nix b/hosts/muspell/default.nix
index d2942c3..97d4b64 100644
--- a/hosts/muspell/default.nix
+++ b/hosts/muspell/default.nix
@@ -1,5 +1,7 @@
-{ mobile-nixos, lib, pkgs, ... }:
+{ inputs, lib, pkgs, ... }:
+let inherit (inputs) mobile-nixos;
+in
{
imports = [
(import "${mobile-nixos}/lib/configuration.nix" {