From 9d9d0196e3765ebb67a651cb522d431a5a30b7bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Tue, 22 Dec 2020 14:35:08 +0000
Subject: [PATCH] zerotier is now '.vpn'

---
 nixos/backups.nix            | 2 +-
 nixos/common-hardware.nix    | 8 ++++----
 nixos/distributed-builds.nix | 4 ++--
 nixos/zerotier.nix           | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/nixos/backups.nix b/nixos/backups.nix
index 6e9d796f..0620b0bb 100644
--- a/nixos/backups.nix
+++ b/nixos/backups.nix
@@ -8,7 +8,7 @@ in
       restic.backups.home-to-brix = {
         passwordFile = "/etc/nixos/secrets/restic-password-brix";
         paths = [ "/home" ];
-        repository = "rest:http://brix.local:8000/";
+        repository = "rest:http://brix.vpn:8000/";
         timerConfig = { OnCalendar = "hourly"; };
         extraBackupArgs = extraArgs;
       };
diff --git a/nixos/common-hardware.nix b/nixos/common-hardware.nix
index ef46a26e..9966d967 100644
--- a/nixos/common-hardware.nix
+++ b/nixos/common-hardware.nix
@@ -37,16 +37,16 @@
   };
 
   hardware.printers.ensurePrinters = [{
-    description = "Epson XP-540";
-    name = "epson_xp540";
-    deviceUri = "ipp://epsonxp540.lan/ipp/print";
+    description = "Epson XP-540 via brix";
+    name = "epson_xp540_via_brix";
+    deviceUri = "ipp://brix.local/ipp/print";
     model = "epson-inkjet-printer-escpr/Epson-XP-540_Series-epson-escpr-en.ppd";
     ppdOptions = { PageSize = "A4"; Duplex = "DuplexNoTumble"; };
   }];
 
   hardware.sane = {
     enable = true;
-    netConf = "epsonxp540.lan";
+    netConf = "brix.local";
   };
 
   services.saned.enable = true;
diff --git a/nixos/distributed-builds.nix b/nixos/distributed-builds.nix
index f2d2e72b..06c02aaf 100644
--- a/nixos/distributed-builds.nix
+++ b/nixos/distributed-builds.nix
@@ -6,7 +6,7 @@
 
   nix.buildMachines = [
     {
-      hostName = "brix.local";
+      hostName = "brix.vpn";
       sshUser = "nix-builder";
       sshKey = "/home/cyryl/.ssh/id_ed25519";
       system = "x86_64-linux";
@@ -16,7 +16,7 @@
       mandatoryFeatures = [ ];
     }
     {
-      hostName = "vultr1.local";
+      hostName = "vultr1.vpn";
       sshUser = "nix-builder";
       sshKey = "/home/cyryl/.ssh/id_ed25519";
       system = "x86_64-linux";
diff --git a/nixos/zerotier.nix b/nixos/zerotier.nix
index f22fbf23..0b944bb8 100644
--- a/nixos/zerotier.nix
+++ b/nixos/zerotier.nix
@@ -6,8 +6,8 @@
   };
 
   networking.hosts = {
-    "172.23.153.159" = [ "brix.local" ];
-    "172.23.28.139" = [ "vultr1.local" ];
+    "172.23.153.159" = [ "brix.vpn" ];
+    "172.23.28.139" = [ "vultr1.vpn" ];
   };
 
 }