move old stuff

115 files changed, 151 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index bad1d00..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/.graveyard
-/hosts
-/secrets
-/tmp
diff --git a/Makefile b/old/Makefile
index bef7727..bef7727 100644
--- a/Makefile
+++ b/old/Makefile
diff --git a/README.md b/old/README.md
index 8a72d2f..8a72d2f 100644
--- a/README.md
+++ b/old/README.md
diff --git a/bin/copy-secrets b/old/bin/copy-secrets
index f404935..f404935 100755
--- a/bin/copy-secrets
+++ b/old/bin/copy-secrets
diff --git a/bin/genid b/old/bin/genid
index 8e22407..8e22407 100755
--- a/bin/genid
+++ b/old/bin/genid
diff --git a/bin/netmask-to-prefix b/old/bin/netmask-to-prefix
index 1c4dbeb..1c4dbeb 100755
--- a/bin/netmask-to-prefix
+++ b/old/bin/netmask-to-prefix
diff --git a/bin/nixos-query b/old/bin/nixos-query
index 1111aea..1111aea 100755
--- a/bin/nixos-query
+++ b/old/bin/nixos-query
diff --git a/bin/urlencode b/old/bin/urlencode
index 02ca030..02ca030 100755
--- a/bin/urlencode
+++ b/old/bin/urlencode
diff --git a/cac b/old/cac
index fb816b9..fb816b9 100755
--- a/cac
+++ b/old/cac
diff --git a/certs/zalora-ca.crt b/old/certs/zalora-ca.crt
index 12cdf8f..12cdf8f 100644
--- a/certs/zalora-ca.crt
+++ b/old/certs/zalora-ca.crt
diff --git a/old/default.nix b/old/default.nix
new file mode 100644
index 0000000..8415348
--- /dev/null
+++ b/old/default.nix
@@ -0,0 +1,151 @@
+{ system-name
+, rsync-target ? null
+, deploy-target ? null
+}:
+
+# TODO assert that only one of rsync-target or deploy-target is not null
+
+with builtins;
+assert (typeOf system-name == "string");
+with import <nixpkgs/lib>;
+let
+  paths-file = toPath "${dirOf __curPos.file}/modules/${system-name}/paths.nix";
+
+  paths = import paths-file;
+
+  prefetch.file = ''
+    echo "$prefetch_in_url"
+  '';
+
+  prefetch.git = ''
+    ${concatMapStringsSep "\n" (attr-name: ''
+      case ''${prefetch_in_${escapeShellArg attr-name}-?} in \?)
+        printf '%s: %s: missing attribute: %s' \
+          ${escapeShellArg paths-file} \
+          "$prefetch_name" \
+          ${escapeShellArg attr-name} \
+          >&2
+        return 1
+      esac
+    '') [ "rev" "url" "cache" ]}
+
+    git_rev=$prefetch_in_rev
+    git_url=$prefetch_in_url
+
+    # cache_dir points to a (maybe non-existent) directory, where a shared cache of
+    # the repository should be maintained.  The shared cache is used to create
+    # multiple working trees of the repository.
+    cache_dir=$prefetch_in_cache/$(echo "$git_url" | urlencode)
+    cache_git() {
+      git --git-dir="$cache_dir" "$@"
+    }
+
+    # work_dir points to a (maybe non-existent) directory, where a specific
+    # revision of the repository is checked out.
+    # XXX this is probably a bad idea if git_rev is not a commit
+    work_dir=$cache_dir-$(cache_git rev-parse --verify "$git_rev" | urlencode)
+    work_git() {
+      git -C "$work_dir" "$@"
+    }
+
+    is_up_to_date() {
+      test -d "$cache_dir" &&
+      test -d "$work_dir" &&
+      test "$(cache_git rev-parse --verify "$git_rev")" = "$git_rev" &&
+      test "$(work_git rev-parse --verify HEAD)" = "$git_rev"
+    }
+
+    # Notice how the remote name "origin" has been chosen arbitrarily, but must be
+    # kept in sync with the default value of nixpkgs.rev.
+    if ! is_up_to_date; then
+      if ! test -d "$cache_dir"; then
+        mkdir -p "$cache_dir"
+        cache_git init --bare
+      fi
+      if ! cache_git_url=$(cache_git config remote.origin.url); then
+        cache_git remote add origin "$git_url"
+      elif test "$cache_git_url" != "$git_url"; then
+        cache_git remote set-url origin "$git_url"
+      fi
+      cache_git fetch origin
+      if ! test -d "$work_dir"; then
+        git clone -n --shared "$cache_dir" "$work_dir"
+      fi
+      commit_name=$(cache_git rev-parse --verify "$git_rev")
+      work_git checkout "$commit_name" -- "$(readlink -f "$work_dir")"
+      work_git checkout -q "$commit_name"
+      work_git submodule init
+      work_git submodule update
+    fi
+    work_git clean -dxf
+
+    echo "$work_dir"
+  '';
+
+
+  f = pkg-name: pkg-spec:
+    let
+      types = attrNames pkg-spec;
+      type = elemAt types 0;
+    in
+    assert (length types == 1); # there can be only one source type
+    ''
+      out=$(${concatStringsSep " \\\n" (mapAttrsToList (k: v:
+          "prefetch_in_${escapeShellArg k}=${escapeShellArg (toString v)}") pkg-spec.${type})} \
+          prefetch_name=${escapeShellArg pkg-name} \
+          __prefetch_${escapeShellArg type})
+      printf '%s=%s\n' \
+        ${escapeShellArg pkg-name} \
+        "$out"
+    '';
+in
+''
+#! /bin/sh
+set -euf
+
+PATH=${toString ./.}/bin:$PATH
+export PATH
+
+__prefetch_file() {
+${prefetch.file}
+}
+__prefetch_git() {
+${prefetch.git}
+}
+
+# TODO make sure x contains only sane chars
+x=$(${concatStrings (mapAttrsToList f paths)})
+
+${optionalString (rsync-target != null) ''
+  proot $(echo "$x" | sed -n 's@^\([^=]\+\)=\(.*\)@-b \2:/shitment/\1@p') \
+    rsync --delete --delete-excluded \
+      --filter='- /*/.git' \
+      --rsync-path='mkdir -p -m 0700 /shitment/ && rsync' \
+      -vaz \
+      --no-owner \
+      --no-group \
+      '/shitment/' \
+      ${escapeShellArg rsync-target}
+''}
+
+
+${optionalString (deploy-target != null) ''
+  system_path=$(proot $(echo "$x" | sed -n 's@^\([^=]\+\)=\(.*\)@-b \2:/shitment/\1@p') \
+    env \
+        NIX_PATH=/shitment \
+        NIXOS_CONFIG=/shitment/modules/${escapeShellArg system-name} \
+      nix-build -A system --no-out-link '<nixpkgs/nixos>')
+
+  system_name=${escapeShellArg system-name}
+  target=${escapeShellArg deploy-target}
+
+  nix-copy-closure --gzip --to "$target" "$system_path"
+
+  secrets_root=${toString ./.}/secrets \
+  config_root=${toString ./.} \
+    copy-secrets "$system_name" "$target"
+
+  ssh ''${NIX_SSHOPTS-} "$target" "$system_path/bin/switch-to-configuration" switch
+''}
+
+''
diff --git a/deploy b/old/deploy
index a9dbf45..a9dbf45 100755
--- a/deploy
+++ b/old/deploy
diff --git a/infest-cac-CentOS-7-64bit.sh b/old/infest-cac-CentOS-7-64bit.sh
index 1e96e0e..1e96e0e 100755
--- a/infest-cac-CentOS-7-64bit.sh
+++ b/old/infest-cac-CentOS-7-64bit.sh
diff --git a/infest.d/cac-CentOS-7-64bit/finalize.sh b/old/infest.d/cac-CentOS-7-64bit/finalize.sh
index b70276b..b70276b 100644
--- a/infest.d/cac-CentOS-7-64bit/finalize.sh
+++ b/old/infest.d/cac-CentOS-7-64bit/finalize.sh
diff --git a/infest.d/cac-CentOS-7-64bit/prepare.sh b/old/infest.d/cac-CentOS-7-64bit/prepare.sh
index f932e9c..f932e9c 100644
--- a/infest.d/cac-CentOS-7-64bit/prepare.sh
+++ b/old/infest.d/cac-CentOS-7-64bit/prepare.sh
diff --git a/infest.d/nixos-install.sh b/old/infest.d/nixos-install.sh
index df01a34..df01a34 100644
--- a/infest.d/nixos-install.sh
+++ b/old/infest.d/nixos-install.sh
diff --git a/lib/default.nix b/old/lib/default.nix
index 164a6a1..164a6a1 100644
--- a/lib/default.nix
+++ b/old/lib/default.nix
diff --git a/lib/git.nix b/old/lib/git.nix
index 8dc1761..8dc1761 100644
--- a/lib/git.nix
+++ b/old/lib/git.nix
diff --git a/lib/modules.nix b/old/lib/modules.nix
index 248e638..248e638 100644
--- a/lib/modules.nix
+++ b/old/lib/modules.nix
diff --git a/modules/cd/default.nix b/old/modules/cd/default.nix
index e3abd47..e3abd47 100644
--- a/modules/cd/default.nix
+++ b/old/modules/cd/default.nix
diff --git a/modules/cd/networking.nix b/old/modules/cd/networking.nix
index 215e208..215e208 100644
--- a/modules/cd/networking.nix
+++ b/old/modules/cd/networking.nix
diff --git a/modules/cd/paths.nix b/old/modules/cd/paths.nix
index f873912..f873912 100644
--- a/modules/cd/paths.nix
+++ b/old/modules/cd/paths.nix
diff --git a/modules/cd/users.nix b/old/modules/cd/users.nix
index 656336d..656336d 100644
--- a/modules/cd/users.nix
+++ b/old/modules/cd/users.nix
diff --git a/modules/cloudkrebs/default.nix b/old/modules/cloudkrebs/default.nix
index 938447e..938447e 100644
--- a/modules/cloudkrebs/default.nix
+++ b/old/modules/cloudkrebs/default.nix
diff --git a/modules/cloudkrebs/networking.nix b/old/modules/cloudkrebs/networking.nix
index fc50073..fc50073 100644
--- a/modules/cloudkrebs/networking.nix
+++ b/old/modules/cloudkrebs/networking.nix
diff --git a/modules/common/krebs-keys.nix b/old/modules/common/krebs-keys.nix
index 5e34933..5e34933 100644
--- a/modules/common/krebs-keys.nix
+++ b/old/modules/common/krebs-keys.nix
diff --git a/modules/common/krebs-repos.nix b/old/modules/common/krebs-repos.nix
index 86f3731..86f3731 100644
--- a/modules/common/krebs-repos.nix
+++ b/old/modules/common/krebs-repos.nix
diff --git a/modules/common/nixpkgs.nix b/old/modules/common/nixpkgs.nix
index 486cf02..486cf02 100644
--- a/modules/common/nixpkgs.nix
+++ b/old/modules/common/nixpkgs.nix
diff --git a/modules/common/sshkeys.nix b/old/modules/common/sshkeys.nix
index 5f1c606..5f1c606 100644
--- a/modules/common/sshkeys.nix
+++ b/old/modules/common/sshkeys.nix
diff --git a/modules/lass/base.nix b/old/modules/lass/base.nix
index 3a8d879..3a8d879 100644
--- a/modules/lass/base.nix
+++ b/old/modules/lass/base.nix
diff --git a/modules/lass/binary-caches.nix b/old/modules/lass/binary-caches.nix
index c272752..c272752 100644
--- a/modules/lass/binary-caches.nix
+++ b/old/modules/lass/binary-caches.nix
diff --git a/modules/lass/bird.nix b/old/modules/lass/bird.nix
index 3fc265c..3fc265c 100644
--- a/modules/lass/bird.nix
+++ b/old/modules/lass/bird.nix
diff --git a/modules/lass/bitcoin.nix b/old/modules/lass/bitcoin.nix
index d3bccbf..d3bccbf 100644
--- a/modules/lass/bitcoin.nix
+++ b/old/modules/lass/bitcoin.nix
diff --git a/modules/lass/browsers.nix b/old/modules/lass/browsers.nix
index 8aecea9..8aecea9 100644
--- a/modules/lass/browsers.nix
+++ b/old/modules/lass/browsers.nix
diff --git a/modules/lass/chromium-patched.nix b/old/modules/lass/chromium-patched.nix
index 7151817..7151817 100644
--- a/modules/lass/chromium-patched.nix
+++ b/old/modules/lass/chromium-patched.nix
diff --git a/modules/lass/desktop-base.nix b/old/modules/lass/desktop-base.nix
index 9418454..9418454 100644
--- a/modules/lass/desktop-base.nix
+++ b/old/modules/lass/desktop-base.nix
diff --git a/modules/lass/elster.nix b/old/modules/lass/elster.nix
index 1edd018..1edd018 100644
--- a/modules/lass/elster.nix
+++ b/old/modules/lass/elster.nix
diff --git a/modules/lass/games.nix b/old/modules/lass/games.nix
index 6043a87..6043a87 100644
--- a/modules/lass/games.nix
+++ b/old/modules/lass/games.nix
diff --git a/modules/lass/gitolite-base.nix b/old/modules/lass/gitolite-base.nix
index b476299..b476299 100644
--- a/modules/lass/gitolite-base.nix
+++ b/old/modules/lass/gitolite-base.nix
diff --git a/modules/lass/ircd.nix b/old/modules/lass/ircd.nix
index 3c9e257..3c9e257 100644
--- a/modules/lass/ircd.nix
+++ b/old/modules/lass/ircd.nix
diff --git a/modules/lass/pass.nix b/old/modules/lass/pass.nix
index 33eca0a..33eca0a 100644
--- a/modules/lass/pass.nix
+++ b/old/modules/lass/pass.nix
diff --git a/modules/lass/programs.nix b/old/modules/lass/programs.nix
index 41d241b..41d241b 100644
--- a/modules/lass/programs.nix
+++ b/old/modules/lass/programs.nix
diff --git a/modules/lass/retiolum-cloudkrebs.nix b/old/modules/lass/retiolum-cloudkrebs.nix
index 1f03527..1f03527 100644
--- a/modules/lass/retiolum-cloudkrebs.nix
+++ b/old/modules/lass/retiolum-cloudkrebs.nix
diff --git a/modules/lass/retiolum-mors.nix b/old/modules/lass/retiolum-mors.nix
index 61a7856..61a7856 100644
--- a/modules/lass/retiolum-mors.nix
+++ b/old/modules/lass/retiolum-mors.nix
diff --git a/modules/lass/retiolum-uriel.nix b/old/modules/lass/retiolum-uriel.nix
index 11dc61c..11dc61c 100644
--- a/modules/lass/retiolum-uriel.nix
+++ b/old/modules/lass/retiolum-uriel.nix
diff --git a/modules/lass/sshkeys.nix b/old/modules/lass/sshkeys.nix
index f2b0786..f2b0786 100644
--- a/modules/lass/sshkeys.nix
+++ b/old/modules/lass/sshkeys.nix
diff --git a/modules/lass/steam.nix b/old/modules/lass/steam.nix
index d54873b..d54873b 100644
--- a/modules/lass/steam.nix
+++ b/old/modules/lass/steam.nix
diff --git a/modules/lass/texlive.nix b/old/modules/lass/texlive.nix
index 295df31..295df31 100644
--- a/modules/lass/texlive.nix
+++ b/old/modules/lass/texlive.nix
diff --git a/modules/lass/urxvt.nix b/old/modules/lass/urxvt.nix
index 889f768..889f768 100644
--- a/modules/lass/urxvt.nix
+++ b/old/modules/lass/urxvt.nix
diff --git a/modules/lass/urxvtd.nix b/old/modules/lass/urxvtd.nix
index 469616a..469616a 100644
--- a/modules/lass/urxvtd.nix
+++ b/old/modules/lass/urxvtd.nix
diff --git a/modules/lass/vim.nix b/old/modules/lass/vim.nix
index e1cff0d..e1cff0d 100644
--- a/modules/lass/vim.nix
+++ b/old/modules/lass/vim.nix
diff --git a/modules/lass/virtualbox.nix b/old/modules/lass/virtualbox.nix
index 0262031..0262031 100644
--- a/modules/lass/virtualbox.nix
+++ b/old/modules/lass/virtualbox.nix
diff --git a/modules/lass/wine.nix b/old/modules/lass/wine.nix
index 8d55da7..8d55da7 100644
--- a/modules/lass/wine.nix
+++ b/old/modules/lass/wine.nix
diff --git a/modules/lass/xresources.nix b/old/modules/lass/xresources.nix
index 00a9e5c..00a9e5c 100644
--- a/modules/lass/xresources.nix
+++ b/old/modules/lass/xresources.nix
diff --git a/modules/lass/xserver-lass.nix b/old/modules/lass/xserver-lass.nix
index 5c2d169..5c2d169 100644
--- a/modules/lass/xserver-lass.nix
+++ b/old/modules/lass/xserver-lass.nix
diff --git a/modules/mkdir/default.nix b/old/modules/mkdir/default.nix
index 76f0bb6..76f0bb6 100644
--- a/modules/mkdir/default.nix
+++ b/old/modules/mkdir/default.nix
diff --git a/modules/mkdir/networking.nix b/old/modules/mkdir/networking.nix
index c75e33a..c75e33a 100644
--- a/modules/mkdir/networking.nix
+++ b/old/modules/mkdir/networking.nix
diff --git a/modules/mkdir/paths.nix b/old/modules/mkdir/paths.nix
index f873912..f873912 100644
--- a/modules/mkdir/paths.nix
+++ b/old/modules/mkdir/paths.nix
diff --git a/modules/mkdir/users.nix b/old/modules/mkdir/users.nix
index 82f078b..82f078b 100644
--- a/modules/mkdir/users.nix
+++ b/old/modules/mkdir/users.nix
diff --git a/modules/mors/default.nix b/old/modules/mors/default.nix
index d83d6ab..d83d6ab 100644
--- a/modules/mors/default.nix
+++ b/old/modules/mors/default.nix
diff --git a/modules/mors/git.nix b/old/modules/mors/git.nix
index 1dd61d1..1dd61d1 100644
--- a/modules/mors/git.nix
+++ b/old/modules/mors/git.nix
diff --git a/modules/mors/repos.nix b/old/modules/mors/repos.nix
index e31ba94..e31ba94 100644
--- a/modules/mors/repos.nix
+++ b/old/modules/mors/repos.nix
diff --git a/modules/mu/default.nix b/old/modules/mu/default.nix
index 1f48887..1f48887 100644
--- a/modules/mu/default.nix
+++ b/old/modules/mu/default.nix
diff --git a/modules/mu/paths.nix b/old/modules/mu/paths.nix
index 1c4ce52..1c4ce52 100644
--- a/modules/mu/paths.nix
+++ b/old/modules/mu/paths.nix
diff --git a/modules/nomic/default.nix b/old/modules/nomic/default.nix
index f61f97a..f61f97a 100644
--- a/modules/nomic/default.nix
+++ b/old/modules/nomic/default.nix
diff --git a/modules/nomic/hardware-configuration.nix b/old/modules/nomic/hardware-configuration.nix
index 8a00730..8a00730 100644
--- a/modules/nomic/hardware-configuration.nix
+++ b/old/modules/nomic/hardware-configuration.nix
diff --git a/modules/nomic/paths.nix b/old/modules/nomic/paths.nix
index 0bcf1d3..0bcf1d3 100644
--- a/modules/nomic/paths.nix
+++ b/old/modules/nomic/paths.nix
diff --git a/modules/nomic/users.nix b/old/modules/nomic/users.nix
index 70e1d8d..70e1d8d 100644
--- a/modules/nomic/users.nix
+++ b/old/modules/nomic/users.nix
diff --git a/modules/rmdir/default.nix b/old/modules/rmdir/default.nix
index 7279df7..7279df7 100644
--- a/modules/rmdir/default.nix
+++ b/old/modules/rmdir/default.nix
diff --git a/modules/rmdir/networking.nix b/old/modules/rmdir/networking.nix
index fb39c5d..fb39c5d 100644
--- a/modules/rmdir/networking.nix
+++ b/old/modules/rmdir/networking.nix
diff --git a/modules/rmdir/paths.nix b/old/modules/rmdir/paths.nix
index f873912..f873912 100644
--- a/modules/rmdir/paths.nix
+++ b/old/modules/rmdir/paths.nix
diff --git a/modules/rmdir/users.nix b/old/modules/rmdir/users.nix
index 82f078b..82f078b 100644
--- a/modules/rmdir/users.nix
+++ b/old/modules/rmdir/users.nix
diff --git a/modules/tv/base-cac-CentOS-7-64bit.nix b/old/modules/tv/base-cac-CentOS-7-64bit.nix
index 42ab481..42ab481 100644
--- a/modules/tv/base-cac-CentOS-7-64bit.nix
+++ b/old/modules/tv/base-cac-CentOS-7-64bit.nix
diff --git a/modules/tv/base.nix b/old/modules/tv/base.nix
index 94f3609..94f3609 100644
--- a/modules/tv/base.nix
+++ b/old/modules/tv/base.nix
diff --git a/modules/tv/config/consul-client.nix b/old/modules/tv/config/consul-client.nix
index 0a8bf4d..0a8bf4d 100644
--- a/modules/tv/config/consul-client.nix
+++ b/old/modules/tv/config/consul-client.nix
diff --git a/modules/tv/config/consul-server.nix b/old/modules/tv/config/consul-server.nix
index 4cedbd3..4cedbd3 100644
--- a/modules/tv/config/consul-server.nix
+++ b/old/modules/tv/config/consul-server.nix
diff --git a/modules/tv/consul/default.nix b/old/modules/tv/consul/default.nix
index 2ee6fb8..2ee6fb8 100644
--- a/modules/tv/consul/default.nix
+++ b/old/modules/tv/consul/default.nix
diff --git a/modules/tv/ejabberd.nix b/old/modules/tv/ejabberd.nix
index 54a9aad..54a9aad 100644
--- a/modules/tv/ejabberd.nix
+++ b/old/modules/tv/ejabberd.nix
diff --git a/modules/tv/environment.nix b/old/modules/tv/environment.nix
index 9e5a819..9e5a819 100644
--- a/modules/tv/environment.nix
+++ b/old/modules/tv/environment.nix
diff --git a/modules/tv/exim-retiolum.nix b/old/modules/tv/exim-retiolum.nix
index efab5cf..efab5cf 100644
--- a/modules/tv/exim-retiolum.nix
+++ b/old/modules/tv/exim-retiolum.nix
diff --git a/modules/tv/exim-smarthost.nix b/old/modules/tv/exim-smarthost.nix
index a4c47b3..a4c47b3 100644
--- a/modules/tv/exim-smarthost.nix
+++ b/old/modules/tv/exim-smarthost.nix
diff --git a/modules/tv/git/cgit.nix b/old/modules/tv/git/cgit.nix
index 747a931..747a931 100644
--- a/modules/tv/git/cgit.nix
+++ b/old/modules/tv/git/cgit.nix
diff --git a/modules/tv/git/config.nix b/old/modules/tv/git/config.nix
index 4f44c38..4f44c38 100644
--- a/modules/tv/git/config.nix
+++ b/old/modules/tv/git/config.nix
diff --git a/modules/tv/git/default.nix b/old/modules/tv/git/default.nix
index 17bc373..17bc373 100644
--- a/modules/tv/git/default.nix
+++ b/old/modules/tv/git/default.nix
diff --git a/modules/tv/git/options.nix b/old/modules/tv/git/options.nix
index c251d7d..c251d7d 100644
--- a/modules/tv/git/options.nix
+++ b/old/modules/tv/git/options.nix
diff --git a/modules/tv/git/public.nix b/old/modules/tv/git/public.nix
index de6ed7f..de6ed7f 100644
--- a/modules/tv/git/public.nix
+++ b/old/modules/tv/git/public.nix
diff --git a/modules/tv/identity/default.nix b/old/modules/tv/identity/default.nix
index 7cf90de..7cf90de 100644
--- a/modules/tv/identity/default.nix
+++ b/old/modules/tv/identity/default.nix
diff --git a/modules/tv/iptables/config.nix b/old/modules/tv/iptables/config.nix
index a525cfa..a525cfa 100644
--- a/modules/tv/iptables/config.nix
+++ b/old/modules/tv/iptables/config.nix
diff --git a/modules/tv/iptables/default.nix b/old/modules/tv/iptables/default.nix
index cf27a26..cf27a26 100644
--- a/modules/tv/iptables/default.nix
+++ b/old/modules/tv/iptables/default.nix
diff --git a/modules/tv/iptables/options.nix b/old/modules/tv/iptables/options.nix
index 1adffeb..1adffeb 100644
--- a/modules/tv/iptables/options.nix
+++ b/old/modules/tv/iptables/options.nix
diff --git a/modules/tv/nginx/config.nix b/old/modules/tv/nginx/config.nix
index 4bfd8ad..4bfd8ad 100644
--- a/modules/tv/nginx/config.nix
+++ b/old/modules/tv/nginx/config.nix
diff --git a/modules/tv/nginx/default.nix b/old/modules/tv/nginx/default.nix
index 49133fb..49133fb 100644
--- a/modules/tv/nginx/default.nix
+++ b/old/modules/tv/nginx/default.nix
diff --git a/modules/tv/nginx/options.nix b/old/modules/tv/nginx/options.nix
index ddfb380..ddfb380 100644
--- a/modules/tv/nginx/options.nix
+++ b/old/modules/tv/nginx/options.nix
diff --git a/modules/tv/retiolum/config.nix b/old/modules/tv/retiolum/config.nix
index f1d227f..f1d227f 100644
--- a/modules/tv/retiolum/config.nix
+++ b/old/modules/tv/retiolum/config.nix
diff --git a/modules/tv/retiolum/default.nix b/old/modules/tv/retiolum/default.nix
index 93b0be0..93b0be0 100644
--- a/modules/tv/retiolum/default.nix
+++ b/old/modules/tv/retiolum/default.nix
diff --git a/modules/tv/retiolum/options.nix b/old/modules/tv/retiolum/options.nix
index a06cbec..a06cbec 100644
--- a/modules/tv/retiolum/options.nix
+++ b/old/modules/tv/retiolum/options.nix
diff --git a/modules/tv/sanitize.nix b/old/modules/tv/sanitize.nix
index 1733414..1733414 100644
--- a/modules/tv/sanitize.nix
+++ b/old/modules/tv/sanitize.nix
diff --git a/modules/tv/smartd.nix b/old/modules/tv/smartd.nix
index 2e9d955..2e9d955 100644
--- a/modules/tv/smartd.nix
+++ b/old/modules/tv/smartd.nix
diff --git a/modules/tv/synaptics.nix b/old/modules/tv/synaptics.nix
index c47cb9d..c47cb9d 100644
--- a/modules/tv/synaptics.nix
+++ b/old/modules/tv/synaptics.nix
diff --git a/modules/tv/urlwatch/default.nix b/old/modules/tv/urlwatch/default.nix
index 87ec289..87ec289 100644
--- a/modules/tv/urlwatch/default.nix
+++ b/old/modules/tv/urlwatch/default.nix
diff --git a/modules/tv/urxvt.nix b/old/modules/tv/urxvt.nix
index a975812..a975812 100644
--- a/modules/tv/urxvt.nix
+++ b/old/modules/tv/urxvt.nix
diff --git a/modules/tv/users/default.nix b/old/modules/tv/users/default.nix
index 719f57d..719f57d 100644
--- a/modules/tv/users/default.nix
+++ b/old/modules/tv/users/default.nix
diff --git a/modules/tv/xserver.nix b/old/modules/tv/xserver.nix
index 897dbcc..897dbcc 100644
--- a/modules/tv/xserver.nix
+++ b/old/modules/tv/xserver.nix
diff --git a/modules/uriel/default.nix b/old/modules/uriel/default.nix
index 7f2b903..7f2b903 100644
--- a/modules/uriel/default.nix
+++ b/old/modules/uriel/default.nix
diff --git a/modules/uriel/repos.nix b/old/modules/uriel/repos.nix
index e31ba94..e31ba94 100644
--- a/modules/uriel/repos.nix
+++ b/old/modules/uriel/repos.nix
diff --git a/modules/wu/default.nix b/old/modules/wu/default.nix
index e55fbaf..e55fbaf 100644
--- a/modules/wu/default.nix
+++ b/old/modules/wu/default.nix
diff --git a/modules/wu/hosts.nix b/old/modules/wu/hosts.nix
index 207553b..207553b 100644
--- a/modules/wu/hosts.nix
+++ b/old/modules/wu/hosts.nix
diff --git a/modules/wu/paths.nix b/old/modules/wu/paths.nix
index 2d2ff7b..2d2ff7b 100644
--- a/modules/wu/paths.nix
+++ b/old/modules/wu/paths.nix
diff --git a/modules/wu/users.nix b/old/modules/wu/users.nix
index e50878c..e50878c 100644
--- a/modules/wu/users.nix
+++ b/old/modules/wu/users.nix
diff --git a/pubkeys/deploy_wu.ssh.pub b/old/pubkeys/deploy_wu.ssh.pub
index a54a1ca..a54a1ca 100644
--- a/pubkeys/deploy_wu.ssh.pub
+++ b/old/pubkeys/deploy_wu.ssh.pub
diff --git a/pubkeys/lass.ssh.pub b/old/pubkeys/lass.ssh.pub
index 172fd2d..172fd2d 100644
--- a/pubkeys/lass.ssh.pub
+++ b/old/pubkeys/lass.ssh.pub
diff --git a/pubkeys/makefu.ssh.pub b/old/pubkeys/makefu.ssh.pub
index 6092ec4..6092ec4 100644
--- a/pubkeys/makefu.ssh.pub
+++ b/old/pubkeys/makefu.ssh.pub
diff --git a/pubkeys/mv_vod.ssh.pub b/old/pubkeys/mv_vod.ssh.pub
index 7b7d2e2..7b7d2e2 100644
--- a/pubkeys/mv_vod.ssh.pub
+++ b/old/pubkeys/mv_vod.ssh.pub
diff --git a/pubkeys/tv_wu.ssh.pub b/old/pubkeys/tv_wu.ssh.pub
index b6e2634..b6e2634 100644
--- a/pubkeys/tv_wu.ssh.pub
+++ b/old/pubkeys/tv_wu.ssh.pub
diff --git a/pubkeys/uriel.ssh.pub b/old/pubkeys/uriel.ssh.pub
index 015b578..015b578 100644
--- a/pubkeys/uriel.ssh.pub
+++ b/old/pubkeys/uriel.ssh.pub