From cff0d07665ca0e222bbd11ef54a71bf6ca61ad52 Mon Sep 17 00:00:00 2001
From: Tyler Starr <starrtyler88@gmail.com>
Date: Sat, 21 Dec 2024 14:31:57 -0800
Subject: [PATCH] use custom hostname from json file

---
 provision/flake.nix                       | 1 +
 provision/hosts/bulwark/configuration.nix | 4 ++--
 provision/hosts/bulwark/default.nix       | 1 +
 provision/hosts/kestrel/configuration.nix | 4 ++--
 provision/hosts/kestrel/default.nix       | 3 ++-
 provision/hosts/osprey/configuration.nix  | 4 ++--
 provision/hosts/osprey/default.nix        | 1 +
 provision/hosts/shivan/configuration.nix  | 4 ++--
 provision/hosts/shivan/default.nix        | 1 +
 provision/hosts/torus/configuration.nix   | 4 ++--
 provision/hosts/torus/default.nix         | 1 +
 provision/hosts/wsl/configuration.nix     | 4 ++--
 provision/hosts/wsl/default.nix           | 1 +
 13 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/provision/flake.nix b/provision/flake.nix
index b6dcdcb1..2ca1c9e1 100644
--- a/provision/flake.nix
+++ b/provision/flake.nix
@@ -24,6 +24,7 @@
         inherit system inputs agenix home-manager jovian-nixos nixos-wsl;
         specialArgs = {
           user = hostConfig.user;
+          hostname = "${hostname}";
         };
       })
     ) hosts;
diff --git a/provision/hosts/bulwark/configuration.nix b/provision/hosts/bulwark/configuration.nix
index 4afe3c2b..f24e1fa0 100644
--- a/provision/hosts/bulwark/configuration.nix
+++ b/provision/hosts/bulwark/configuration.nix
@@ -1,11 +1,11 @@
-{ config, lib, pkgs, user, ... }:
+{ config, lib, pkgs, user, hostname, ... }:
 {
  imports = [
     ./steam-deck.nix
   ];
 
   # Set networking options
-  networking.hostName = "bulwark"; 
+  networking.hostName = "${hostname}"; 
   networking.firewall.checkReversePath = "loose";
   networking.firewall.enable = false;
 
diff --git a/provision/hosts/bulwark/default.nix b/provision/hosts/bulwark/default.nix
index 480dfcbe..e16ebed1 100644
--- a/provision/hosts/bulwark/default.nix
+++ b/provision/hosts/bulwark/default.nix
@@ -1,6 +1,7 @@
 { lib, specialArgs, system, inputs, agenix, home-manager, jovian-nixos, ... }:
 let
     user = specialArgs.user; 
+    hostname = specialArgs.hostname;
 in { 
   inherit system;
   specialArgs = { inherit user inputs home-manager jovian-nixos; };
diff --git a/provision/hosts/kestrel/configuration.nix b/provision/hosts/kestrel/configuration.nix
index 67a52371..6614d566 100644
--- a/provision/hosts/kestrel/configuration.nix
+++ b/provision/hosts/kestrel/configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, user, lib, ... }:
+{ config, pkgs, user, lib, hostname, ... }:
 {
   imports = [ 
     ./backup.nix
@@ -9,7 +9,7 @@
   powerManagement.cpuFreqGovernor = "performance";
 
   # Set networking options
-  networking.hostName = "kestrel"; 
+  networking.hostName = "${hostname}"; 
   networking.firewall.checkReversePath = "loose";
   networking.firewall.enable = false;
 
diff --git a/provision/hosts/kestrel/default.nix b/provision/hosts/kestrel/default.nix
index 58fdff86..0f63c0f7 100644
--- a/provision/hosts/kestrel/default.nix
+++ b/provision/hosts/kestrel/default.nix
@@ -1,9 +1,10 @@
 { lib, specialArgs, system, inputs, agenix, home-manager, ... }:
 let
     user = specialArgs.user; 
+    hostname = specialArgs.hostname;
 in { 
   inherit system;
-  specialArgs = { inherit user inputs home-manager; };
+  specialArgs = { inherit user hostname inputs home-manager; };
   modules = [
     ../default                            # shared by all configs
     ../default/physical/configuration.nix # shared by physical machines
diff --git a/provision/hosts/osprey/configuration.nix b/provision/hosts/osprey/configuration.nix
index b9195da7..65ab7512 100644
--- a/provision/hosts/osprey/configuration.nix
+++ b/provision/hosts/osprey/configuration.nix
@@ -1,10 +1,10 @@
-{ config, pkgs, user, lib, ... }:
+{ config, pkgs, user, lib, hostname, ... }:
 {
   # Use performance governor for sweet gaming performance!
   powerManagement.cpuFreqGovernor = "performance";
 
   # Set networking options
-  networking.hostName = "osprey"; 
+  networking.hostName = "${hostname}"; 
   networking.firewall.checkReversePath = false;
   networking.firewall.enable = false;
 
diff --git a/provision/hosts/osprey/default.nix b/provision/hosts/osprey/default.nix
index 25c7949b..bcd208c4 100644
--- a/provision/hosts/osprey/default.nix
+++ b/provision/hosts/osprey/default.nix
@@ -1,6 +1,7 @@
 { lib, specialArgs, system, inputs, agenix, home-manager, ... }:
 let
     user = specialArgs.user; 
+    hostname = specialArgs.hostname;
 in { 
   inherit system;
   specialArgs = { inherit user inputs home-manager; };
diff --git a/provision/hosts/shivan/configuration.nix b/provision/hosts/shivan/configuration.nix
index c3184431..0323cc89 100644
--- a/provision/hosts/shivan/configuration.nix
+++ b/provision/hosts/shivan/configuration.nix
@@ -1,10 +1,10 @@
-{ config, pkgs, user, lib, ... }:
+{ config, pkgs, user, lib, hostname, ... }:
 {
   # Use performance governor for sweet gaming performance!
   powerManagement.cpuFreqGovernor = "performance";
 
   # Set networking options
-  networking.hostName = "shivan"; 
+  networking.hostName = "${hostname}"; 
   networking.firewall.checkReversePath = "loose";
   networking.firewall.enable = false;
 
diff --git a/provision/hosts/shivan/default.nix b/provision/hosts/shivan/default.nix
index 11c9829a..1210b7e3 100644
--- a/provision/hosts/shivan/default.nix
+++ b/provision/hosts/shivan/default.nix
@@ -1,6 +1,7 @@
 { lib, specialArgs, system, inputs, agenix, home-manager, ... }:
 let
     user = specialArgs.user; 
+    hostname = specialArgs.hostname;
 in { 
   inherit system;
   specialArgs = { inherit user inputs home-manager; };
diff --git a/provision/hosts/torus/configuration.nix b/provision/hosts/torus/configuration.nix
index 72125462..f3746c3a 100644
--- a/provision/hosts/torus/configuration.nix
+++ b/provision/hosts/torus/configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, user, lib, ... }:
+{ config, pkgs, user, lib, hostname, ... }:
 {
   imports = [ 
     ./wireguard-server.nix
@@ -18,7 +18,7 @@
   boot.kernelModules = [ "sg" ];
 
   # Set networking options
-  networking.hostName = "torus"; 
+  networking.hostName = "${hostname}"; 
   networking.firewall.enable = true;
   networking.firewall.checkReversePath = "loose";
   networking.firewall.allowedTCPPorts = [ 80 443 ];
diff --git a/provision/hosts/torus/default.nix b/provision/hosts/torus/default.nix
index 82de3d14..e60e2cd3 100644
--- a/provision/hosts/torus/default.nix
+++ b/provision/hosts/torus/default.nix
@@ -1,6 +1,7 @@
 { lib, specialArgs, system, inputs, agenix, home-manager, ... }:
 let
     user = specialArgs.user; 
+    hostname = specialArgs.hostname;
 in { 
   inherit system;
   specialArgs = { inherit user inputs home-manager; };
diff --git a/provision/hosts/wsl/configuration.nix b/provision/hosts/wsl/configuration.nix
index 6d635183..d07a885c 100644
--- a/provision/hosts/wsl/configuration.nix
+++ b/provision/hosts/wsl/configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, user, lib, inputs, nixos-wsl, ... }:
+{ config, pkgs, user, lib, inputs, nixos-wsl, hostname, ... }:
 let
   defaultUser = user;
 in 
@@ -15,7 +15,7 @@ in
   };
 
   # Set networking options
-  networking.hostName = "wsl"; 
+  networking.hostName = "${hostname}"; 
   networking.firewall.checkReversePath = "loose";
   networking.firewall.enable = false;
 
diff --git a/provision/hosts/wsl/default.nix b/provision/hosts/wsl/default.nix
index 8143937f..b11c2c7a 100644
--- a/provision/hosts/wsl/default.nix
+++ b/provision/hosts/wsl/default.nix
@@ -1,6 +1,7 @@
 { lib, specialArgs, system, inputs, agenix, home-manager, nixos-wsl, ... }:
 let
     user = specialArgs.user; 
+    hostname = specialArgs.hostname;
 in { 
   inherit system;
   specialArgs = { inherit user inputs nixos-wsl home-manager; };