Skip to content

Commit

Permalink
Merge pull request #300 from Pacman99/update-digga
Browse files Browse the repository at this point in the history
flake: update to new digga api
  • Loading branch information
Pacman99 authored Jun 1, 2021
2 parents 768e3e7 + 8e250d5 commit 7110767
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 17 deletions.
19 changes: 10 additions & 9 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 17 additions & 7 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -84,21 +84,31 @@
/* 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 ];
};
};
};

devshell.externalModules = { pkgs, ... }: {
packages = [ pkgs.agenix ];
};

homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations;

deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { };
Expand Down
1 change: 0 additions & 1 deletion modules/customBuilds.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ in
system.build = {
iso = (mkBuild (diggaLib.modules.isoConfig {
inherit self;
inherit (self) inputs;
fullHostConfig = config;
})).config.system.build.isoImage;

Expand Down

0 comments on commit 7110767

Please sign in to comment.