diff --git a/flake.nix b/flake.nix
index c40b465..3c99a7a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -59,17 +59,17 @@
       # Available through 'home-manager --flake .#your-username@your-hostname'
       homeConfigurations = {
         "john@penguin-fw" = lib.homeManagerConfiguration {
-          modules = [ ./nix/home/john/penguin-fw.nix ];
+          modules = [ ./nix/home/penguin-fw.nix ];
           pkgs = pkgsFor.x86_64-linux;
           extraSpecialArgs = { inherit inputs outputs; };
         };
         "john@penguin-duet" = lib.homeManagerConfiguration {
-          modules = [ ./nix/home/john/penguin-duet.nix ];
+          modules = [ ./nix/home/penguin-duet.nix ];
           pkgs = pkgsFor.aarch64-linux;
           extraSpecialArgs = { inherit inputs outputs; };
         };
         "john@pixnix" = lib.homeManagerConfiguration {
-          modules = [ ./nix/home/john/pixnix.nix ];
+          modules = [ ./nix/home/pixnix.nix ];
           pkgs = pkgsFor.x86_64-linux;
           extraSpecialArgs = { inherit inputs outputs; };
         };
diff --git a/nix/home/john/features/cli/default.nix b/nix/home/features/cli/default.nix
similarity index 100%
rename from nix/home/john/features/cli/default.nix
rename to nix/home/features/cli/default.nix
diff --git a/nix/home/john/features/cli/direnv.nix b/nix/home/features/cli/direnv.nix
similarity index 100%
rename from nix/home/john/features/cli/direnv.nix
rename to nix/home/features/cli/direnv.nix
diff --git a/nix/home/john/features/cli/fish.nix b/nix/home/features/cli/fish.nix
similarity index 100%
rename from nix/home/john/features/cli/fish.nix
rename to nix/home/features/cli/fish.nix
diff --git a/nix/home/john/features/cli/git.nix b/nix/home/features/cli/git.nix
similarity index 100%
rename from nix/home/john/features/cli/git.nix
rename to nix/home/features/cli/git.nix
diff --git a/nix/home/john/features/cli/go.nix b/nix/home/features/cli/go.nix
similarity index 100%
rename from nix/home/john/features/cli/go.nix
rename to nix/home/features/cli/go.nix
diff --git a/nix/home/john/features/cli/tmux.nix b/nix/home/features/cli/tmux.nix
similarity index 100%
rename from nix/home/john/features/cli/tmux.nix
rename to nix/home/features/cli/tmux.nix
diff --git a/nix/home/john/features/cli/vim.nix b/nix/home/features/cli/vim.nix
similarity index 100%
rename from nix/home/john/features/cli/vim.nix
rename to nix/home/features/cli/vim.nix
diff --git a/nix/home/john/features/desktop/default.nix b/nix/home/features/desktop/default.nix
similarity index 100%
rename from nix/home/john/features/desktop/default.nix
rename to nix/home/features/desktop/default.nix
diff --git a/nix/home/john/features/desktop/firefox.nix b/nix/home/features/desktop/firefox.nix
similarity index 100%
rename from nix/home/john/features/desktop/firefox.nix
rename to nix/home/features/desktop/firefox.nix
diff --git a/nix/home/john/features/desktop/vscode.nix b/nix/home/features/desktop/vscode.nix
similarity index 100%
rename from nix/home/john/features/desktop/vscode.nix
rename to nix/home/features/desktop/vscode.nix
diff --git a/nix/home/john/global/default.nix b/nix/home/global/default.nix
similarity index 100%
rename from nix/home/john/global/default.nix
rename to nix/home/global/default.nix
diff --git a/nix/home/john/lib/chromeos.nix b/nix/home/lib/chromeos.nix
similarity index 100%
rename from nix/home/john/lib/chromeos.nix
rename to nix/home/lib/chromeos.nix
diff --git a/nix/home/john/penguin-duet.nix b/nix/home/penguin-duet.nix
similarity index 100%
rename from nix/home/john/penguin-duet.nix
rename to nix/home/penguin-duet.nix
diff --git a/nix/home/john/penguin-fw.nix b/nix/home/penguin-fw.nix
similarity index 100%
rename from nix/home/john/penguin-fw.nix
rename to nix/home/penguin-fw.nix
diff --git a/nix/home/john/pixnix.nix b/nix/home/pixnix.nix
similarity index 100%
rename from nix/home/john/pixnix.nix
rename to nix/home/pixnix.nix