Add dag library to config.lib

Also replace all imports of `dag.nix` by the entry in `config.lib`.

modules/files.nix

@@ -1,7 +1,7 @@
 { pkgs, config, lib, ... }:
 
+with config.lib;
 with lib;
-with import ./lib/dag.nix { inherit lib; };
 
 let
 
@@ -64,7 +64,7 @@ in
 
     # This verifies that the links we are about to create will not
     # overwrite an existing file.
-    home.activation.checkLinkTargets = dagEntryBefore ["writeBoundary"] (
+    home.activation.checkLinkTargets = dag.entryBefore ["writeBoundary"] (
       let
         check = pkgs.writeText "check" ''
           . ${./lib-bash/color-echo.sh}
@@ -120,7 +120,7 @@ in
     # and a failure during the intermediate state FA ∩ FB will not
     # result in lost links because this set of links are in both the
     # source and target generation.
-    home.activation.linkGeneration = dagEntryAfter ["writeBoundary"] (
+    home.activation.linkGeneration = dag.entryAfter ["writeBoundary"] (
       let
         link = pkgs.writeText "link" ''
           newGenFiles="$1"

modules/home-environment.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
+with config.lib;
 with lib;
-with import ./lib/dag.nix { inherit lib; };
 
 let
 
@@ -232,9 +232,9 @@ in
 
     # A dummy entry acting as a boundary between the activation
     # script's "check" and the "write" phases.
-    home.activation.writeBoundary = dagEntryAnywhere "";
+    home.activation.writeBoundary = dag.entryAnywhere "";
 
-    home.activation.installPackages = dagEntryAfter ["writeBoundary"] ''
+    home.activation.installPackages = dag.entryAfter ["writeBoundary"] ''
       $DRY_RUN_CMD nix-env -i ${cfg.path}
     '';
 
@@ -244,7 +244,7 @@ in
             noteEcho Activating ${res.name}
             ${res.data}
           '';
-        sortedCommands = dagTopoSort cfg.activation;
+        sortedCommands = dag.topoSort cfg.activation;
         activationCmds =
           if sortedCommands ? result then
             concatStringsSep "\n" (map mkCmd sortedCommands.result)

modules/lib/default.nix

@@ -0,0 +1,18 @@
+{ lib }:
+
+{
+  dag =
+    let
+      d = import ./dag.nix { inherit lib; };
+    in
+      {
+        empty = d.emptyDag;
+        isDag = d.isDag;
+        topoSort = d.dagTopoSort;
+        map = d.dagMap;
+        entryAnywhere = d.dagEntryAnywhere;
+        entryBetween = d.dagEntryBetween;
+        entryAfter = d.dagEntryAfter;
+        entryBefore = d.dagEntryBefore;
+      };
+}

modules/modules.nix

@@ -74,6 +74,7 @@ let
     config._module.args.baseModules = modules;
     config._module.args.pkgs = lib.mkDefault pkgs;
     config._module.check = check;
+    config.lib = import ./lib { inherit lib; };
     config.nixpkgs.system = mkDefault pkgs.system;
   };
 

modules/programs/gnome-terminal.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
+with config.lib;
 with lib;
-with import ../lib/dag.nix { inherit lib; };
 
 let
 
@@ -181,7 +181,7 @@ in
     home.packages = [ pkgs.gnome3.gnome_terminal ];
 
     # The dconf service needs to be installed and prepared.
-    home.activation.gnomeTerminal = dagEntryAfter ["installPackages"] (
+    home.activation.gnomeTerminal = dag.entryAfter ["installPackages"] (
       let
         iniText = toDconfIni (buildIniSet cfg);
         iniFile = pkgs.writeText "gnome-terminal.ini" iniText;

modules/programs/home-manager.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
+with config.lib;
 with lib;
-with import ../lib/dag.nix { inherit lib; };
 
 let
 
@@ -42,7 +42,7 @@ in
     # Uninstall manually installed home-manager, if such exists.
     # Without this a file collision error will be printed.
     home.activation.uninstallHomeManager =
-      dagEntryBetween [ "installPackages" ] [ "writeBoundary" ] ''
+      dag.entryBetween [ "installPackages" ] [ "writeBoundary" ] ''
         if nix-env -q | grep -q "^home-manager$" ; then
           $DRY_RUN_CMD nix-env -e home-manager
 

modules/programs/info.nix

@@ -20,8 +20,8 @@
 
 { config, lib, pkgs, ... }:
 
+with config.lib;
 with lib;
-with import ../lib/dag.nix { inherit lib; };
 
 let
 
@@ -63,7 +63,7 @@ in
     home.sessionVariables.INFOPATH =
       "${cfg.homeInfoDirLocation}\${INFOPATH:+:}\${INFOPATH}";
 
-    home.activation.createHomeInfoDir = dagEntryAfter ["installPackages"] ''
+    home.activation.createHomeInfoDir = dag.entryAfter ["installPackages"] ''
       oPATH=$PATH
       export PATH="${lib.makeBinPath [ pkgs.gzip ]}''${PATH:+:}$PATH"
       $DRY_RUN_CMD mkdir -p "${cfg.homeInfoDirLocation}"

modules/services/polybar.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
+with config.lib;
 with lib;
-with import ../lib/dag.nix { inherit lib; };
 
 let
 
@@ -131,15 +131,15 @@ in
       };
     };
 
-    home.activation.checkPolybar = dagEntryBefore [ "linkGeneration" ] ''
+    home.activation.checkPolybar = dag.entryBefore [ "linkGeneration" ] ''
       if ! cmp --quiet \
           "${configFile}" \
           "$HOME/.config/polybar/config"; then
         polybarChanged=1
       fi
     '';
 
-    home.activation.applyPolybar = dagEntryAfter [ "reloadSystemD" ] ''
+    home.activation.applyPolybar = dag.entryAfter [ "reloadSystemD" ] ''
       if [[ -v polybarChanged && -v DISPLAY ]]; then
         echo "Restarting polybar"
         ${config.systemd.user.systemctlPath} --user restart polybar.service

modules/services/window-managers/i3.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
+with config.lib;
 with lib;
-with import ../../lib/dag.nix { inherit lib; };
 
 let
 
@@ -621,15 +621,15 @@ in
       xsession.windowManager.command = "${cfg.package}/bin/i3";
       xdg.configFile."i3/config".source = configFile;
 
-      home.activation.checkI3 = dagEntryBefore [ "linkGeneration" ] ''
+      home.activation.checkI3 = dag.entryBefore [ "linkGeneration" ] ''
         if ! cmp --quiet \
             "${configFile}" \
             "${config.xdg.configHome}/i3/config"; then
           i3Changed=1
         fi
       '';
 
-      home.activation.reloadI3 = dagEntryAfter [ "linkGeneration" ] ''
+      home.activation.reloadI3 = dag.entryAfter [ "linkGeneration" ] ''
         if [[ -v i3Changed && -v DISPLAY ]]; then
           echo "Reloading i3"
           ${cfg.package}/bin/i3-msg reload 1>/dev/null

modules/services/window-managers/xmonad.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
+with config.lib;
 with lib;
-with import ../../lib/dag.nix { inherit lib; };
 
 let
 
@@ -90,13 +90,13 @@ in
     (mkIf (cfg.config != null) {
       home.file.".xmonad/xmonad.hs".source = cfg.config;
 
-      home.activation.checkXmonad = dagEntryBefore [ "linkGeneration" ] ''
+      home.activation.checkXmonad = dag.entryBefore [ "linkGeneration" ] ''
         if ! cmp --quiet "${cfg.config}" "$HOME/.xmonad/xmonad.hs"; then
           xmonadChanged=1
         fi
       '';
 
-      home.activation.applyXmonad = dagEntryAfter [ "linkGeneration" ] ''
+      home.activation.applyXmonad = dag.entryAfter [ "linkGeneration" ] ''
         if [[ -v xmonadChanged ]]; then
           echo "Recompiling xmonad"
           ${config.xsession.windowManager.command} --recompile

modules/systemd.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
+with config.lib;
 with lib;
-with import ./lib/dag.nix { inherit lib; };
 
 let
 
@@ -118,7 +118,7 @@ in
           (buildServices "timer" cfg.timers)
         );
 
-      home.activation.reloadSystemD = dagEntryAfter ["linkGeneration"] ''
+      home.activation.reloadSystemD = dag.entryAfter ["linkGeneration"] ''
         function isStartable() {
           local service="$1"
           [[ $(systemctl --user show -p RefuseManualStart "$service") == *=no ]]