bad/devos
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Merge pull request #300 from Pacman99/update-digga

Browse source 
flake: update to new digga api
This commit is contained in:
Pacman99 2021-06-01 12:40:31 -07:00 committed by GitHub
commit 7110767300
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
flake.lock
View file

@ -91,11 +91,11 @@
}, },
"devshell": { "devshell": {
"locked": { "locked": {
"lastModified": 1618523768, "lastModified": 1622013274,
"narHash": "sha256-Gev9da35pHUey3kGz/zrJFc/9ICs++vPCho7qB1mqd8=", "narHash": "sha256-mK/Lv0lCbl07dI5s7tR/7nb79HunKnJik3KyR6yeI2k=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "709fe4d04a9101c9d224ad83f73416dce71baf21", "rev": "e7faf69e6bf8546517cc936c7f6d31c7eb3abcb2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -113,15 +113,16 @@
"utils": "utils_2" "utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1621354376, "lastModified": 1622572028,
"narHash": "sha256-b597Jj8B1Nq4NX/Gl/+bYGKqJxpSfUtr1Nmp9m1DND8=", "narHash": "sha256-NqF1Nuc5JwH4U/O1Srz8HeqwKcEEDcj4gPJX5FrFWAQ=",
"owner": "divnix", "owner": "divnix",
"repo": "digga", "repo": "digga",
"rev": "5ef9b8cabbc10c9b4fe5534107224c7241c63b3d", "rev": "cd94f8c1d13a24d66c7c77b60c7a4d7a42217708",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "divnix", "owner": "divnix",
"ref": "develop",
"repo": "digga", "repo": "digga",
"type": "github" "type": "github"
} }
@ -405,11 +406,11 @@
"flake-utils": "flake-utils" "flake-utils": "flake-utils"
}, },
"locked": { "locked": {
"lastModified": 1620801141, "lastModified": 1622553785,
"narHash": "sha256-XPJ+/nP/s218E11R+4LJyvkrQXvdT3D6TzNjfWVYZnI=", "narHash": "sha256-zccUcgFmAI2YGq5AmNOKjYGHLVKnOvzD5vfHymu5nYU=",
"owner": "gytis-ivaskevicius", "owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus", "repo": "flake-utils-plus",
"rev": "1a742047f3f7c97b22768ba7738ac5a01052099e", "rev": "10096872a0691c3a213073aa8bfe739d37d84a49",
"type": "github" "type": "github"
}, },
"original": { "original": {

20
flake.nix
View file

@ -5,7 +5,7 @@
{ {
nixos.url = "nixpkgs/nixos-unstable"; nixos.url = "nixpkgs/nixos-unstable";
latest.url = "nixpkgs"; latest.url = "nixpkgs";
digga.url = "github:divnix/digga"; digga.url = "github:divnix/digga/develop";
ci-agent = { ci-agent = {
url = "github:hercules-ci/hercules-ci-agent"; url = "github:hercules-ci/hercules-ci-agent";
@ -84,20 +84,30 @@
/* set host specific properties here */ /* set host specific properties here */
NixOS = { }; NixOS = { };
}; };
profiles = [ ./profiles ./users ]; importables = rec {
suites = { profiles, users, ... }: with profiles; rec { profiles = digga.lib.importers.rakeLeaves ./profiles // {
users = digga.lib.importers.rakeLeaves ./users;
};
suites = with profiles; rec {
base = [ core users.nixos users.root ]; base = [ core users.nixos users.root ];
}; };
}; };
};
home = { home = {
modules = ./users/modules/module-list.nix; modules = ./users/modules/module-list.nix;
externalModules = [ ]; externalModules = [ ];
profiles = [ ./users/profiles ]; importables = rec {
suites = { profiles, ... }: with profiles; rec { profiles = digga.lib.importers.rakeLeaves ./users/profiles;
suites = with profiles; rec {
base = [ direnv git ]; base = [ direnv git ];
}; };
}; };
};
devshell.externalModules = { pkgs, ... }: {
packages = [ pkgs.agenix ];
};
homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations; homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations;

1
modules/customBuilds.nix
View file

@ -10,7 +10,6 @@ in
system.build = { system.build = {
iso = (mkBuild (diggaLib.modules.isoConfig { iso = (mkBuild (diggaLib.modules.isoConfig {
inherit self; inherit self;
inherit (self) inputs;
fullHostConfig = config; fullHostConfig = config;
})).config.system.build.isoImage; })).config.system.build.isoImage;