divnix · Jun 24, 2021
diff --git a/‎flake.lock
+57-80 b/‎flake.lock
+57-80
diff --git a/‎flake.nix
+10-7 b/‎flake.nix
+10-7
diff --git a/‎modules/customBuilds.nix
+21-28 b/‎modules/customBuilds.nix
+21-28
diff --git a/‎modules/module-list.nix
-1 b/‎modules/module-list.nix
-1
diff --git a/‎users/modules/.flake-keep b/‎users/modules/.flake-keep
diff --git a/‎users/modules/module-list.nix
-1 b/‎users/modules/module-list.nix
-1
@@ -3,9 +3,12 @@
 
   inputs =
     {
-      nixos.url = "nixpkgs/nixos-unstable";
+      nixos.url = "nixpkgs/release-21.05";
       latest.url = "nixpkgs";
-      digga.url = "github:divnix/digga/master";
+      digga = {
+        url = "github:divnix/digga/develop";
+        inputs.nipxkgs.follows = "latest";
+      };
 
       ci-agent = {
         url = "github:hercules-ci/hercules-ci-agent";
@@ -15,8 +18,8 @@
       darwin.inputs.nixpkgs.follows = "latest";
       home.url = "github:nix-community/home-manager";
       home.inputs.nixpkgs.follows = "nixos";
-      naersk.url = "github:nmattia/naersk";
-      naersk.inputs.nixpkgs.follows = "latest";
+      # naersk.url = "github:nmattia/naersk";
+      # naersk.inputs.nixpkgs.follows = "latest";
       agenix.url = "github:ryantm/agenix";
       agenix.inputs.nixpkgs.follows = "latest";
       nixos-hardware.url = "github:nixos/nixos-hardware";
@@ -59,6 +62,7 @@
 
       sharedOverlays = [
         (final: prev: {
+          __dontExport = true;
           lib = prev.lib.extend (lfinal: lprev: {
             our = self.lib;
           });
@@ -69,13 +73,12 @@
         hostDefaults = {
           system = "x86_64-linux";
           channelName = "nixos";
-          modules = ./modules/module-list.nix;
+          imports = [ (digga.lib.importers.modules ./modules) ];
           externalModules = [
             { lib.our = self.lib; }
             ci-agent.nixosModules.agent-profile
             home.nixosModules.home-manager
             agenix.nixosModules.age
-            ./modules/customBuilds.nix
           ];
         };
 
@@ -95,7 +98,7 @@
       };
 
       home = {
-        modules = ./users/modules/module-list.nix;
+        imports = [ (digga.lib.importers.modules ./users/modules) ];
         externalModules = [ ];
         importables = rec {
           profiles = digga.lib.importers.rakeLeaves ./users/profiles;
 
@@ -1,33 +1,26 @@
-{ lib, self, diggaLib, config, modules, channel, ... }:
-let
-  mkBuild = buildModule:
-    # TODO: get specialArgs as a module argument and drop builderArgs usage
-    channel.input.lib.nixosSystem (diggaLib.mergeAny config.lib.builderArgs {
-      modules = [ buildModule ];
-    });
-in
+{ lib, pkgs, self, config, modules, channel, ... }:
 {
   system.build = {
-    iso = (mkBuild (diggaLib.modules.isoConfig {
-      inherit self;
-      fullHostConfig = config;
-    })).config.system.build.isoImage;
+    iso = (config.lib.digga.mkBuild
+      (config.lib.digga.modules.isoConfig {
+        inherit self;
+        fullHostConfig = config;
+      })
+    ).config.system.build.isoImage;
 
-    homes = (mkBuild ({ config, ... }: {
-      home-manager.useUserPackages = lib.mkForce false;
-      home-manager.sharedModules = [
-        {
-          home.sessionVariables = {
-            inherit (config.environment.sessionVariables) NIX_PATH;
-          };
-          xdg.configFile."nix/registry.json".text =
-            config.environment.etc."nix/registry.json".text;
-        }
-      ];
-    })).config.home-manager.users;
-
-    digitalOcean = (mkBuild ({ modulesPath, ... }: {
-      imports = [ "${modulesPath}/virtualisation/digital-ocean-image.nix" ];
-    })).config.system.build.digitalOceanImage;
+    homes = (config.lib.digga.mkBuild
+      ({ config, ... }: {
+        home-manager.useUserPackages = lib.mkForce false;
+        home-manager.sharedModules = [
+          {
+            home.sessionVariables = {
+              inherit (config.environment.sessionVariables) NIX_PATH;
+            };
+            xdg.configFile."nix/registry.json".text =
+              config.environment.etc."nix/registry.json".text;
+          }
+        ];
+      })
+    ).config.home-manager.users;
   };
 }