1 files changed, 10 insertions, 7 deletions
diff --git a/lass/1systems/echelon.nix b/lass/1systems/echelon.nix
index 12765a101..31a5ed068 100644
--- a/lass/1systems/echelon.nix
+++ b/lass/1systems/echelon.nix
@@ -1,21 +1,24 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-{
+let
+  inherit (import ../4lib { inherit pkgs lib; }) getDefaultGateway;
+  inherit (lib) head;
+
+  ip = (head config.krebs.hosts.echelon.nets.internet.addrs4);
+in {
   imports = [
     ../../tv/2configs/CAC-Developer-2.nix
     ../../tv/2configs/CAC-CentOS-7-64bit.nix
     ../2configs/base.nix
     ../2configs/retiolum.nix
-    ../2configs/fastpoke-pages.nix
-    ../2configs/new-repos.nix
     {
       networking.interfaces.enp2s1.ip4 = [
         {
-          address = "162.248.167.198";
+          address = ip;
           prefixLength = 24;
         }
       ];
-      networking.defaultGateway = "162.248.167.1";
+      networking.defaultGateway = getDefaultGateway ip;
       networking.nameservers = [
         "8.8.8.8"
       ];
@@ -25,7 +28,7 @@
 
   krebs.build = {
     user = config.krebs.users.lass;
-    target = "root@162.248.167.198";
+    target = "root@${ip}";
     host = config.krebs.hosts.echelon;
     deps = {
       secrets = {