From 9f5d3d819ef15dff852fef85deeea878968135ae Mon Sep 17 00:00:00 2001
From: Max <max@privatevoid.net>
Date: Fri, 27 Oct 2023 20:42:34 +0200
Subject: [PATCH] treewide: hypr -> hyprspace

---
 flake.nix                      |  4 ++--
 hosts/TITAN/default.nix        |  2 +-
 hosts/default.nix              | 10 +++++-----
 hosts/jericho/default.nix      |  2 +-
 hosts/tools.nix                |  2 +-
 modules/hyprspace/default.nix  |  8 ++++----
 modules/nix-config/default.nix |  2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/flake.nix b/flake.nix
index 4072a6e..f054d9c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -82,14 +82,14 @@
 
       deploy.nodes = with deploy-rs-lib; {
         TITAN = {
-          hostname = "titan.hypr";
+          hostname = "titan.hyprspace";
           profiles.system = {
             user = "root";
             path = activate.nixos self.nixosConfigurations.TITAN;
           };
         };
         jericho = {
-          hostname = "jericho.hypr";
+          hostname = "jericho.hyprspace";
           profiles.system = {
             user = "root";
             path = activate.nixos self.nixosConfigurations.jericho;
diff --git a/hosts/TITAN/default.nix b/hosts/TITAN/default.nix
index dd7c894..1229020 100644
--- a/hosts/TITAN/default.nix
+++ b/hosts/TITAN/default.nix
@@ -4,7 +4,7 @@ tools: {
     extraHostNames = clientResolve "titan";
   };
   
-  hypr = {
+  hyprspace = {
     id = "QmfJ5Tv2z9jFv9Aocevyn6QqRcfm9eYQZhvYvmAVfACfuM";
     listenPort = 443;
     routes = [
diff --git a/hosts/default.nix b/hosts/default.nix
index 06db013..b265df6 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -12,7 +12,7 @@ in with tools.dns; {
       publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICz2nGA+Y4OxhMKsV6vKIns3hOoBkK557712h7FfWXcE";
       extraHostNames = subResolve "vegas" "backbone";
     };
-    hypr = {
+    hyprspace = {
       id = "QmYs4xNBby2fTs8RnzfXEk161KD4mftBfCiR8yXtgGPj4J";
       routes = [
         "10.1.0.1/32"
@@ -25,7 +25,7 @@ in with tools.dns; {
       publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAUG/ubwo68tt2jMP5ia0Sa4mnkWtlKVN5n4Y50U2nTC";
       extraHostNames = subResolve "prophet" "node";
     };
-    hypr = {    
+    hyprspace = {
       id = "QmbrAHuh4RYcyN9fWePCZMVmQjbaNXtyvrDCWz4VrchbXh";    
       routes = [
         "10.1.0.9/32"
@@ -37,7 +37,7 @@ in with tools.dns; {
       publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINImnMfEzUBU5qiuu05DMPrddTGypOtr+cL1/yQN2GFn";
       extraHostNames = subResolve "checkmate" "node";
     };
-    hypr = {
+    hyprspace = {
       id = "12D3KooWL84sAtq1QTYwb7gVbhSNX5ZUfVt4kgYKz8pdif1zpGUh";
       routes = [
         "10.1.0.32/32"
@@ -61,7 +61,7 @@ in with tools.dns; {
       publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGV8TbMvGXfAp9R2I9GdR7aLlGjxh2CW1pCZjQSB4TJp";
       extraHostNames = subResolve "thunderskin" "node";
     };
-    hypr = {
+    hyprspace = {
       id = "12D3KooWB9AUPorFoACkWbphyargRBV9osJsYuQDumtQ85j7Aqmg";
       routes = [
         "10.1.0.4/32"
@@ -69,7 +69,7 @@ in with tools.dns; {
     };
   };
   loki = {
-    hypr = {
+    hyprspace = {
       id = "QmYZ4qA1W9hEZgDKDgKgjNge1ZX3Z25gVGxs34uEoLghgq";
       routes = [
         "10.100.3.10/32" # old
diff --git a/hosts/jericho/default.nix b/hosts/jericho/default.nix
index 8578e7b..93dd2fe 100644
--- a/hosts/jericho/default.nix
+++ b/hosts/jericho/default.nix
@@ -4,7 +4,7 @@ tools: {
     extraHostNames = clientResolve "jericho";
   };
 
-  hypr = {
+  hyprspace = {
     id = "QmccBLgGP3HR36tTkwSYZX3KDv2EXb1MvYwGVs6PbpbHv9";
   };
 
diff --git a/hosts/tools.nix b/hosts/tools.nix
index 956249e..a895bab 100644
--- a/hosts/tools.nix
+++ b/hosts/tools.nix
@@ -10,7 +10,7 @@
     ];
     findResolve = list: dnameResolve (append "find" list) ++ append "f.void" list;
     dnameResolve = list: append "private.void" list ++ append "privatevoid.net" list;
-    vpnResolve = list: dnameResolve (append "vpn" list) ++ (append "hypr" list);
+    vpnResolve = list: dnameResolve (append "vpn" list) ++ (append "hyprspace" list);
     llmnrResolve = append "local";
     append = part: map (x: "${x}.${part}");
     portMap = port: map (x: "[${x}]:${builtins.toString port}");
diff --git a/modules/hyprspace/default.nix b/modules/hyprspace/default.nix
index 5a7b53a..ea6a268 100644
--- a/modules/hyprspace/default.nix
+++ b/modules/hyprspace/default.nix
@@ -2,16 +2,16 @@
 let
   inherit (config.networking) hostName;
   inherit (inputs.depot.packages.${pkgs.system}) hyprspace;
-  hyprspaceCapableNodes = lib.filterAttrs (_: host: host ? hypr) hosts;
+  hyprspaceCapableNodes = lib.filterAttrs (_: host: host ? hyprspace) hosts;
   peersFormatted = builtins.mapAttrs (name: x: {
     inherit name;
-    inherit (x.hypr) id;
-    routes = map (net: { inherit net; }) (x.hypr.routes or []);
+    inherit (x.hyprspace) id;
+    routes = map (net: { inherit net; }) (x.hyprspace.routes or []);
   }) hyprspaceCapableNodes;
   peersFiltered = lib.filterAttrs (name: _: name != hostName) peersFormatted;
   peerList = builtins.attrValues peersFiltered;
   myNode = hosts.${hostName};
-  listenPort = myNode.hypr.listenPort or 8001;
+  listenPort = myNode.hyprspace.listenPort or 8001;
 
   interfaceConfig = pkgs.writeText "hyprspace.json" (builtins.toJSON {
     listenAddresses = let
diff --git a/modules/nix-config/default.nix b/modules/nix-config/default.nix
index 9b7ca12..844946e 100644
--- a/modules/nix-config/default.nix
+++ b/modules/nix-config/default.nix
@@ -67,7 +67,7 @@ in {
     ] ++
     (lib.optional (config.networking.hostName != "TITAN") (bigBuilder // {
         sshUser = "nix";
-        hostName = "titan.hypr";
+        hostName = "titan.hyprspace";
         speedFactor = 12;
         maxJobs = 12;
     }));