diff --git a/hosts/tohru/configuration.nix b/hosts/tohru/configuration.nix
index 1d1977e..bc9f644 100644
--- a/hosts/tohru/configuration.nix
+++ b/hosts/tohru/configuration.nix
@@ -1,14 +1,10 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports =
-    [
-      ./hardware-configuration.nix
-      ./home.nix
-      ../../services/fonts.nix
-      ../../services/steam.nix
-      ./syncthing.nix
-    ];
+  imports = [
+    ./hardware-configuration.nix
+    ./syncthing.nix
+  ];
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -26,6 +22,12 @@
   qenya.services.fonts.enable = true;
   qenya.services.steam.enable = true;
 
+  home-manager.users.qenya = { pkgs, ... }: {
+    imports = [
+      ./home.nix
+    ];
+  };
+
   networking.networkmanager.enable = true;
 
   i18n.defaultLocale = "en_GB.UTF-8";
diff --git a/hosts/tohru/home.nix b/hosts/tohru/home.nix
index a9b0532..20526df 100644
--- a/hosts/tohru/home.nix
+++ b/hosts/tohru/home.nix
@@ -1,33 +1,31 @@
 { config, lib, pkgs, ... }:
 
 {
-  home-manager.users.qenya = { pkgs, ... }: {
-    dconf.enable = true;
+  dconf.enable = true;
 
-    programs = {
-      firefox.enable = true; # TODO: config is not yet nix-ified
-      vscode.enable = true;
-    };
-
-    home.packages = (with pkgs; [
-      bitwarden
-      discord
-      foliate
-      gimp-with-plugins
-      jellyfin-media-player
-      keepassxc
-      tor-browser-bundle-bin
-
-      # libreoffice
-      libreoffice
-      hunspell
-      hunspellDicts.en_GB-ise
-
-      # games
-      openttd
-      prismlauncher
-      nur.repos.qenya.digital-a-love-story
-      nur.repos.qenya.dont-take-it-personally-babe
-    ]);
+  programs = {
+    firefox.enable = true; # TODO: config is not yet nix-ified
+    vscode.enable = true;
   };
+
+  home.packages = with pkgs; [
+    bitwarden
+    discord
+    foliate
+    gimp-with-plugins
+    jellyfin-media-player
+    keepassxc
+    tor-browser-bundle-bin
+
+    # libreoffice
+    libreoffice
+    hunspell
+    hunspellDicts.en_GB-ise
+
+    # games
+    openttd
+    prismlauncher
+    nur.repos.qenya.digital-a-love-story
+    nur.repos.qenya.dont-take-it-personally-babe
+  ];
 }