I Like To Move It

deploy

@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# usage: ./deploy CONFIG [[USER@]HOST]
+# usage: ./deploy HOST [[USER@]HOST]
 #
 set -euf
 
@@ -9,7 +9,7 @@ set -euf
 user=root
 host=$1
 
-config=./$host.nix
+config=./modules/$host/default.nix
 target=${2-$user@$host}
 
 verbose deploy "$config" "$target"

infest

@@ -76,7 +76,7 @@ infest_centos7_64bit() {
   target="root@$address"
 
   ./networking-configuration $cac_servername $hostname \
-    > modules/networking-$hostname.nix
+    > modules/$hostname/networking.nix
 
   echo '(
     set -xeuf

modules/cd/default.nix

@@ -4,13 +4,13 @@
   imports =
     [
       <secrets/hashedPasswords.nix>
-      ./modules/sanitize.nix
-      ./modules/base-cac-CentOS-7-64bit.nix
-      ./modules/exim-cd.nix
-      ./modules/ejabberd-cd.nix # XXX echtes modul
-      ./modules/iptables-cd.nix
-      ./modules/networking-cd.nix
-      ./modules/retiolum.nix
+      ./iptables.nix
+      ./networking.nix
+      ../tv/base-cac-CentOS-7-64bit.nix
+      ../tv/ejabberd.nix # XXX echtes modul
+      ../tv/exim-smarthost.nix
+      ../tv/retiolum.nix
+      ../tv/sanitize.nix
     ];
 
   # "Developer 2" plan has two vCPUs.
@@ -54,7 +54,7 @@
 
   services.retiolum = {
     enable = true;
-    hosts = ./hosts;
+    hosts = /etc/nixos/hosts;
     privateKeyFile = "/etc/nixos/secrets/cd.retiolum.rsa_key.priv";
     connectTo = [
       "fastpoke"

modules/lass/urxvtd.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 let
-  inherit (import ../lib { inherit pkgs; }) shell-escape;
+  inherit (import ../../lib { inherit pkgs; }) shell-escape;
   inherit (pkgs) writeScript;
 in
 

modules/mu/default.nix

@@ -3,7 +3,7 @@
 { config, pkgs, ... }:
 
 let
-  lib = import ./lib { inherit pkgs; };
+  lib = import ../../lib { inherit pkgs; };
 
   inherit (lib) majmin;
 in
@@ -11,9 +11,9 @@ in
 {
   imports = [
     <secrets/hashedPasswords.nix>
-    ./modules/sanitize.nix
-    ./modules/exim.nix
-    ./modules/retiolum.nix
+    ../tv/exim-retiolum.nix
+    ../tv/retiolum.nix
+    ../tv/sanitize.nix
   ];
 
   time.timeZone = "Europe/Berlin";

modules/tv/tools.nix

@@ -5,7 +5,7 @@ let
   inherit (lib.strings) concatStringsSep stringAsChars;
   inherit (lib.attrsets) attrValues mapAttrs;
   inherit (lib) makeSearchPath;
-  inherit (import ../lib { inherit pkgs; }) shell-escape;
+  inherit (import ../../lib { inherit pkgs; }) shell-escape;
 
 
   # TODO make these scripts available in an maintenance shell

modules/tv/users.nix

@@ -189,7 +189,7 @@ let
   sudoers =
     let
       inherit (builtins) filter hasAttr;
-      inherit (import ../lib { inherit pkgs; }) concat isSuffixOf removeSuffix setToList;
+      inherit (import ../../lib { inherit pkgs; }) concat isSuffixOf removeSuffix setToList;
 
       hasMaster = { group ? "", ... }:
         isSuffixOf "-sub" group;

modules/wu/default.nix

@@ -1,25 +1,25 @@
 { config, pkgs, ... }:
 
 let
-  lib = import ./lib { inherit pkgs; };
+  lib = import ../../lib { inherit pkgs; };
 
   inherit (lib) majmin;
 in
 
 {
   imports = [
-    ./modules/sanitize.nix
-    ./modules/base.nix
-    ./modules/retiolum.nix
-    ./modules/urxvt-tv.nix
-    ./modules/iptables.nix
-    ./modules/users.nix
-    #./modules/tools.nix
-    ./modules/hosts.nix
-    ./modules/xserver.nix
-    ./modules/synaptics.nix
-    ./modules/exim.nix
-    ./modules/nginx.nix
+    ./hosts.nix
+    ./iptables.nix
+    ../tv/base.nix
+    ../tv/exim-retiolum.nix
+    ../tv/nginx.nix
+    ../tv/retiolum.nix
+    ../tv/sanitize.nix
+    ../tv/synaptics.nix
+    #../tv/tools.nix
+    ../tv/urxvt.nix
+    ../tv/users.nix
+    ../tv/xserver.nix
   ];
 
   services.udev.extraRules = ''