diff --git a/nixcfgs/flake.nix b/nixcfgs/flake.nix
index 8be3e55..e8f12a1 100644
--- a/nixcfgs/flake.nix
+++ b/nixcfgs/flake.nix
@@ -105,6 +105,13 @@
             ./users/js0ny/nixvirt.nix
           ];
         };
+        "js0ny@zen" = home-manager.lib.homeManagerConfiguration {
+          pkgs = forSystem "aarch64-darwin";
+          extraSpecialArgs = specialArgs;
+          modules = [
+            ./users/js0ny/zen.nix
+          ];
+        };
       };
     };
 }
diff --git a/nixcfgs/modules/darwin/js0ny/brew.nix b/nixcfgs/hosts/zen/brew.nix
similarity index 100%
rename from nixcfgs/modules/darwin/js0ny/brew.nix
rename to nixcfgs/hosts/zen/brew.nix
diff --git a/nixcfgs/hosts/zen/default.nix b/nixcfgs/hosts/zen/default.nix
index 506b2e8..b623c9c 100644
--- a/nixcfgs/hosts/zen/default.nix
+++ b/nixcfgs/hosts/zen/default.nix
@@ -1,10 +1,10 @@
 {pkgs, ...}:
 {
-    imports = [
-        ./packages.nix
-        ../../modules/darwin/js0ny/brew.nix
-        ../../modules/darwin/js0ny/dock.nix
-        ../../modules/darwin/js0ny/system.nix
-    ];
-    time.timeZone = "Europe/London";
+  imports = [
+      ./packages.nix
+      ./brew.nix
+      ./dock.nix
+      ./system.nix
+  ];
+  time.timeZone = "Europe/London";
 }
diff --git a/nixcfgs/modules/darwin/js0ny/dock.nix b/nixcfgs/hosts/zen/dock.nix
similarity index 100%
rename from nixcfgs/modules/darwin/js0ny/dock.nix
rename to nixcfgs/hosts/zen/dock.nix
diff --git a/nixcfgs/modules/darwin/js0ny/system.nix b/nixcfgs/hosts/zen/system.nix
similarity index 100%
rename from nixcfgs/modules/darwin/js0ny/system.nix
rename to nixcfgs/hosts/zen/system.nix
diff --git a/nixcfgs/modules/darwin/default.nix b/nixcfgs/modules/darwin/default.nix
deleted file mode 100644
index a8c2b51..0000000
--- a/nixcfgs/modules/darwin/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  time.timeZone = "Europe/London";
-}
diff --git a/nixcfgs/users/js0ny/default.nix b/nixcfgs/users/js0ny/default.nix
index 8ff6193..6085b9d 100644
--- a/nixcfgs/users/js0ny/default.nix
+++ b/nixcfgs/users/js0ny/default.nix
@@ -1,19 +1,18 @@
 # ~/.config/nixcfgs/users/js0ny/default.nix
-{
-  pkgs,
-  nix-flatpak,
-  plasma-manager,
-  ...
-}:
-{
+{pkgs, ...}: let
+  username = "js0ny";
+in {
   imports = [
     ../../modules/home/programs/fzf.nix
     ../../modules/home/programs/lsd.nix
     ../../modules/home/programs/zoxide.nix
   ];
   nixpkgs.config.allowUnfree = true;
-  home.username = "js0ny";
-  home.homeDirectory = "/home/js0ny";
+  home.username = username;
+  home.homeDirectory =
+    if pkgs.stdenv.isDarwin
+    then "/Users/${username}"
+    else "/home/${username}";
 
   home.packages = with pkgs; [
     home-manager
diff --git a/nixcfgs/users/js0ny/nixvirt.nix b/nixcfgs/users/js0ny/nixvirt.nix
index d1cf93c..cd4f7bb 100644
--- a/nixcfgs/users/js0ny/nixvirt.nix
+++ b/nixcfgs/users/js0ny/nixvirt.nix
@@ -1,10 +1,5 @@
 # ~/.config/nixcfgs/users/js0ny/default.nix
-{
-  pkgs,
-  nix-flatpak,
-  plasma-manager,
-  ...
-}: {
+{...}: {
   imports = [
     ./default.nix
     ./programs/gnome.nix
diff --git a/nixcfgs/users/js0ny/packages/flatpak.nix b/nixcfgs/users/js0ny/packages/flatpak.nix
index ca857b1..4b682b8 100644
--- a/nixcfgs/users/js0ny/packages/flatpak.nix
+++ b/nixcfgs/users/js0ny/packages/flatpak.nix
@@ -1,5 +1,5 @@
 # https://github.com/gmodena/nix-flatpak
-{home, ...}: {
+{...}: {
   services.flatpak.enable = true;
   services.flatpak.remotes = [
     {
diff --git a/nixcfgs/users/js0ny/packages/fonts.nix b/nixcfgs/users/js0ny/packages/fonts.nix
index b2f2bc1..59375ed 100644
--- a/nixcfgs/users/js0ny/packages/fonts.nix
+++ b/nixcfgs/users/js0ny/packages/fonts.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{...}: {
   fonts.fontconfig.enable = true;
   fonts.fontconfig = {
     defaultFonts = {
diff --git a/nixcfgs/users/js0ny/programs/shell.nix b/nixcfgs/users/js0ny/programs/shell.nix
index ad5a33f..490116a 100644
--- a/nixcfgs/users/js0ny/programs/shell.nix
+++ b/nixcfgs/users/js0ny/programs/shell.nix
@@ -1,4 +1,4 @@
-{...}: let
+{config, ...}: let
   commonAliases = {
     v = "nvim";
     g = "lazygit";
@@ -22,7 +22,7 @@ in {
     autocd = true;
     autosuggestion.enable = true;
     syntaxHighlighting.enable = true;
-    dotDir = "/home/js0ny/.config/zsh";
+    dotDir = "${config.xdg.configHome}/zsh";
     shellAliases = commonAliases;
   };
   programs.bash = {
diff --git a/nixcfgs/users/js0ny/zen.nix b/nixcfgs/users/js0ny/zen.nix
new file mode 100644
index 0000000..68db3b5
--- /dev/null
+++ b/nixcfgs/users/js0ny/zen.nix
@@ -0,0 +1,18 @@
+{...}:
+{
+  imports = [
+    ./default.nix
+    ./programs/shell.nix
+    ../../modules/home/dev/nix.nix
+    ../../modules/home/programs/eza.nix
+    ../../modules/home/programs/fzf.nix
+    ../../modules/home/programs/lsd.nix
+    ../../modules/home/programs/nvim.nix
+    ../../modules/home/programs/starship.nix
+    ../../modules/home/programs/zoxide.nix
+  ];
+
+  home.stateVersion = "25.05";
+}
+
+