fix classicalDevos example

examples/classicalDevos/flake.nix

@@ -1,92 +1,117 @@
-{ pkgs, lib }:
+{
-let
+  description = "A DevOS example. And also a digga test bed.";
-  self = lib.mkFlake {
 
-    self = self // {
+  inputs =
-      outPath = toString ./.;
+    {
-      inputs = {
+      nixos.url = "nixpkgs/release-21.05";
-        nixos = pkgs.input;
+      latest.url = "nixpkgs";
-        latest = pkgs.input;
+      digga = {
+        url = "path:../../";
+        inputs.nixpkgs.follows = "nixos";
       };
+
+      darwin.url = "github:LnL7/nix-darwin";
+      darwin.inputs.nixpkgs.follows = "latest";
+      home.url = "github:nix-community/home-manager";
+      home.inputs.nixpkgs.follows = "nixos";
+      agenix.url = "github:ryantm/agenix";
+      agenix.inputs.nixpkgs.follows = "latest";
+      nixos-hardware.url = "github:nixos/nixos-hardware";
+
+      pkgs.url = "path:./pkgs";
+      pkgs.inputs.nixpkgs.follows = "nixos";
     };
 
+  outputs =
+    { self
+    , pkgs
+    , digga
+    , nixos
+    , home
+    , nixos-hardware
+    , agenix
+    , ...
+    } @ inputs:
+    digga.lib.mkFlake {
+      inherit self inputs;
+
       channelsConfig = { allowUnfree = true; };
 
       channels = {
         nixos = {
-        imports = [ (lib.importers.overlays ./overlays) ];
+          imports = [ (digga.lib.importers.overlays ./overlays) ];
           overlays = [
-          # mimicing an external overlay
+            # mimicking an external overlay
             (final: prev: { i-do-exists-before-local-overlays-accessor-me = prev.hello; })
+            ./pkgs/default.nix
+            pkgs.overlay # for `srcs`
+            agenix.overlay
           ];
         };
         latest = { };
       };
 
-    lib = lib.makeExtensible (self: { });
+      lib = import ./lib { lib = digga.lib // nixos.lib; };
-
-    outputsBuilder = channels: {
-      checks = {
-        hostBuild = assert self.nixosConfigurations ? "com.example.myhost";
-          self.nixosConfigurations.NixOS.config.system.build.toplevel;
-        overlays-order = channels.nixos.pkgs.i-was-accessed-without-error;
-        # At least check that those build.
-        # They are usually tested against additional checks with
-        nixosModules = self.nixosModules;
-
-      };
-    };
 
       sharedOverlays = [
         (final: prev: {
-        ourlib = self.lib;
+          __dontExport = true;
+          lib = prev.lib.extend (lfinal: lprev: {
+            our = self.lib;
+          });
         })
       ];
 
-    devshell.modules = [ ./devshell.toml ];
-
       nixos = {
         hostDefaults = {
           system = "x86_64-linux";
           channelName = "nixos";
-        imports = [ (lib.importers.modules ./modules) ];
+          imports = [ (digga.lib.importers.modules ./modules) ];
           externalModules = [
             { lib.our = self.lib; }
-          ./modules/customBuilds.nix # avoid exporting
+            home.nixosModules.home-manager
+            agenix.nixosModules.age
           ];
         };
 
-      imports = [ (lib.importers.hosts ./hosts) ];
+        imports = [ (digga.lib.importers.hosts ./hosts) ];
         hosts = {
           /* set host specific properties here */
           NixOS = { };
         };
         importables = rec {
-        profiles = lib.importers.rakeLeaves ./profiles // {
+          profiles = digga.lib.importers.rakeLeaves ./profiles // {
-          users = lib.importers.rakeLeaves ./users;
+            users = digga.lib.importers.rakeLeaves ./users;
           };
-        suites = with profiles; {
+          suites = with profiles; rec {
-          base = [ cachix core users.nixos users.root ];
+            base = [ core users.nixos users.root ];
           };
         };
       };
 
       home = {
-      imports = [ (lib.importers.modules ./user/modules) ];
+        imports = [ (digga.lib.importers.modules ./users/modules) ];
         externalModules = [ ];
         importables = rec {
-        profiles = lib.importers.rakeLeaves ./profiles;
+          profiles = digga.lib.importers.rakeLeaves ./users/profiles;
-        suites = with profiles; {
+          suites = with profiles; rec {
             base = [ direnv git ];
           };
         };
       };
 
-    deploy.nodes = lib.mkDeployNodes self.nixosConfigurations { };
+      devshell.externalModules = { pkgs, ... }: {
+        packages = [ pkgs.agenix ];
+      };
 
-    #defaultTemplate = self.templates.flk;
+      homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations;
+
+      deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { };
+
+      defaultTemplate = self.templates.flk;
       templates.flk.path = ./.;
       templates.flk.description = "flk template";
-  };
+
-in
+    }
-self
+  ;
+}