diff --git a/env/nix/machines/wallwart.nix b/env/nix/machines/wallwart.nix
new file mode 100644
index 0000000..4f867eb
--- /dev/null
+++ b/env/nix/machines/wallwart.nix
@@ -0,0 +1,23 @@
+{ config, pkgs, ... }: {
+	imports = [
+		../profiles/desktop.nix
+		../modules/systemd-boot-efi.nix
+		../modules/amd.nix
+		../modules/amd-gpu.nix
+		../modules/docker.nix
+		../modules/network-manager.nix
+		../modules/bluetooth.nix
+		../modules/pulseaudio.nix
+		../modules/de/sway.nix
+		../modules/users/daniel.nix
+		../modules/users/valerie.nix
+	];
+
+	networking = {
+		hostName = "wallwart.lyte.dev";
+		firewall.enable = false;
+	};
+
+	console.useXkbConfig = true;
+	services.xserver.xkbOptions = "ctrl:nocaps";
+}
diff --git a/env/nix/modules/amd-gpu.nix b/env/nix/modules/amd-gpu.nix
new file mode 100644
index 0000000..3da049e
--- /dev/null
+++ b/env/nix/modules/amd-gpu.nix
@@ -0,0 +1,3 @@
+{ config, pkgs, ... }: {
+	services.xserver.videoDrivers = [ "amdgpu" ];
+}
diff --git a/env/nix/modules/amd.nix b/env/nix/modules/amd.nix
new file mode 100644
index 0000000..8e8842b
--- /dev/null
+++ b/env/nix/modules/amd.nix
@@ -0,0 +1,5 @@
+{ config, pkgs, ... }: {
+	hardware = {
+		cpu.amd.updateMicrocode = true;
+	};
+}
diff --git a/env/nix/modules/intel.nix b/env/nix/modules/intel.nix
index 57b86a4..6cd9e21 100644
--- a/env/nix/modules/intel.nix
+++ b/env/nix/modules/intel.nix
@@ -1,4 +1,5 @@
 { config, pkgs, ... }: {
+	services.xserver.videoDrivers = [ "intel" ];
 	nixpkgs.config = {
 		allowUnfree = true;
 		packageOverrides = pkgs: {
diff --git a/env/nix/profiles/desktop.nix b/env/nix/profiles/desktop.nix
new file mode 100644
index 0000000..64d8d9d
--- /dev/null
+++ b/env/nix/profiles/desktop.nix
@@ -0,0 +1,3 @@
+{ config, pkgs, ... }: {
+	imports = [ ./base.nix ];
+}