diff --git a/home/accounting.nix b/home-manager/accounting.nix
similarity index 100%
rename from home/accounting.nix
rename to home-manager/accounting.nix
diff --git a/home/battery.nix b/home-manager/battery.nix
similarity index 100%
rename from home/battery.nix
rename to home-manager/battery.nix
diff --git a/home/chat.nix b/home-manager/chat.nix
similarity index 100%
rename from home/chat.nix
rename to home-manager/chat.nix
diff --git a/home/default.nix b/home-manager/default.nix
similarity index 100%
rename from home/default.nix
rename to home-manager/default.nix
diff --git a/home/desktop/default.nix b/home-manager/desktop/default.nix
similarity index 100%
rename from home/desktop/default.nix
rename to home-manager/desktop/default.nix
diff --git a/home/desktop/firefox.nix b/home-manager/desktop/firefox.nix
similarity index 100%
rename from home/desktop/firefox.nix
rename to home-manager/desktop/firefox.nix
diff --git a/home/desktop/gnome.nix b/home-manager/desktop/gnome.nix
similarity index 100%
rename from home/desktop/gnome.nix
rename to home-manager/desktop/gnome.nix
diff --git a/home/desktop/kitty.nix b/home-manager/desktop/kitty.nix
similarity index 100%
rename from home/desktop/kitty.nix
rename to home-manager/desktop/kitty.nix
diff --git a/home/desktop/sleep-nag.nix b/home-manager/desktop/sleep-nag.nix
similarity index 100%
rename from home/desktop/sleep-nag.nix
rename to home-manager/desktop/sleep-nag.nix
diff --git a/home/desktop/status.toml b/home-manager/desktop/status.toml
similarity index 100%
rename from home/desktop/status.toml
rename to home-manager/desktop/status.toml
diff --git a/home/desktop/wallpaper.nix b/home-manager/desktop/wallpaper.nix
similarity index 100%
rename from home/desktop/wallpaper.nix
rename to home-manager/desktop/wallpaper.nix
diff --git a/home/games.nix b/home-manager/games.nix
similarity index 100%
rename from home/games.nix
rename to home-manager/games.nix
diff --git a/home/git-sign.nix b/home-manager/git-sign.nix
similarity index 100%
rename from home/git-sign.nix
rename to home-manager/git-sign.nix
diff --git a/home/headless-mpd.nix b/home-manager/headless-mpd.nix
similarity index 100%
rename from home/headless-mpd.nix
rename to home-manager/headless-mpd.nix
diff --git a/home/headless.nix b/home-manager/headless.nix
similarity index 100%
rename from home/headless.nix
rename to home-manager/headless.nix
diff --git a/home/home-options.nix b/home-manager/home-options.nix
similarity index 100%
rename from home/home-options.nix
rename to home-manager/home-options.nix
diff --git a/home/kassandra-server.nix b/home-manager/kassandra-server.nix
similarity index 100%
rename from home/kassandra-server.nix
rename to home-manager/kassandra-server.nix
diff --git a/home/laptop.nix b/home-manager/laptop.nix
similarity index 72%
rename from home/laptop.nix
rename to home-manager/laptop.nix
index 6f4aab2e..69b0ea55 100644
--- a/home/laptop.nix
+++ b/home-manager/laptop.nix
@@ -1,19 +1,9 @@
 { pkgs, lib, ... }:
 let
-  modes = pkgs.lib.attrNames (import ./modes.nix).apollo;
-  autostart-script = pkgs.writeShellScriptBin "home-manager-autostart" ''
-    ${pkgs.xorg.xrdb}/bin/xrdb ${builtins.toFile "Xresources" "Xft.dpi: 96"}
-  '';
+  modes = pkgs.lib.attrNames (import ./machines.nix).apollo;
   configPath = "/home/maralorn/git/config";
 in {
 
-  xdg.configFile."autostart/home-manager-autostart.desktop".source = "${
-      pkgs.makeDesktopItem {
-        name = "home-manager-autostart";
-        desktopName = "Home Manager Autostart Job";
-        exec = "${autostart-script}/bin/home-manager-autostart";
-      }
-    }/share/applications/home-manager-autostart.desktop";
   home.packages = builtins.attrValues rec {
     maintenance = pkgs.writeShellScriptBin "maintenance" ''
       set -e
@@ -40,7 +30,7 @@ in {
       main = do
         say "Building ~/.modes for apollo"
         nixPath <- myNixPath "${configPath}"
-        nix_build nixPath "${configPath}/home/target.nix" "-A" "apollo" "-o" "/home/maralorn/.modes"
+        nix_build nixPath "${configPath}/home-manager/target.nix" "-A" "apollo" "-o" "/home/maralorn/.modes"
         activate_mode
     '';
     selectMode = pkgs.writeShellScriptBin "select-mode" ''
diff --git a/home/modes.nix b/home-manager/machines.nix
similarity index 100%
rename from home/modes.nix
rename to home-manager/machines.nix
diff --git a/home/mail-client.nix b/home-manager/mail-client.nix
similarity index 100%
rename from home/mail-client.nix
rename to home-manager/mail-client.nix
diff --git a/home/mail.nix b/home-manager/mail.nix
similarity index 100%
rename from home/mail.nix
rename to home-manager/mail.nix
diff --git a/home/mpclient.nix b/home-manager/mpclient.nix
similarity index 100%
rename from home/mpclient.nix
rename to home-manager/mpclient.nix
diff --git a/home/mpd.nix b/home-manager/mpd.nix
similarity index 100%
rename from home/mpd.nix
rename to home-manager/mpd.nix
diff --git a/home/neovim/default.nix b/home-manager/neovim/default.nix
similarity index 100%
rename from home/neovim/default.nix
rename to home-manager/neovim/default.nix
diff --git a/home/neovim/vimrc b/home-manager/neovim/vimrc
similarity index 100%
rename from home/neovim/vimrc
rename to home-manager/neovim/vimrc
diff --git a/home/on-my-machine.nix b/home-manager/on-my-machine.nix
similarity index 100%
rename from home/on-my-machine.nix
rename to home-manager/on-my-machine.nix
diff --git a/home/orga.nix b/home-manager/orga.nix
similarity index 100%
rename from home/orga.nix
rename to home-manager/orga.nix
diff --git a/home/pythia.nix b/home-manager/pythia.nix
similarity index 100%
rename from home/pythia.nix
rename to home-manager/pythia.nix
diff --git a/home/research.nix b/home-manager/research.nix
similarity index 100%
rename from home/research.nix
rename to home-manager/research.nix
diff --git a/home/target.nix b/home-manager/target.nix
similarity index 94%
rename from home/target.nix
rename to home-manager/target.nix
index 6963bf44..be77d455 100644
--- a/home/target.nix
+++ b/home-manager/target.nix
@@ -1,7 +1,7 @@
 let
   sources = import ../nix/sources.nix;
   inherit (import sources.nixpkgs { }) lib pkgs;
-  modes = import ./modes.nix;
+  modes = import ./machines.nix;
   home-manager = import "${sources.home-manager}/home-manager/home-manager.nix";
   buildHomeManager = attr:
     (home-manager {
diff --git a/home/taskwarrior.nix b/home-manager/taskwarrior.nix
similarity index 100%
rename from home/taskwarrior.nix
rename to home-manager/taskwarrior.nix
diff --git a/home/tinkering.nix b/home-manager/tinkering.nix
similarity index 100%
rename from home/tinkering.nix
rename to home-manager/tinkering.nix
diff --git a/home/unlock.nix b/home-manager/unlock.nix
similarity index 100%
rename from home/unlock.nix
rename to home-manager/unlock.nix
diff --git a/home/update_tasks.nix b/home-manager/update_tasks.nix
similarity index 100%
rename from home/update_tasks.nix
rename to home-manager/update_tasks.nix
diff --git a/home/zsh/default.nix b/home-manager/zsh/default.nix
similarity index 100%
rename from home/zsh/default.nix
rename to home-manager/zsh/default.nix
diff --git a/home/zsh/p10k.zsh b/home-manager/zsh/p10k.zsh
similarity index 100%
rename from home/zsh/p10k.zsh
rename to home-manager/zsh/p10k.zsh
diff --git a/home/zsh/zshrc b/home-manager/zsh/zshrc
similarity index 100%
rename from home/zsh/zshrc
rename to home-manager/zsh/zshrc
diff --git a/home.nix b/home.nix
index 0f20a86a..72fcc319 100644
--- a/home.nix
+++ b/home.nix
@@ -1,6 +1,6 @@
 let
   inherit (import (import ./nix/sources.nix).nixpkgs { }) lib;
-  modes = import home/modes.nix;
+  modes = import home-manager/machines.nix;
 in lib.listToAttrs (lib.flatten (lib.mapAttrsToList (host: configs:
   lib.mapAttrsToList (mode: config: {
     name = "${host}-${mode}";
diff --git a/overlays/testing.nix b/overlays/testing.nix
index 5e4cd6c8..6ea36904 100644
--- a/overlays/testing.nix
+++ b/overlays/testing.nix
@@ -4,7 +4,7 @@ let
   repoSrc = "git@hera.m-0.eu:nixos-config";
   configPath = "/etc/nixos";
   systems = [ "apollo" "hera" ];
-  homes = self.lib.attrNames (import ../home/modes.nix);
+  homes = self.lib.attrNames (import ../home-manager/machines.nix);
   keys = [ "default" "apollo" "hera" ];
   imports = [ "Control.Exception (onException)" ];
   haskellBody = name: commandline: ''
@@ -32,7 +32,7 @@ in {
     name = "test-home-config";
     inherit bins;
     inherit imports;
-  } (haskellBody "home" ''nix_build $ paths ++ [[i|#{configDir}/home/target.nix|], "-A", hostname, "-o", [i|result-home-manager-#{hostname}|]] ++ fmap toString args'');
+  } (haskellBody "home" ''nix_build $ paths ++ [[i|#{configDir}/home-manager/target.nix|], "-A", hostname, "-o", [i|result-home-manager-#{hostname}|]] ++ fmap toString args'');
 
   test-config = self.writeHaskellScript {
     name = "test-config";