Skip to content

Commit

Permalink
Add dag library to config.lib
Browse files Browse the repository at this point in the history
Also replace all imports of `dag.nix` by the entry in `config.lib`.
  • Loading branch information
rycee committed Dec 2, 2017
1 parent f8aaba6 commit e879861
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion modules/files.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ pkgs, config, lib, ... }:

with config.lib.dag;
with lib;
with import ./lib/dag.nix { inherit lib; };

let

Expand Down
2 changes: 1 addition & 1 deletion modules/home-environment.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }:

with config.lib.dag;
with lib;
with import ./lib/dag.nix { inherit lib; };

let

Expand Down
1 change: 1 addition & 0 deletions modules/modules.nix
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ let
config._module.args.baseModules = modules;
config._module.args.pkgs = lib.mkDefault pkgs;
config._module.check = check;
config.lib.dag = import lib/dag.nix { inherit lib; };
config.nixpkgs.system = mkDefault pkgs.system;
};

Expand Down
2 changes: 1 addition & 1 deletion modules/programs/gnome-terminal.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }:

with config.lib.dag;
with lib;
with import ../lib/dag.nix { inherit lib; };

let

Expand Down
2 changes: 1 addition & 1 deletion modules/programs/home-manager.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }:

with config.lib.dag;
with lib;
with import ../lib/dag.nix { inherit lib; };

let

Expand Down
2 changes: 1 addition & 1 deletion modules/programs/info.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

{ config, lib, pkgs, ... }:

with config.lib.dag;
with lib;
with import ../lib/dag.nix { inherit lib; };

let

Expand Down
2 changes: 1 addition & 1 deletion modules/services/polybar.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }:

with config.lib.dag;
with lib;
with import ../lib/dag.nix { inherit lib; };

let

Expand Down
2 changes: 1 addition & 1 deletion modules/services/window-managers/i3.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }:

with config.lib.dag;
with lib;
with import ../../lib/dag.nix { inherit lib; };

let

Expand Down
2 changes: 1 addition & 1 deletion modules/services/window-managers/xmonad.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }:

with config.lib.dag;
with lib;
with import ../../lib/dag.nix { inherit lib; };

let

Expand Down
2 changes: 1 addition & 1 deletion modules/systemd.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }:

with config.lib.dag;
with lib;
with import ./lib/dag.nix { inherit lib; };

let

Expand Down

0 comments on commit e879861

Please sign in to comment.