deploy: refactor to use modified/*/paths.nix

10 files changed, 60 insertions, 30 deletions

diff --git a/modules/cd/default.nix b/modules/cd/default.nix
index d57d46be2..45b798e27 100644
--- a/modules/cd/default.nix
+++ b/modules/cd/default.nix
@@ -10,7 +10,6 @@ in
       { users.extraUsers = import <secrets/extraUsers.nix>; }
       ./networking.nix
       ./users.nix
-      ../common/nixpkgs.nix
       ../tv/base.nix
       ../tv/base-cac-CentOS-7-64bit.nix
       ../tv/ejabberd.nix # XXX echtes modul
@@ -50,11 +49,6 @@ in
   # "Developer 2" plan has two vCPUs.
   nix.maxJobs = 2;
 
-  nixpkgs = {
-    url = "https://github.com/NixOS/nixpkgs";
-    rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870";
-  };
-
   environment.systemPackages = with pkgs; [
     git # required for ./deploy, clone_or_update
     htop
diff --git a/modules/cd/paths.nix b/modules/cd/paths.nix
new file mode 100644
index 000000000..f873912fb
--- /dev/null
+++ b/modules/cd/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/cd/nix;
+}
diff --git a/modules/mkdir/default.nix b/modules/mkdir/default.nix
index 5427a4590..e76419298 100644
--- a/modules/mkdir/default.nix
+++ b/modules/mkdir/default.nix
@@ -10,7 +10,6 @@ in
       { users.extraUsers = import <secrets/extraUsers.nix>; }
       ./networking.nix
       ./users.nix
-      ../common/nixpkgs.nix
       ../tv/base.nix
       ../tv/base-cac-CentOS-7-64bit.nix
       ../tv/exim-smarthost.nix
@@ -49,11 +48,6 @@ in
 
   nix.maxJobs = 1;
 
-  nixpkgs = {
-    url = "https://github.com/NixOS/nixpkgs";
-    rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870";
-  };
-
   environment.systemPackages = with pkgs; [
     git # required for ./deploy, clone_or_update
     htop
diff --git a/modules/mkdir/paths.nix b/modules/mkdir/paths.nix
new file mode 100644
index 000000000..f873912fb
--- /dev/null
+++ b/modules/mkdir/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/cd/nix;
+}
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;
+}
diff --git a/modules/rmdir/default.nix b/modules/rmdir/default.nix
index 62fbd84f1..d24ad5736 100644
--- a/modules/rmdir/default.nix
+++ b/modules/rmdir/default.nix
@@ -10,7 +10,6 @@ in
       { users.extraUsers = import <secrets/extraUsers.nix>; }
       ./networking.nix
       ./users.nix
-      ../common/nixpkgs.nix
       ../tv/base.nix
       ../tv/base-cac-CentOS-7-64bit.nix
       ../tv/exim-smarthost.nix
@@ -50,11 +49,6 @@ in
 
   nix.maxJobs = 1;
 
-  nixpkgs = {
-    url = "https://github.com/NixOS/nixpkgs";
-    rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870";
-  };
-
   environment.systemPackages = with pkgs; [
     git # required for ./deploy, clone_or_update
     htop
diff --git a/modules/rmdir/paths.nix b/modules/rmdir/paths.nix
new file mode 100644
index 000000000..f873912fb
--- /dev/null
+++ b/modules/rmdir/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/cd/nix;
+}
diff --git a/modules/wu/default.nix b/modules/wu/default.nix
index 37bf75884..2271798be 100644
--- a/modules/wu/default.nix
+++ b/modules/wu/default.nix
@@ -11,7 +11,6 @@ in
 {
   imports = [
     ./hosts.nix
-    ../common/nixpkgs.nix
     ../tv/base.nix
     ../tv/exim-retiolum.nix
     ../tv/sanitize.nix
@@ -63,11 +62,6 @@ in
     daemonNiceLevel = 1;
   };
 
-  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/wu/paths.nix b/modules/wu/paths.nix
new file mode 100644
index 000000000..2d2ff7b74
--- /dev/null
+++ b/modules/wu/paths.nix
@@ -0,0 +1,12 @@
+{
+  lib.file.url = ../../lib;
+  modules.file.url = ../../modules;
+  nixpkgs.git = {
+    url = https://github.com/NixOS/nixpkgs;
+    rev = "e1af50c4c4c0332136283e9231f0a32ac11f2b90";
+    cache = ../../tmp/git-cache;
+  };
+  pubkeys.file.url = ../../pubkeys;
+  retiolum-hosts.file.url = ../../hosts;
+  secrets.file.url = ../../secrets/wu/nix;
+}