From 2f474e37f72121679a720445385aea677a7adadc Mon Sep 17 00:00:00 2001 From: Pacman99 Date: Fri, 14 May 2021 16:49:12 -0700 Subject: [PATCH] flake: update to latest digga api allows overlays to also be used with `imports` and renames importHosts --- flake.lock | 6 +++--- flake.nix | 15 +++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index a4e7fd6d..2195b9a2 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1621012625, - "narHash": "sha256-xRBbDpQDUz3mSwL2WoePz6c3zIUtZ2ML3qW0B9CVspU=", + "lastModified": 1621027569, + "narHash": "sha256-ugwMMfZagrWnt6yw+k1YGbydoMQ0OTYJ3WJ1kncsKCg=", "owner": "divnix", "repo": "digga", - "rev": "b0de71f4924e513e21d21a0ec60a2cb180f2187c", + "rev": "c162f5f46206346f431f3905642a8a9f17d42217", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ffce39c9..6b6860f5 100644 --- a/flake.nix +++ b/flake.nix @@ -31,13 +31,12 @@ channels = { nixos = { - overlays = - (digga.lib.importers.pathsIn ./overlays) ++ - [ - ./pkgs/default.nix - pkgs.overlay # for `srcs` - nur.overlay - ]; + imports = [ (digga.lib.importers.overlays ./overlays) ]; + overlays = [ + ./pkgs/default.nix + pkgs.overlay # for `srcs` + nur.overlay + ]; }; latest = { }; }; @@ -65,7 +64,7 @@ ]; }; - imports = [ (digga.lib.importers.importHosts ./hosts) ]; + imports = [ (digga.lib.importers.hosts ./hosts) ]; hosts = { /* set host specific properties here */ NixOS = { };