From 064b3abcf8c012567574b194773f2c601a0f3ee0 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Wed, 5 May 2021 14:52:23 +0100
Subject: [PATCH] modules/nixos/{tf-glue,deploy} -> modules/nixos/deploy-tf

---
 modules/nixos/default.nix                        |  3 +--
 modules/nixos/{tf-glue => deploy-tf}/default.nix |  5 +++++
 modules/nixos/deploy/default.nix                 | 14 --------------
 3 files changed, 6 insertions(+), 16 deletions(-)
 rename modules/nixos/{tf-glue => deploy-tf}/default.nix (95%)
 delete mode 100644 modules/nixos/deploy/default.nix

diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 290677f1..325a5bce 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -3,9 +3,8 @@
 let hexchen = (import sources.nix-hexchen) { };
 in {
   imports = [
-    ./deploy
     ./katnet
-    ./tf-glue
+    ./deploy-tf
     (sources.pbb-nixfiles + "/modules/nftables")
     (sources.tf-nix + "/modules/nixos/secrets.nix")
     (sources.tf-nix + "/modules/nixos/secrets-users.nix")
diff --git a/modules/nixos/tf-glue/default.nix b/modules/nixos/deploy-tf/default.nix
similarity index 95%
rename from modules/nixos/tf-glue/default.nix
rename to modules/nixos/deploy-tf/default.nix
index 5012c5e8..3a3a66c7 100644
--- a/modules/nixos/tf-glue/default.nix
+++ b/modules/nixos/deploy-tf/default.nix
@@ -7,6 +7,11 @@ let
     merge = loc: defs: map (def: def.value) defs;
   };
 in {
+  options.deploy.target = mkOption {
+    type = with types; str;
+    default = "";
+  };
+
   options.deploy.tf = mkOption {
     type = types.submodule {
       freeformType = types.attrsOf unmergedValues;
diff --git a/modules/nixos/deploy/default.nix b/modules/nixos/deploy/default.nix
deleted file mode 100644
index 3fd18afe..00000000
--- a/modules/nixos/deploy/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ config, pkgs, lib, options, ... }:
-
-with lib;
-
-{
-  options = {
-    deploy = {
-      target = mkOption {
-        type = with types; str;
-        default = "";
-      };
-    };
-  };
-}