diff --git a/modules/hosts/z2w/core.nix b/modules/hosts/z2w/core.nix
new file mode 100644
index 0000000..f96691a
--- /dev/null
+++ b/modules/hosts/z2w/core.nix
@@ -0,0 +1,63 @@
+{ self, inputs, ... }: {
+
+    flake.nixosModules.z2w-core = { config, pkgs, ... }: {
+
+        imports = with self.nixosModules; [
+
+            inputs.home-manager.nixosModules.default
+
+            self.nixosModules.default
+            user-nathan
+            avahi
+            openssh
+        ];
+
+        config = {
+
+            boot = {
+                loader = {
+                    grub.enable = false;
+                    generic-extlinux-compatible.enable = true;
+                };
+            };
+
+            networking = {
+                nameservers = [ "1.1.1.1" "1.0.0.1" ];
+                networkmanager.enable = true;
+            };
+
+            hardware = {
+                bluetooth.enable = true;
+
+            };
+
+            programs.zsh.enable = true;
+
+            environment.shells = with pkgs; [ zsh ];
+/*
+            users = { 
+                groups.gpio = {};
+            };
+
+            services = {
+                udev.extraRules = ''
+                    SUBSYSTEM=="bcm2835-gpiomem", KERNEL=="gpiomem", GROUP="gpio",MODE="0660"
+                    SUBSYSTEM=="gpio", KERNEL=="gpiochip*", ACTION=="add", RUN+="${pkgs.bash}/bin/bash -c 'chown root:gpio /sys/class/gpio/export /sys/class/gpio/unexport ; chmod 220 /sys/class/gpio/export /sys/class/gpio/unexport'"
+                    SUBSYSTEM=="gpio", KERNEL=="gpio*", ACTION=="add",RUN+="${pkgs.bash}/bin/bash -c 'chown root:gpio /sys%p/active_low /sys%p/direction /sys%p/edge /sys%p/value ; chmod 660 /sys%p/active_low /sys%p/direction /sys%p/edge /sys%p/value'"
+                '';
+
+                pulseaudio = {
+                    enable = true;
+                    extraConfig = ''
+                        load-module module-native-protocol-tcp auth-ip-acl=127.0.0.1
+                    '';
+                };
+
+            };
+*/
+            fonts.packages = with pkgs; [ nerd-fonts.fira-code ];
+
+            system.stateVersion = "25.11";
+        };
+    };
+}
diff --git a/modules/users/nathan/home-manager/features/packages.nix b/modules/users/nathan/home-manager/features/packages.nix
index 423aa96..0e3064d 100644
--- a/modules/users/nathan/home-manager/features/packages.nix
+++ b/modules/users/nathan/home-manager/features/packages.nix
@@ -22,17 +22,6 @@
                 unzip
                 rsync
                 curl
-
-                (python314.withPackages (ps: with ps; [
-                    gpustat
-                    numpy
-                    matplotlib
-                    scipy
-                    pandas
-                    pyaudio
-                    pyusb
-                    requests
-                ]))
                 
                 cava 
                 android-tools
@@ -56,6 +45,17 @@
 
          home.packages = with pkgs; [
 
+         (python314.withPackages (ps: with ps; [
+            gpustat
+            numpy
+            matplotlib
+            scipy
+            pandas
+            pyaudio
+            pyusb
+            requests
+         ]))
+
          grim
          slurp
          wl-clipboard