diff --git a/home/core.nix b/home/core.nix
index 521000b..e5a0e8c 100644
--- a/home/core.nix
+++ b/home/core.nix
@@ -1,9 +1,21 @@
-{
-  imports = [
-    ../base/core
-    ../base/home.nix
+{username, ...}: {
+  # Home Manager needs a bit of information about you and the
+  # paths it should manage.
+  home = {
+    inherit username;
+    homeDirectory = "/home/${username}";
 
-    ./base
-  ];
+    # This value determines the Home Manager release that your
+    # configuration is compatible with. This helps avoid breakage
+    # when a new Home Manager release introduces backwards
+    # incompatible changes.
+    #
+    # You can update Home Manager without changing this value. See
+    # the Home Manager release notes for a list of state version
+    # changes in each release.
+    stateVersion = "25.05";
+  };
+
+  # Let Home Manager install and manage itself.
+  programs.home-manager.enable = true;
 }
-
diff --git a/users/phil/home.nix b/users/phil/home.nix
index b9dc091..ed38d3a 100644
--- a/users/phil/home.nix
+++ b/users/phil/home.nix
@@ -8,11 +8,8 @@
   imports = [
     ../../home/core.nix
 
-    ../../home/fcitx5
-    ../../home/i3
     ../../home/programs
     ../../home/rofi
-    ../../home/shell
   ];
 
   programs.git = {
diff --git a/users/phil/nixos.nix b/users/phil/nixos.nix
index 8f22b24..5a09e44 100644
--- a/users/phil/nixos.nix
+++ b/users/phil/nixos.nix
@@ -5,7 +5,7 @@
   #
   ##################################################################################################################
 
-  users.users.ryan = {
+  users.users.phil = {
     # Ryan's authorizedKeys
     openssh.authorizedKeys.keys = [
         "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCaLHfxVylghDMYR8t4QMUpeRRqXasNABQKBEy9MmhbUXCcWiPbPMSZH8FMHON34rm2OrXP1kY/8jQxqBJDA+SqpFR2AZ4Khk9iVMaq5GHxxpn2amZUjoBa+fB29WaiE1npV5JVJV3O0ylw6GtiCnpneE6fGx2MO1vOY/7zKrUX/OK7WfwkDpeEzZgV/j/md917HrzUVeZwdeTq3WCRO8Gew6R8Xs6FRjSiGuH0dq14D4Ow5Zf1cI1jx+JfD/5vGasw8HXPu1NdxsOE+6D7/22IKqGr+S74/lAoyyD5qqk0s05lw8UY/PXBLJaNLZu9Fwx0BqTHpJEvftpmvd9wUxgR3msx9VXtKNSrqivIbDgeU+3oGzzkrGZODl7FCp4XKGmbrX85Z6lKwEGgv5jez4MLZcmT86bxB7m1wIbqSbVtfhS+GI7yPTA/kLzzFa14Im/+LTj95pb8qs2ALMwTMP1j2f9A6D3RriOFihL+68qn+YbK58KuV1R0f+CQRmlfVbk= phil@web.cyperpunk.de"