diff --git a/hosts/tohru/home.nix b/hosts/tohru/home.nix
index 4727942..f3b9d0f 100644
--- a/hosts/tohru/home.nix
+++ b/hosts/tohru/home.nix
@@ -7,8 +7,6 @@
       ../../home/vscode.nix
     ];
 
-    home.homeDirectory = config.users.users.qenya.home;
-
     home.packages = with pkgs; [
       fortune
       htop
@@ -21,12 +19,6 @@
     programs.chromium.enable = true;
     programs.firefox.enable = true;
 
-    programs.git = {
-      enable = true;
-      userName = "Katherina Walshe-Grey";
-      userEmail = "git@katherina.rocks";
-    };
-
     home.stateVersion = "23.11";
   };
 }
diff --git a/users/qenya.nix b/users/qenya.nix
index 9310f7b..7d10ede 100644
--- a/users/qenya.nix
+++ b/users/qenya.nix
@@ -13,4 +13,16 @@
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJEmkV9arotms79lJPsLHkdzAac4eu3pYS08ym0sB/on qenya@tohru"
     ];
   };
-}
\ No newline at end of file
+
+  home-manager.users.qenya = { config, lib, pkgs, osConfig, ... }: {
+    home.homeDirectory = osConfig.users.users.qenya.home;
+
+    programs.git = {
+      enable = true;
+      userName = "Katherina Walshe-Grey";
+      userEmail = "git@katherina.rocks"; # TODO: update email
+    };
+
+    home.stateVersion = "23.11";
+  };
+}