Pass hostname and username to modules

modules/common/darwin/all-hosts.nix

@@ -1,6 +1,4 @@
-{ pkgs, ... }: let
-  username = "gene.liverman";
-in {
+{ pkgs, hostname, username, ... }: {
   environment = {
     shells = with pkgs; [ bash zsh ];
     loginShell = pkgs.zsh;
@@ -68,6 +66,8 @@ in {
     };
   };
 
+  networking.hostName = "${hostname}";
+
   nix = {
     settings = {
       bash-prompt-prefix = "(nix:$name)\040";
@@ -93,4 +93,4 @@ in {
     home = "/Users/${username}";
     shell = pkgs.zsh;
   };
-}
+}

modules/common/nixos/all-hosts.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, hostname, username, ... }: {
   imports = [
     ./internationalisation.nix
   ];
@@ -26,7 +26,10 @@
     })
   ];
 
+  networking.hostName = "${hostname}";
+
   nix.settings = {
+    allowed-users = [ "${username}" ];
     experimental-features = [
       "flakes"
       "nix-command"
@@ -46,4 +49,4 @@
   time.timeZone = "America/New_York";
 
   users.defaultUserShell = pkgs.zsh;
-}
+}

modules/hosts/nixos/rainbow-planet/default.nix

@@ -1,7 +1,4 @@
-{ config, pkgs, ... }: let
-  username = "gene";
-  hostname = "rainbow-planet";
-in {
+{ config, pkgs, username, ... }: {
   imports = [
     ./hardware-configuration.nix
   ];
@@ -39,12 +36,9 @@ in {
   ];
 
   networking = {
-    hostName = "${hostname}";
     networkmanager.enable = true;
   };
 
-  nix.settings.allowed-users = [ "${username}" ];
-
   programs = {
     _1password.enable = true;
     _1password-gui = {
@@ -104,7 +98,7 @@ in {
     description = "Gene Liverman";
     extraGroups = [ "networkmanager" "wheel" "dialout" "input" ];
     packages = with pkgs; [
-     tailscale-systray
+      tailscale-systray
     ];
   };
 }