From 67f545123c994c96fe0752d7964e621c9178f2b7 Mon Sep 17 00:00:00 2001 From: Pacman99 Date: Wed, 12 May 2021 12:31:43 -0700 Subject: [PATCH] flake: format and update to devlib api changes --- flake.lock | 6 +++--- flake.nix | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index b530dc77..c0807047 100644 --- a/flake.lock +++ b/flake.lock @@ -79,11 +79,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1620832565, - "narHash": "sha256-6K+ZPoIQwaVP1hYER3PUxDxs4TTEilfQ+VoJWnEfd3Q=", + "lastModified": 1620845932, + "narHash": "sha256-ShC2IuJD1MHC0DtQWeUuWpD1HDL7cuK3oBWQmVqjmdk=", "owner": "divnix", "repo": "devlib", - "rev": "454b01d875bb8a31bb3d669366462e7fd978b963", + "rev": "5a04146dc08f0a15a4489babe584162fdde1ca1f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 07055346..d8fd366a 100644 --- a/flake.nix +++ b/flake.nix @@ -37,10 +37,10 @@ overlays = (devlib.lib.importers.pathsIn ./overlays) ++ [ - ./pkgs/default.nix - pkgs.overlay # for `srcs` - nur.overlay - ]; + ./pkgs/default.nix + pkgs.overlay # for `srcs` + nur.overlay + ]; }; latest = { }; }; @@ -66,7 +66,7 @@ ]; }; hosts = nixos.lib.mkMerge [ - (devlib.lib.importHosts ./hosts) + (devlib.lib.importers.importHosts ./hosts) { /* set host specific properties here */ } ]; profiles = [ ./profiles ./users ];