From c2a556abd8c7d39fbbe333b514217b1e621048cb Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Thu, 14 Nov 2019 06:34:48 -0800
Subject: Re-namespace Serval under Com.Simatime

I don't have runserval.com yet, so I'm not gonna put the cart before the horse
---
 Com/RunServal/hardware.nix         |  6 ------
 Com/RunServal/networking.nix       | 29 -----------------------------
 Com/Simatime/Serval/hardware.nix   |  6 ++++++
 Com/Simatime/Serval/networking.nix | 29 +++++++++++++++++++++++++++++
 default.nix                        | 20 ++++++++++----------
 5 files changed, 45 insertions(+), 45 deletions(-)
 delete mode 100644 Com/RunServal/hardware.nix
 delete mode 100644 Com/RunServal/networking.nix
 create mode 100644 Com/Simatime/Serval/hardware.nix
 create mode 100644 Com/Simatime/Serval/networking.nix

diff --git a/Com/RunServal/hardware.nix b/Com/RunServal/hardware.nix
deleted file mode 100644
index 8c88cb7..0000000
--- a/Com/RunServal/hardware.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ ... }:
-{
-  imports = [ <nixpkgs/nixos/modules/profiles/qemu-guest.nix> ];
-  boot.loader.grub.device = "/dev/vda";
-  fileSystems."/" = { device = "/dev/vda1"; fsType = "ext4"; };
-}
diff --git a/Com/RunServal/networking.nix b/Com/RunServal/networking.nix
deleted file mode 100644
index e13a6f5..0000000
--- a/Com/RunServal/networking.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, ... }: {
-  # This file was populated at runtime with the networking
-  # details gathered from the active system.
-  networking = {
-    nameservers = [
-      "127.0.0.53"
-    ];
-    defaultGateway = "157.245.160.1";
-    defaultGateway6 = "";
-    dhcpcd.enable = false;
-    usePredictableInterfaceNames = lib.mkForce true;
-    interfaces = {
-      eth0 = {
-        ipv4.addresses = [
-          { address="157.245.167.217"; prefixLength=20; }
-          { address="10.46.0.8"; prefixLength=16; }
-        ];
-        ipv6.addresses = [
-          { address="fe80::242a:8bff:feb7:6afb"; prefixLength=64; }
-        ];
-        ipv4.routes = [ { address = "157.245.160.1"; prefixLength = 32; } ];
-        ipv6.routes = [ { address = ""; prefixLength = 32; } ];
-      };
-    };
-  };
-  services.udev.extraRules = ''
-    ATTR{address}=="26:2a:8b:b7:6a:fb", NAME="eth0"
-  '';
-}
diff --git a/Com/Simatime/Serval/hardware.nix b/Com/Simatime/Serval/hardware.nix
new file mode 100644
index 0000000..8c88cb7
--- /dev/null
+++ b/Com/Simatime/Serval/hardware.nix
@@ -0,0 +1,6 @@
+{ ... }:
+{
+  imports = [ <nixpkgs/nixos/modules/profiles/qemu-guest.nix> ];
+  boot.loader.grub.device = "/dev/vda";
+  fileSystems."/" = { device = "/dev/vda1"; fsType = "ext4"; };
+}
diff --git a/Com/Simatime/Serval/networking.nix b/Com/Simatime/Serval/networking.nix
new file mode 100644
index 0000000..e13a6f5
--- /dev/null
+++ b/Com/Simatime/Serval/networking.nix
@@ -0,0 +1,29 @@
+{ lib, ... }: {
+  # This file was populated at runtime with the networking
+  # details gathered from the active system.
+  networking = {
+    nameservers = [
+      "127.0.0.53"
+    ];
+    defaultGateway = "157.245.160.1";
+    defaultGateway6 = "";
+    dhcpcd.enable = false;
+    usePredictableInterfaceNames = lib.mkForce true;
+    interfaces = {
+      eth0 = {
+        ipv4.addresses = [
+          { address="157.245.167.217"; prefixLength=20; }
+          { address="10.46.0.8"; prefixLength=16; }
+        ];
+        ipv6.addresses = [
+          { address="fe80::242a:8bff:feb7:6afb"; prefixLength=64; }
+        ];
+        ipv4.routes = [ { address = "157.245.160.1"; prefixLength = 32; } ];
+        ipv6.routes = [ { address = ""; prefixLength = 32; } ];
+      };
+    };
+  };
+  services.udev.extraRules = ''
+    ATTR{address}=="26:2a:8b:b7:6a:fb", NAME="eth0"
+  '';
+}
diff --git a/default.nix b/default.nix
index 2195f58..41a29df 100644
--- a/default.nix
+++ b/default.nix
@@ -50,16 +50,16 @@ in {
         ];
       };
     };
-  };
-  Com.RunServal = buildOS {
-    configuration = {
-      imports = [
-        ./Com/Simatime/packages.nix
-        ./Com/RunServal/hardware.nix
-        ./Com/RunServal/networking.nix
-      ];
-      networking.hostName = "serval";
-      boot.enableContainers = true;
+    Serval = buildOS {
+      configuration = {
+        imports = [
+          ./Com/Simatime/packages.nix
+          ./Com/RunServal/hardware.nix
+          ./Com/RunServal/networking.nix
+        ];
+        networking.hostName = "serval.simatime.com";
+        boot.enableContainers = true;
+      };
     };
   };
   Com.InfluencedByBooks = buildOS {
-- 
cgit v1.2.3