Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

flake: update to new digga api #300

Merged
merged 2 commits into from
Jun 1, 2021
Merged

flake: update to new digga api #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d908206
flake: update to new digga api
Pacman99 May 27, 2021
8e250d5
flake: add agenix to devShell
Pacman99 May 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions flake.lock
View file
Open in desktop

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
View file
Open in desktop
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 ];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we want to have the agenix command available in the devshell menu, we'd have to expose it as a commands = [ { } ];.

Not sure if that was the intention though, but it might be a good idea, regardless.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mainly wanted to avoid too much devshell related code in flake.nix. At some point I would like to add a devshell.toml in this repo, I just don't have anything to put in there other than agenix.

I would say to add the proper agenix command whenever a devshell.toml is added.

Copy link
Contributor

@blaggacao blaggacao May 31, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At some point I would like to add a devshell.toml in this repo

👍

};

homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations;

deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { };
Expand Down
1 change: 0 additions & 1 deletion modules/customBuilds.nix
View file
Open in desktop
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