cleanup

diff --git a/config/nix.org b/config/nix.org
index 6ac961994d1b104e97284239130090bdea61890f..52e1e5f0d557f1dcba9f4c455670a3a5eb624d25 100644 (file)
--- a/config/nix.org
+++ b/config/nix.org
@@ -113,7 +113,8 @@ creation_rules:
 also note that you will have to write your own secrets.yaml file, with an entry called ~mail~,
 which is used for the imaps and smtps password.
 * Nix Topology
-Nix Topology generates a nice graph of all my hosts.
+Nix Topology generates a nice graph of all my hosts. You can view this
+graph by running ~nix build .#topology.x86_64-linux.config.output~.
 #+begin_src nix :tangle ../nix/topology/default.nix
   { config, ... }:
   let
@@ -488,7 +489,7 @@ Use postfix as an smtps server.
     # Add HSTS header with preloading to HTTPS requests.
     # Adding this header to HTTP requests is discouraged
     map $scheme $hsts_header {
-       https   "max-age=31536000; includeSubdomains; preload";
+       https   "max-age=31536000; includeSubdomains; preload";
     }
     add_header Strict-Transport-Security $hsts_header;
 
@@ -509,11 +510,11 @@ Use postfix as an smtps server.
   '';
 
       virtualHosts = {
-       "ret2pop.net" = {
-         # addSSL = true;
-         # enableACME = true;
-         root = "/home/preston/ret2pop-website/";
-       };
+           "ret2pop.nullring.xyz" = {
+             # addSSL = true;
+             # enableACME = true;
+             root = "/home/preston/ret2pop-website/";
+           };
       };
     };
   }

diff --git a/nix/topology/default.nix b/nix/topology/default.nix
index ce0b3a47a2bcdb65df10b808f53969b524ba52de..ce4fedd120a78d541910df563356c71f035180ab 100644 (file)
--- a/nix/topology/default.nix
+++ b/nix/topology/default.nix
@@ -4,16 +4,13 @@ let
     (config.lib.topology);
 in
 {
-  # Connect node1.lan -> node2.wan
   nodes = {
     spontaneity = {
       interfaces.wan.network = "remote";
     };
-
     installer = {
       interfaces.lan.network = "home";
     };
-
     affinity = {
       interfaces.lan = {
         network = "home";
@@ -45,7 +42,6 @@ in
       };
     };
   };
-
   networks = {
     home = {
       name = "Home Network";