From ca31181af049419d2cb6de7843d679ed26addccf Mon Sep 17 00:00:00 2001
From: Sam <samual.shop@proton.me>
Date: Tue, 21 Jan 2025 13:06:21 +0000
Subject: [PATCH] add containers to merlin

---
 hosts/merlin/default.nix | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/hosts/merlin/default.nix b/hosts/merlin/default.nix
index 0d334cf..f75d465 100644
--- a/hosts/merlin/default.nix
+++ b/hosts/merlin/default.nix
@@ -42,6 +42,15 @@ in {
 
     # Import optional options
     ../common/optional/openssh.nix
+    ../common/optional/restic-backup.nix
+    ../common/optional/docker.nix
+    ../common/optional/nix-ld.nix
+
+    # Nixos containers
+    ../common/optional/nixos-containers/docker.nix
+    ../common/optional/nixos-containers/baseddata-worker.nix
+    ../common/optional/nixos-containers/pihole.nix
+    ../common/optional/nixos-containers/semitamaps-worker.nix
 
     # This machine is used for remote building
     ../common/optional/distributed-builds/remote-builder-machine.nix
@@ -57,6 +66,16 @@ in {
     };
   };
 
+  fileSystems."/mnt/main-ssd" = {
+    device = "/dev/disk/by-uuid/ba884006-e813-4b67-9fe6-62aea08b3b59";
+    fsType = "ext4";
+  };
+
+  fileSystems."/mnt/btcnode" = {
+    device = "/dev/disk/by-uuid/1dc56ec7-322f-44be-b6ad-79360fdfef93";
+    fsType = "btrfs";
+  };
+
   networking = {
     hostName = "merlin";
     nameservers = ["${piholeIp}" "${gatewayIp}" "8.8.8.8"];
@@ -80,6 +99,7 @@ in {
   environment.persistence."/persist" = {
     directories = [
       "/etc/zpool"
+      "/var/lib/tailscale"
     ];
   };
 
@@ -88,6 +108,10 @@ in {
     enable = true;
   };
 
+  # enable tailscale
+  services.tailscale.useRoutingFeatures = "server";
+  services.tailscale.enable = true;
+
   nixpkgs.config.allowUnfreePredicate = pkg:
     builtins.elem (lib.getName pkg) [
       "nvidia-x11"
@@ -115,11 +139,6 @@ in {
     user = "admin";
   };
 
-  fileSystems."/mnt/btcnode" = {
-    device = "/dev/disk/by-uuid/1dc56ec7-322f-44be-b6ad-79360fdfef93";
-    fsType = "btrfs";
-  };
-
   boot.supportedFilesystems = ["zfs"];
   boot.zfs.forceImportRoot = false;
   networking.hostId = "18aec5d7";