home

commit 6d5e49d63d825938cb056ec995684f541dda4963
parent 30b1af7072df85ee51b26c4d3e4fa521355fdfa1
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Fri, 29 Oct 2021 15:43:05 +0200

systems: start to use toml for aomi too

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
systems/hosts/aomi.nix
 | 
9
++++-----
M
systems/hosts/naruhodo.nix
 | 
1
-

2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/systems/hosts/aomi.nix b/systems/hosts/aomi.nix
@@ -15,6 +15,7 @@ let
   endpointIP = strings.optionalString secretCondition (import secretPath).wg.endpointIP;
   endpointPort = if secretCondition then (import secretPath).wg.listenPort else 0;
   endpointPublicKey = strings.optionalString secretCondition (import secretPath).wireguard.kerkouane.publicKey;
+  metadata = importTOML ../../ops/hosts.toml;
 in
 {
   imports = [
@@ -51,9 +52,6 @@ in
   };
 
   sops.defaultSopsFile = ../../secrets/secrets.yaml;
-  sops.secrets.example_key = {
-    sopsFile = ../../secrets/syncthing.yaml;
-  };
 
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
@@ -126,17 +124,18 @@ in
     virtmanager
     # force xbacklight to work
     acpilight
+    steam-run
   ];
 
   services = {
-    syncthing.guiAddress = "${ip}:8384";
+    syncthing.guiAddress = "${metadata.hosts.aomi.wireguard.addrs.v4}:8384";
     smartd = {
       enable = true;
       devices = [{ device = "/dev/nvme0n1"; }];
     };
     wireguard = {
       enable = true;
-      ips = ips;
+      ips = [ "${metadata.hosts.aomi.wireguard.addrs.v4}/24" ];
       endpoint = endpointIP;
       endpointPort = endpointPort;
       endpointPublicKey = endpointPublicKey;
diff --git a/systems/hosts/naruhodo.nix b/systems/hosts/naruhodo.nix
@@ -164,7 +164,6 @@ in
     acpilight
   ];
 
-  # warnings = "metadata… ${metadata.hosts.naruhodo.wireguard.addrs.v4}";
   services = {
     wireguard = {
       enable = true;