From f5668614bd952e96c529e92c0dd615f14e44b7c4 Mon Sep 17 00:00:00 2001
From: Fabian <fabian@fh2.ch>
Date: Tue, 24 Nov 2020 17:24:13 +0000
Subject: [PATCH] Switch montalin to meta-configuration

---
 host/montalin/networking.nix | 14 +++++++++-----
 meta/default.nix             |  4 +---
 meta/network.nix             |  2 ++
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/host/montalin/networking.nix b/host/montalin/networking.nix
index 95efa8a..13f2102 100644
--- a/host/montalin/networking.nix
+++ b/host/montalin/networking.nix
@@ -1,19 +1,23 @@
 { config, pkgs, ... }:
 
-{
+let
+  meta = import ../../meta;
+  plessur-net = meta.network.physical-networks.plessur;
+  montalin-net = plessur-net.dmz.hosts.montalin;
+in {
   networking.hostName = "montalin"; # Define your hostname.
 
   networking.useDHCP = false;
   networking.interfaces.eno1 = {
     ipv4.addresses = [{
-      address = "10.1.2.2";
-      prefixLength = 24;
+      address = montalin-net.v4.ip;
+      prefixLength = plessur-net.lan.v4.bitmask;
     }];
   };
   networking.interfaces.wlp1s0.useDHCP = true;
 
-  networking.defaultGateway = "10.1.2.1";
-  networking.nameservers = [ "10.1.2.1" ];
+  networking.defaultGateway = plessur-net.lan.v4.gateway;
+  networking.nameservers = plessur-net.lan.v4.nameservers;
 
   # Configure network proxy if necessary
   # networking.proxy.default = "http://user:password@proxy:port/";
diff --git a/meta/default.nix b/meta/default.nix
index 2d09309..b58fdf9 100644
--- a/meta/default.nix
+++ b/meta/default.nix
@@ -1,3 +1 @@
-{
-  network = import ./network.nix;
-}
+{ network = import ./network.nix; }
diff --git a/meta/network.nix b/meta/network.nix
index 8dcb377..c91b493 100644
--- a/meta/network.nix
+++ b/meta/network.nix
@@ -23,7 +23,9 @@
     plessur.lan = {
       v4 = {
         id = "10.1.1.0";
+        gateway = "10.1.2.1";
         bitmask = 24;
+        nameservers = [ "10.1.2.1" ];
       };
 
       hosts = { calanda.v4.ip = "10.1.1.1"; };