Allow configuring the hostname

lib/modules/valhalla.nix

@@ -35,6 +35,12 @@
           };
         };
 
+        hostname = mkOption {
+          type = types.str;
+          description = "The hostname of the system.";
+          default = "valhalla";
+        };
+
         setupUser = {
           name = mkOption {
             type = types.str;

profiles/machines/manuel/DerGeret/config.nix

@@ -1,16 +1,20 @@
-{ ... }: {
+{ lib, ... }: {
   imports = [
     ../defaults.nix
   ];
 
   config = {
     valhalla = {
+      hostname = lib.mkDefault "der-geret";
+
       windows = {
         dualboot = {
           enable = true;
           linuxPercentage = 70; # better safe than sorry
         };
 
+        hostname = "DerGeret";
+
         users.manuel = {
           microsoftAccount = true;
           groups = ["Administrators"];

profiles/machines/manuel/ManuSurface/config.nix

@@ -4,6 +4,9 @@
   ];
 
   config = {
-    valhalla.partition.os.deviceName = "nvme0n1";
+    valhalla = {
+      hostname = "manu-surface";
+      partition.os.deviceName = "nvme0n1";
+    };
   };
 }

scripts/Arch/OS/setup.fish

@@ -86,7 +86,7 @@ begin
                 true
             end
 
-            and echo "$ARCH_HOSTNAME" | arch-chroot "$mountDir" tee /etc/hostname > /dev/null
+            and echo (getConfig valhalla.hostname) | arch-chroot "$mountDir" tee /etc/hostname > /dev/null
             
             and arch-chroot "$mountDir" mkinitcpio -P
             and runHook installDrivers "Installing drivers..." || true

scripts/Windows/OS/Setup.ps1

@@ -8,7 +8,6 @@ function Start-Setup {
     $Global:InformationPreference = "Continue";
     $Global:ErrorActionPreference = "Inquire";
     $env:CONFIG_NAME ??= $ConfigurationName;
-    $null = $env:WIN_COMPUTER_NAME;
     $null = $env:SETUP_SCRIPT_NAME ??= "$PSScriptRoot/Install.ps1";
     $env:WSLENV = "CONFIG_NAME";
 
@@ -218,7 +217,7 @@ function Start-Setup {
 
     # Adjust unattended settings
     $computerName = (Get-Component (Get-PassSettings "specialize") "Microsoft-Windows-Shell-Setup").SelectSingleNode("./ua:ComputerName", $namespace);
-    $computerName.InnerText = "$env:WIN_COMPUTER_NAME";
+    $computerName.InnerText = $valhallaConfig.hostname;
 
     # Execute corresponding installer script after startup
     $oobeSettings = (Get-Component (Get-PassSettings "oobeSystem") "Microsoft-Windows-Shell-Setup");