diff --git a/morph/grid/local/grid.nix b/morph/grid/local/grid.nix index f1e1980532177385c926eb6c3903b67724ff7175..088d9e8c79422b82d638a42aeab5da1fcf14f536 100644 --- a/morph/grid/local/grid.nix +++ b/morph/grid/local/grid.nix @@ -1,8 +1,6 @@ let - pkgs = import <nixpkgs> { }; - gridlib = import ../../lib; - grid-config = pkgs.lib.trivial.importJSON ./config.json; + grid-config = builtins.fromJSON (builtins.readFile ./config.json); ssh-users = let ssh-users-file = ./public-keys/users.nix; diff --git a/morph/grid/production/grid.nix b/morph/grid/production/grid.nix index 3570dfef41013cdeba26cde308dcbd660da6c1db..91310433fa9e53d0ab27c99fac7e113af1b080d8 100644 --- a/morph/grid/production/grid.nix +++ b/morph/grid/production/grid.nix @@ -1,9 +1,7 @@ # See morph/grid/local/grid.nix for additional commentary. let - pkgs = import <nixpkgs> { }; - gridlib = import ../../lib; - grid-config = pkgs.lib.trivial.importJSON ./config.json; + grid-config = builtins.fromJSON (builtins.readFile ./config.json); # Module with per-grid configuration grid-module = {config, ...}: { diff --git a/morph/grid/testing/grid.nix b/morph/grid/testing/grid.nix index bc6d1abed0469c4a62276ee855410bfc15439a01..c033da1279fa44800e994dc07df3f5febc97d60d 100644 --- a/morph/grid/testing/grid.nix +++ b/morph/grid/testing/grid.nix @@ -1,9 +1,7 @@ # See morph/grid/local/grid.nix for additional commentary. let - pkgs = import <nixpkgs> { }; - gridlib = import ../../lib; - grid-config = pkgs.lib.trivial.importJSON ./config.json; + grid-config = builtins.fromJSON (builtins.readFile ./config.json); # Module with per-grid configuration grid-module = {config, ...}: {