From d9082066f7bc5bd6a58ab55418db3d6abf4da3d6 Mon Sep 17 00:00:00 2001 From: Pacman99 Date: Thu, 27 May 2021 10:41:55 -0700 Subject: [PATCH 1/2] flake: update to new digga api --- flake.lock | 19 ++++++++++--------- flake.nix | 20 +++++++++++++------- modules/customBuilds.nix | 1 - 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 783e74f4..7df2f1a6 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "devshell": { "locked": { - "lastModified": 1618523768, - "narHash": "sha256-Gev9da35pHUey3kGz/zrJFc/9ICs++vPCho7qB1mqd8=", + "lastModified": 1622013274, + "narHash": "sha256-mK/Lv0lCbl07dI5s7tR/7nb79HunKnJik3KyR6yeI2k=", "owner": "numtide", "repo": "devshell", - "rev": "709fe4d04a9101c9d224ad83f73416dce71baf21", + "rev": "e7faf69e6bf8546517cc936c7f6d31c7eb3abcb2", "type": "github" }, "original": { @@ -113,15 +113,16 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1621354376, - "narHash": "sha256-b597Jj8B1Nq4NX/Gl/+bYGKqJxpSfUtr1Nmp9m1DND8=", + "lastModified": 1622572028, + "narHash": "sha256-NqF1Nuc5JwH4U/O1Srz8HeqwKcEEDcj4gPJX5FrFWAQ=", "owner": "divnix", "repo": "digga", - "rev": "5ef9b8cabbc10c9b4fe5534107224c7241c63b3d", + "rev": "cd94f8c1d13a24d66c7c77b60c7a4d7a42217708", "type": "github" }, "original": { "owner": "divnix", + "ref": "develop", "repo": "digga", "type": "github" } @@ -405,11 +406,11 @@ "flake-utils": "flake-utils" }, "locked": { - "lastModified": 1620801141, - "narHash": "sha256-XPJ+/nP/s218E11R+4LJyvkrQXvdT3D6TzNjfWVYZnI=", + "lastModified": 1622553785, + "narHash": "sha256-zccUcgFmAI2YGq5AmNOKjYGHLVKnOvzD5vfHymu5nYU=", "owner": "gytis-ivaskevicius", "repo": "flake-utils-plus", - "rev": "1a742047f3f7c97b22768ba7738ac5a01052099e", + "rev": "10096872a0691c3a213073aa8bfe739d37d84a49", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b95b0eeb..2f64a1fd 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ { nixos.url = "nixpkgs/nixos-unstable"; latest.url = "nixpkgs"; - digga.url = "github:divnix/digga"; + digga.url = "github:divnix/digga/develop"; ci-agent = { url = "github:hercules-ci/hercules-ci-agent"; @@ -84,18 +84,24 @@ /* set host specific properties here */ NixOS = { }; }; - profiles = [ ./profiles ./users ]; - suites = { profiles, users, ... }: with profiles; rec { - base = [ core users.nixos users.root ]; + importables = rec { + profiles = digga.lib.importers.rakeLeaves ./profiles // { + users = digga.lib.importers.rakeLeaves ./users; + }; + suites = with profiles; rec { + base = [ core users.nixos users.root ]; + }; }; }; home = { modules = ./users/modules/module-list.nix; externalModules = [ ]; - profiles = [ ./users/profiles ]; - suites = { profiles, ... }: with profiles; rec { - base = [ direnv git ]; + importables = rec { + profiles = digga.lib.importers.rakeLeaves ./users/profiles; + suites = with profiles; rec { + base = [ direnv git ]; + }; }; }; diff --git a/modules/customBuilds.nix b/modules/customBuilds.nix index 875d23a0..e343c80e 100644 --- a/modules/customBuilds.nix +++ b/modules/customBuilds.nix @@ -10,7 +10,6 @@ in system.build = { iso = (mkBuild (diggaLib.modules.isoConfig { inherit self; - inherit (self) inputs; fullHostConfig = config; })).config.system.build.isoImage; From 8e250d5084eb62c16a930f4b02a7e42b6952b852 Mon Sep 17 00:00:00 2001 From: Pacman99 Date: Sat, 29 May 2021 12:53:33 -0700 Subject: [PATCH 2/2] flake: add agenix to devShell --- flake.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/flake.nix b/flake.nix index 2f64a1fd..ee288909 100644 --- a/flake.nix +++ b/flake.nix @@ -105,6 +105,10 @@ }; }; + devshell.externalModules = { pkgs, ... }: { + packages = [ pkgs.agenix ]; + }; + homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations; deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { };