~

nixos/flake.nix

@@ -30,7 +30,7 @@
                     name = hostname;
                     value = lib.nixosSystem {
                         system = "${arch}-linux";
-                        specialArgs = { inherit inputs; };
+                        specialArgs = { inherit inputs; hostname = hostname; };
                         modules = [ ./hosts/${hostname}/configuration.nix ];
                     };
                 };

nixos/hosts/base.nix

@@ -1,4 +1,4 @@
-{ inputs, pkgs, ... }: {
+{ inputs, hostname, pkgs, ... }: {
 	nix.settings = {
 		experimental-features = [ "nix-command" "flakes" ];
 		trusted-users = [ "root" "rae" ];
@@ -15,12 +15,15 @@
 		overlays = import ../overlays.nix inputs;
 	};
 
+	networking.hostName = hostname;
+
 	users.users.rae = {
 		isNormalUser = true;
 		extraGroups = [ "wheel" "docker" "jackaudio" ];
 		hashedPassword = "$y$j9T$YPq.Kl8rss1JmJ5Vg6cHE/$2kdfzCkkhaO.I4u714EQnS/ZFert5byisiRVxtC.9G2";
 	};
 
+	programs.nix-ld.enable = true;
 	services.openssh = {
 		enable = true;
 		knownHosts =

nixos/hosts/ioides/configuration.nix

@@ -1,5 +1,4 @@
-{ inputs, config, lib, pkgs, ... }:
-{
+{ inputs, config, lib, pkgs, ... }: {
 	imports = [
 		inputs.nix-flatpak.nixosModules.nix-flatpak
 		./hardware-configuration.nix
@@ -41,7 +40,6 @@
 	};
 
 	networking = {
-		hostName = "ioides";
 		hosts = {
 			"10.0.0.2" = [ "near" "near.local" ];
 		};
@@ -101,7 +99,6 @@
 			enable = true;
 			enableSSHSupport = true;
 		};
-		nix-ld.enable = true;
 		steam = {
 			enable = true;
 			remotePlay.openFirewall = true;
@@ -119,6 +116,7 @@
 		xserver = {
 			enable = true;
 			xkb.layout = "us";
+			#?TODO maybe put all nvidia settings into its own module (i.e. r5e.hardware.nvidia.enable) + x11 with xdg config
 			videoDrivers = [ "nvidia" ];
 			windowManager = {
 				cwm.enable = true;

nixos/hosts/near/configuration.nix

@@ -59,7 +59,6 @@
 				iptables -t nat -A POSTROUTING -o end0 -j MASQUERADE
 			'';
 		};
-		hostName = "near";
 		interfaces = {
 			# br0 = {
 			# 	ipv4.addresses = [