diff --git a/TODO b/TODO
index 0e82c39..0b78a5f 100644
--- a/TODO
+++ b/TODO
@@ -44,6 +44,7 @@
 [ ] FUN IDEA 2::: Hey Whats Up what if you did the same thing but built your regular host (ioides) as an ISO so that like. hoooly shit. you could like share it to the woRLD VIA AN ISO AND SHTUFF. Fucking massive bro
 [x] IMPORTANT!!!!: consolidate most system configurations since there seems to be the assumption that Everything Is Ioides (i.e. move packages.nix to ioides/)
  +- [ ] Make things consolidated wherever possible, only generalize them/widen their scope once it becomes necessary (like when you turned part of base.nix into desktop.nix) (e.g. when you need to manage something identically across hosts, put it in an import file, otherwise put it in an attrset that both hosts import and configure it from there)
+ +- [ ] Just do thaatttt . Make som fucken modules
 
 [x] Get PulseAudio sound controls on polybar to work
 [x] Add desktop switching to windows (context menu?)
diff --git a/nixos/flake.nix b/nixos/flake.nix
index 5e1d2a4..5450ff1 100644
--- a/nixos/flake.nix
+++ b/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 ];
                     };
                 };
diff --git a/nixos/hosts/base.nix b/nixos/hosts/base.nix
index 125adb0..980e103 100644
--- a/nixos/hosts/base.nix
+++ b/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 =
diff --git a/nixos/hosts/ioides/configuration.nix b/nixos/hosts/ioides/configuration.nix
index d1361a4..4f8ee50 100644
--- a/nixos/hosts/ioides/configuration.nix
+++ b/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;
diff --git a/nixos/hosts/near/configuration.nix b/nixos/hosts/near/configuration.nix
index f31e201..7bd954b 100644
--- a/nixos/hosts/near/configuration.nix
+++ b/nixos/hosts/near/configuration.nix
@@ -59,7 +59,6 @@
 				iptables -t nat -A POSTROUTING -o end0 -j MASQUERADE
 			'';
 		};
-		hostName = "near";
 		interfaces = {
 			# br0 = {
 			# 	ipv4.addresses = [