summaryrefslogtreecommitdiffstats
path: root/modules/mu
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-07-07 05:55:28 +0200
committertv <tv@shackspace.de>2015-07-07 05:55:28 +0200
commit366373e9c6d20501e0756a7e97cced2cb96d447d (patch)
tree94d4afccec8b669ea7564fed069513807fd4ff8b /modules/mu
parent9c2bc5b4d0c6a87d5902eea3c3838d28dfe89a85 (diff)
deploy: refactor to use modified/*/paths.nix
Diffstat (limited to 'modules/mu')
-rw-r--r--modules/mu/default.nix6
-rw-r--r--modules/mu/paths.nix12
2 files changed, 12 insertions, 6 deletions
diff --git a/modules/mu/default.nix b/modules/mu/default.nix
index 8b37d9c5b..8490c842d 100644
--- a/modules/mu/default.nix
+++ b/modules/mu/default.nix
@@ -11,7 +11,6 @@ in
{
imports = [
<secrets/mu.hashedPasswords.nix>
- ../common/nixpkgs.nix
../tv/base.nix
../tv/exim-retiolum.nix
../tv/retiolum.nix
@@ -20,11 +19,6 @@ in
nix.maxJobs = 2;
- nixpkgs = {
- url = "https://github.com/NixOS/nixpkgs";
- rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870";
- };
-
services.udev.extraRules = ''
SUBSYSTEM=="net", ATTR{address}=="00:90:f5:da:aa:c3", NAME="en0"
SUBSYSTEM=="net", ATTR{address}=="a0:88:b4:1b:ae:6c", NAME="wl0"
diff --git a/modules/mu/paths.nix b/modules/mu/paths.nix
new file mode 100644
index 000000000..1c4ce52a1
--- /dev/null
+++ b/modules/mu/paths.nix
@@ -0,0 +1,12 @@
+{
+ lib.file.url = ../../lib;
+ modules.file.url = ../../modules;
+ nixpkgs.git = {
+ url = https://github.com/NixOS/nixpkgs;
+ rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870";
+ cache = ../../tmp/git-cache;
+ };
+ pubkeys.file.url = ../../pubkeys;
+ retiolum-hosts.file.url = ../../hosts;
+ secrets.file.url = ../../secrets/wu/nix;
+}