diff --git a/hosts/tohru/configuration.nix b/hosts/tohru/configuration.nix
index 4878136..b39db2f 100644
--- a/hosts/tohru/configuration.nix
+++ b/hosts/tohru/configuration.nix
@@ -4,6 +4,7 @@
   imports =
     [
       ./hardware-configuration.nix
+      ../../users/qenya.nix
       ./home.nix
     ];
 
diff --git a/hosts/tohru/home.nix b/hosts/tohru/home.nix
index 77f400b..44eb80b 100644
--- a/hosts/tohru/home.nix
+++ b/hosts/tohru/home.nix
@@ -1,22 +1,6 @@
 { config, lib, pkgs, ... }:
 
 {
-  users.users.qenya = {
-    isNormalUser = true;
-    home = "/home/qenya";
-    extraGroups = [
-      "wheel" # sudo
-      "networkmanager" # UI wifi configuration
-      "dialout" # access to serial ports
-    ];
-    packages = with pkgs; [
-      # TODO: move these to home-manager
-      bitwarden
-      firefox
-      tor-browser-bundle-bin
-    ];
-  };
-
   home-manager.users.qenya = { pkgs, ... }: {
     home.homeDirectory = config.users.users.qenya.home;
 
@@ -25,6 +9,9 @@
       htop
       tree
 
+      bitwarden
+      tor-browser-bundle-bin
+
       nil
       nixpkgs-fmt
     ];
@@ -52,6 +39,7 @@
     home.file.".background-image".source = ./background-image.jpg;
 
     programs.chromium.enable = true;
+    programs.firefox.enable = true;
 
     programs.git = {
       enable = true;
diff --git a/hosts/yevaud/configuration.nix b/hosts/yevaud/configuration.nix
index 310b37e..06a3d29 100644
--- a/hosts/yevaud/configuration.nix
+++ b/hosts/yevaud/configuration.nix
@@ -4,6 +4,7 @@
   imports =
     [
       ./hardware-configuration.nix
+      ../../users/qenya.nix
     ];
 
   boot.loader.systemd-boot.enable = true;
@@ -14,14 +15,6 @@
 
   time.timeZone = "Etc/UTC";
 
-  users.users.qenya = {
-    isNormalUser = true;
-    extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
-    openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJEmkV9arotms79lJPsLHkdzAac4eu3pYS08ym0sB/on qenya@tohru"
-    ];
-  };
-
   services.openssh = {
     enable = true;
     settings = {
diff --git a/users/qenya.nix b/users/qenya.nix
new file mode 100644
index 0000000..9310f7b
--- /dev/null
+++ b/users/qenya.nix
@@ -0,0 +1,16 @@
+{ config, lib, pkgs, ... }:
+
+{
+  users.users.qenya = {
+    isNormalUser = true;
+    home = "/home/qenya";
+    extraGroups = [
+      "wheel" # sudo
+      "networkmanager" # UI wifi configuration
+      "dialout" # access to serial ports
+    ];
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJEmkV9arotms79lJPsLHkdzAac4eu3pYS08ym0sB/on qenya@tohru"
+    ];
+  };
+}
\ No newline at end of file