From afe348d9138d9835cb73c6601aa964f4e6a8f661 Mon Sep 17 00:00:00 2001
From: Vivian Roest <vivian@0x76.dev>
Date: Sat, 10 Sep 2022 10:46:34 +0200
Subject: [PATCH] first multi-site deploy working :tada:

---
 nixos/hosts/hades/bastion/configuration.nix | 29 +++++++++++++++++++++
 nixos/hosts/hades/default.nix               | 14 +++++++++-
 nixos/hosts/olympus/default.nix             |  2 ++
 3 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 nixos/hosts/hades/bastion/configuration.nix

diff --git a/nixos/hosts/hades/bastion/configuration.nix b/nixos/hosts/hades/bastion/configuration.nix
new file mode 100644
index 00000000..eaac5fea
--- /dev/null
+++ b/nixos/hosts/hades/bastion/configuration.nix
@@ -0,0 +1,29 @@
+{ config, pkgs, lib, ... }:
+{
+  networking.interfaces.eth0.useDHCP = true;
+
+  # mosh ssh
+  programs.mosh.enable = true;
+
+  environment.systemPackages = with pkgs; [
+    cachix
+    direnv
+    git-crypt
+    nix-update
+    nodejs-14_x
+    pinentry-curses
+    ripgrep
+    rsync
+    tmux
+    vault
+  ];
+
+  environment.noXlibs = lib.mkForce false;
+
+  system.stateVersion = "21.05";
+
+  programs.gnupg.agent = {
+    enable = true;
+    pinentryFlavor = "curses";
+  };
+}
diff --git a/nixos/hosts/hades/default.nix b/nixos/hosts/hades/default.nix
index fe51488c..a396ee66 100644
--- a/nixos/hosts/hades/default.nix
+++ b/nixos/hosts/hades/default.nix
@@ -1 +1,13 @@
-[]
+[
+  {
+    hostname = "archlinux";
+    ip = "192.168.0.200";
+    mac = "00:0c:29:e4:0d:17";
+    nix = false;
+  }
+  {
+    hostname = "bastion";
+    ip = "192.168.0.114";
+    mac = "66:14:8e:b2:50:c4";
+  }
+]
diff --git a/nixos/hosts/olympus/default.nix b/nixos/hosts/olympus/default.nix
index c51b5f9c..4a50db6a 100644
--- a/nixos/hosts/olympus/default.nix
+++ b/nixos/hosts/olympus/default.nix
@@ -69,12 +69,14 @@
     profile = "dns";
     ip = "10.42.42.15";
     mac = "5E:F6:36:23:16:E3";
+    tags = [ "dns" ];
   }
   {
     hostname = "dns-2";
     profile = "dns";
     ip = "10.42.42.16";
     mac = "B6:04:0B:CD:0F:9F";
+    tags = [ "dns" ];
   }
   {
     hostname = "minio";