diff --git a/home/H0615-elitherl.nix b/home/H0615-elitherl.nix
new file mode 100644
index 00000000..1482b1b0
--- /dev/null
+++ b/home/H0615-elitherl.nix
@@ -0,0 +1,15 @@
+{ ... }: {
+  imports = [
+    ./common-work.nix
+    ./env/gtk.nix
+    ./packages/env
+    ./packages/tui
+    ./packages/gui/browser.nix
+    ./packages/gui/cloud.nix
+    ./packages/gui/kitty.nix
+    ./packages/gui/messaging.nix
+    ./packages/gui/nomachine.nix
+    ./packages/gui/ukaea.nix
+  ];
+  home.stateVersion = "22.11";
+}
diff --git a/home/J0162-elitherl.nix b/home/J0162-elitherl.nix
new file mode 100644
index 00000000..1482b1b0
--- /dev/null
+++ b/home/J0162-elitherl.nix
@@ -0,0 +1,15 @@
+{ ... }: {
+  imports = [
+    ./common-work.nix
+    ./env/gtk.nix
+    ./packages/env
+    ./packages/tui
+    ./packages/gui/browser.nix
+    ./packages/gui/cloud.nix
+    ./packages/gui/kitty.nix
+    ./packages/gui/messaging.nix
+    ./packages/gui/nomachine.nix
+    ./packages/gui/ukaea.nix
+  ];
+  home.stateVersion = "22.11";
+}
diff --git a/home/Legion-xenia.nix b/home/Legion-xenia.nix
new file mode 100644
index 00000000..ea5d91b7
--- /dev/null
+++ b/home/Legion-xenia.nix
@@ -0,0 +1,8 @@
+{ ... }: {
+  imports = [
+    ./common-personal.nix
+    ./packages/env/bash.nix
+    ./packages/tui
+  ];
+  home.stateVersion = "22.11";
+}
diff --git a/home/Northstar-xenia.nix b/home/Northstar-xenia.nix
new file mode 100644
index 00000000..0352d773
--- /dev/null
+++ b/home/Northstar-xenia.nix
@@ -0,0 +1,11 @@
+{ ... }: {
+  imports = [
+    ./common-personal.nix
+    ./env/gtk.nix
+    ./packages/env
+    ./packages/tui
+    ./packages/gui/browser
+    ./packages/gui/kitty.nix
+  ];
+  home.stateVersion = "22.11";
+}
diff --git a/nixos/home-manager/vanguard-xenia.nix b/home/Vanguard-xenia.nix
similarity index 55%
rename from nixos/home-manager/vanguard-xenia.nix
rename to home/Vanguard-xenia.nix
index d4dd9794..fb7ecb5e 100644
--- a/nixos/home-manager/vanguard-xenia.nix
+++ b/home/Vanguard-xenia.nix
@@ -1,7 +1,7 @@
 { ... }: {
   imports = [
+    ./common-personal.nix
     ./env/gtk.nix
-    ./env/xresources.nix
     ./packages/env
     ./packages/tui
     ./packages/gui/browser.nix
@@ -11,14 +11,5 @@
     ./packages/gui/messaging.nix
     ./packages/gui/nomachine.nix
   ];
-  # Home Manager needs a bit of information about you and the
-  # paths it should manage.
-  home.username = "xenia";
-  home.homeDirectory = "/home/xenia";
-
-  programs.git = {
-    userEmail = "evie@xenia.me.uk";
-  };
-
   home.stateVersion = "22.11";
 }
diff --git a/nixos/home-manager/legion-xenia.nix b/home/common-personal.nix
similarity index 66%
rename from nixos/home-manager/legion-xenia.nix
rename to home/common-personal.nix
index 5e156102..cd3a9f04 100644
--- a/nixos/home-manager/legion-xenia.nix
+++ b/home/common-personal.nix
@@ -1,8 +1,5 @@
-{ ... }: {
-  imports = [
-    ./packages/env/bash.nix
-    ./packages/tui
-  ];
+{ ... }:
+{
   # Home Manager needs a bit of information about you and the
   # paths it should manage.
   home.username = "xenia";
@@ -11,6 +8,4 @@
   programs.git = {
     userEmail = "evie@xenia.me.uk";
   };
-
-  home.stateVersion = "22.11";
 }
diff --git a/home/common-work.nix b/home/common-work.nix
new file mode 100644
index 00000000..4f66daf1
--- /dev/null
+++ b/home/common-work.nix
@@ -0,0 +1,11 @@
+{ ... }:
+{
+  # Home Manager needs a bit of information about you and the
+  # paths it should manage.
+  home.username = "elitherl";
+  home.homeDirectory = "/home/elitherl";
+
+  programs.git = {
+    userEmail = "evie.litherland-smith@ukaea.uk";
+  };
+}
diff --git a/nixos/home-manager/common.nix b/home/common.nix
similarity index 56%
rename from nixos/home-manager/common.nix
rename to home/common.nix
index 98f1450c..de030038 100644
--- a/nixos/home-manager/common.nix
+++ b/home/common.nix
@@ -2,5 +2,5 @@
 
 {
   nixpkgs.config.allowUnfree = true;
-  #programs.home-manager.enable = true;
+  programs.home-manager.enable = true;
 }
diff --git a/nixos/home-manager/env/bspwm.nix b/home/env/bspwm.nix
similarity index 100%
rename from nixos/home-manager/env/bspwm.nix
rename to home/env/bspwm.nix
diff --git a/nixos/home-manager/env/common-touchinput.nix b/home/env/common-touchinput.nix
similarity index 100%
rename from nixos/home-manager/env/common-touchinput.nix
rename to home/env/common-touchinput.nix
diff --git a/nixos/home-manager/env/common-wayland.nix b/home/env/common-wayland.nix
similarity index 100%
rename from nixos/home-manager/env/common-wayland.nix
rename to home/env/common-wayland.nix
diff --git a/nixos/home-manager/env/config/bspwm/startup.sh b/home/env/config/bspwm/startup.sh
similarity index 100%
rename from nixos/home-manager/env/config/bspwm/startup.sh
rename to home/env/config/bspwm/startup.sh
diff --git a/nixos/home-manager/env/config/eww/bar/eww.scss b/home/env/config/eww/bar/eww.scss
similarity index 100%
rename from nixos/home-manager/env/config/eww/bar/eww.scss
rename to home/env/config/eww/bar/eww.scss
diff --git a/nixos/home-manager/env/config/eww/bar/eww.yuck b/home/env/config/eww/bar/eww.yuck
similarity index 100%
rename from nixos/home-manager/env/config/eww/bar/eww.yuck
rename to home/env/config/eww/bar/eww.yuck
diff --git a/nixos/home-manager/env/config/eww/bar/scripts/change-active-workspace b/home/env/config/eww/bar/scripts/change-active-workspace
similarity index 100%
rename from nixos/home-manager/env/config/eww/bar/scripts/change-active-workspace
rename to home/env/config/eww/bar/scripts/change-active-workspace
diff --git a/nixos/home-manager/env/config/eww/bar/scripts/get-active-workspace b/home/env/config/eww/bar/scripts/get-active-workspace
similarity index 100%
rename from nixos/home-manager/env/config/eww/bar/scripts/get-active-workspace
rename to home/env/config/eww/bar/scripts/get-active-workspace
diff --git a/nixos/home-manager/env/config/eww/bar/scripts/get-workspaces b/home/env/config/eww/bar/scripts/get-workspaces
similarity index 100%
rename from nixos/home-manager/env/config/eww/bar/scripts/get-workspaces
rename to home/env/config/eww/bar/scripts/get-workspaces
diff --git a/nixos/home-manager/env/config/eww/bar/scripts/getram b/home/env/config/eww/bar/scripts/getram
similarity index 100%
rename from nixos/home-manager/env/config/eww/bar/scripts/getram
rename to home/env/config/eww/bar/scripts/getram
diff --git a/nixos/home-manager/env/config/eww/bar/scripts/getvol b/home/env/config/eww/bar/scripts/getvol
similarity index 100%
rename from nixos/home-manager/env/config/eww/bar/scripts/getvol
rename to home/env/config/eww/bar/scripts/getvol
diff --git a/nixos/home-manager/env/config/eww/eww.scss b/home/env/config/eww/eww.scss
similarity index 100%
rename from nixos/home-manager/env/config/eww/eww.scss
rename to home/env/config/eww/eww.scss
diff --git a/nixos/home-manager/env/config/eww/eww.yuck b/home/env/config/eww/eww.yuck
similarity index 100%
rename from nixos/home-manager/env/config/eww/eww.yuck
rename to home/env/config/eww/eww.yuck
diff --git a/nixos/home-manager/env/config/eww/powermenu/eww.scss b/home/env/config/eww/powermenu/eww.scss
similarity index 100%
rename from nixos/home-manager/env/config/eww/powermenu/eww.scss
rename to home/env/config/eww/powermenu/eww.scss
diff --git a/nixos/home-manager/env/config/eww/powermenu/eww.yuck b/home/env/config/eww/powermenu/eww.yuck
similarity index 100%
rename from nixos/home-manager/env/config/eww/powermenu/eww.yuck
rename to home/env/config/eww/powermenu/eww.yuck
diff --git a/nixos/home-manager/env/config/eww/powermenu/wallpaper b/home/env/config/eww/powermenu/wallpaper
similarity index 100%
rename from nixos/home-manager/env/config/eww/powermenu/wallpaper
rename to home/env/config/eww/powermenu/wallpaper
diff --git a/nixos/home-manager/env/config/hypr/hyprland-H0615.conf b/home/env/config/hypr/hyprland-H0615.conf
similarity index 100%
rename from nixos/home-manager/env/config/hypr/hyprland-H0615.conf
rename to home/env/config/hypr/hyprland-H0615.conf
diff --git a/nixos/home-manager/env/config/hypr/hyprland-vanguard.conf b/home/env/config/hypr/hyprland-vanguard.conf
similarity index 100%
rename from nixos/home-manager/env/config/hypr/hyprland-vanguard.conf
rename to home/env/config/hypr/hyprland-vanguard.conf
diff --git a/nixos/home-manager/env/config/hypr/hyprland.conf b/home/env/config/hypr/hyprland.conf
similarity index 100%
rename from nixos/home-manager/env/config/hypr/hyprland.conf
rename to home/env/config/hypr/hyprland.conf
diff --git a/nixos/home-manager/env/config/hypr/hyprpaper-H0615.conf b/home/env/config/hypr/hyprpaper-H0615.conf
similarity index 100%
rename from nixos/home-manager/env/config/hypr/hyprpaper-H0615.conf
rename to home/env/config/hypr/hyprpaper-H0615.conf
diff --git a/nixos/home-manager/env/config/hypr/hyprpaper-northstar.conf b/home/env/config/hypr/hyprpaper-northstar.conf
similarity index 100%
rename from nixos/home-manager/env/config/hypr/hyprpaper-northstar.conf
rename to home/env/config/hypr/hyprpaper-northstar.conf
diff --git a/nixos/home-manager/env/config/hypr/hyprpaper-vanguard.conf b/home/env/config/hypr/hyprpaper-vanguard.conf
similarity index 100%
rename from nixos/home-manager/env/config/hypr/hyprpaper-vanguard.conf
rename to home/env/config/hypr/hyprpaper-vanguard.conf
diff --git a/nixos/home-manager/env/config/hypr/macchiato.conf b/home/env/config/hypr/macchiato.conf
similarity index 100%
rename from nixos/home-manager/env/config/hypr/macchiato.conf
rename to home/env/config/hypr/macchiato.conf
diff --git a/nixos/home-manager/env/config/polybar/polybar.ini b/home/env/config/polybar/polybar.ini
similarity index 100%
rename from nixos/home-manager/env/config/polybar/polybar.ini
rename to home/env/config/polybar/polybar.ini
diff --git a/nixos/home-manager/env/config/rofi/catppuccin-macchiato.rasi b/home/env/config/rofi/catppuccin-macchiato.rasi
similarity index 100%
rename from nixos/home-manager/env/config/rofi/catppuccin-macchiato.rasi
rename to home/env/config/rofi/catppuccin-macchiato.rasi
diff --git a/nixos/home-manager/env/config/sway/swayconfig-H0615 b/home/env/config/sway/swayconfig-H0615
similarity index 100%
rename from nixos/home-manager/env/config/sway/swayconfig-H0615
rename to home/env/config/sway/swayconfig-H0615
diff --git a/nixos/home-manager/env/config/sway/swayconfig-northstar b/home/env/config/sway/swayconfig-northstar
similarity index 100%
rename from nixos/home-manager/env/config/sway/swayconfig-northstar
rename to home/env/config/sway/swayconfig-northstar
diff --git a/nixos/home-manager/env/config/waybar/config b/home/env/config/waybar/config
similarity index 100%
rename from nixos/home-manager/env/config/waybar/config
rename to home/env/config/waybar/config
diff --git a/nixos/home-manager/env/config/waybar/config-hyprland b/home/env/config/waybar/config-hyprland
similarity index 100%
rename from nixos/home-manager/env/config/waybar/config-hyprland
rename to home/env/config/waybar/config-hyprland
diff --git a/nixos/home-manager/env/config/waybar/config-sway b/home/env/config/waybar/config-sway
similarity index 100%
rename from nixos/home-manager/env/config/waybar/config-sway
rename to home/env/config/waybar/config-sway
diff --git a/nixos/home-manager/env/config/waybar/style.css b/home/env/config/waybar/style.css
similarity index 100%
rename from nixos/home-manager/env/config/waybar/style.css
rename to home/env/config/waybar/style.css
diff --git a/nixos/home-manager/env/dunst.nix b/home/env/dunst.nix
similarity index 100%
rename from nixos/home-manager/env/dunst.nix
rename to home/env/dunst.nix
diff --git a/nixos/home-manager/env/gtk.nix b/home/env/gtk.nix
similarity index 100%
rename from nixos/home-manager/env/gtk.nix
rename to home/env/gtk.nix
diff --git a/nixos/home-manager/env/hyprland.nix b/home/env/hyprland.nix
similarity index 100%
rename from nixos/home-manager/env/hyprland.nix
rename to home/env/hyprland.nix
diff --git a/nixos/home-manager/env/picom.nix b/home/env/picom.nix
similarity index 100%
rename from nixos/home-manager/env/picom.nix
rename to home/env/picom.nix
diff --git a/nixos/home-manager/env/pkgs/rot8/backup.nix b/home/env/pkgs/rot8/backup.nix
similarity index 100%
rename from nixos/home-manager/env/pkgs/rot8/backup.nix
rename to home/env/pkgs/rot8/backup.nix
diff --git a/nixos/home-manager/env/pkgs/rot8/default.nix b/home/env/pkgs/rot8/default.nix
similarity index 100%
rename from nixos/home-manager/env/pkgs/rot8/default.nix
rename to home/env/pkgs/rot8/default.nix
diff --git a/nixos/home-manager/env/polybar.nix b/home/env/polybar.nix
similarity index 100%
rename from nixos/home-manager/env/polybar.nix
rename to home/env/polybar.nix
diff --git a/nixos/home-manager/env/rofi.nix b/home/env/rofi.nix
similarity index 100%
rename from nixos/home-manager/env/rofi.nix
rename to home/env/rofi.nix
diff --git a/nixos/home-manager/env/sway.nix b/home/env/sway.nix
similarity index 100%
rename from nixos/home-manager/env/sway.nix
rename to home/env/sway.nix
diff --git a/nixos/home-manager/env/sxhkd.nix b/home/env/sxhkd.nix
similarity index 100%
rename from nixos/home-manager/env/sxhkd.nix
rename to home/env/sxhkd.nix
diff --git a/nixos/home-manager/env/waybar.nix b/home/env/waybar.nix
similarity index 100%
rename from nixos/home-manager/env/waybar.nix
rename to home/env/waybar.nix
diff --git a/nixos/home-manager/env/xfce.nix b/home/env/xfce.nix
similarity index 100%
rename from nixos/home-manager/env/xfce.nix
rename to home/env/xfce.nix
diff --git a/nixos/home-manager/env/xresources.nix b/home/env/xresources.nix
similarity index 100%
rename from nixos/home-manager/env/xresources.nix
rename to home/env/xresources.nix
diff --git a/nixos/home-manager/packages/common.nix b/home/packages/common.nix
similarity index 100%
rename from nixos/home-manager/packages/common.nix
rename to home/packages/common.nix
diff --git a/nixos/home-manager/packages/config/starship.toml b/home/packages/config/starship.toml
similarity index 100%
rename from nixos/home-manager/packages/config/starship.toml
rename to home/packages/config/starship.toml
diff --git a/nixos/home-manager/packages/default.nix b/home/packages/default.nix
similarity index 100%
rename from nixos/home-manager/packages/default.nix
rename to home/packages/default.nix
diff --git a/nixos/home-manager/packages/env/bash.nix b/home/packages/env/bash.nix
similarity index 100%
rename from nixos/home-manager/packages/env/bash.nix
rename to home/packages/env/bash.nix
diff --git a/nixos/home-manager/packages/env/common.nix b/home/packages/env/common.nix
similarity index 100%
rename from nixos/home-manager/packages/env/common.nix
rename to home/packages/env/common.nix
diff --git a/nixos/home-manager/packages/env/default.nix b/home/packages/env/default.nix
similarity index 100%
rename from nixos/home-manager/packages/env/default.nix
rename to home/packages/env/default.nix
diff --git a/nixos/home-manager/packages/env/fish.nix b/home/packages/env/fish.nix
similarity index 100%
rename from nixos/home-manager/packages/env/fish.nix
rename to home/packages/env/fish.nix
diff --git a/nixos/home-manager/packages/env/qemu.nix b/home/packages/env/qemu.nix
similarity index 100%
rename from nixos/home-manager/packages/env/qemu.nix
rename to home/packages/env/qemu.nix
diff --git a/nixos/home-manager/packages/env/zsh.nix b/home/packages/env/zsh.nix
similarity index 100%
rename from nixos/home-manager/packages/env/zsh.nix
rename to home/packages/env/zsh.nix
diff --git a/nixos/home-manager/packages/gui/browser-wayland.nix b/home/packages/gui/browser-wayland.nix
similarity index 100%
rename from nixos/home-manager/packages/gui/browser-wayland.nix
rename to home/packages/gui/browser-wayland.nix
diff --git a/nixos/home-manager/packages/gui/browser.nix b/home/packages/gui/browser.nix
similarity index 100%
rename from nixos/home-manager/packages/gui/browser.nix
rename to home/packages/gui/browser.nix
diff --git a/nixos/home-manager/packages/gui/cloud.nix b/home/packages/gui/cloud.nix
similarity index 100%
rename from nixos/home-manager/packages/gui/cloud.nix
rename to home/packages/gui/cloud.nix
diff --git a/nixos/home-manager/packages/gui/common.nix b/home/packages/gui/common.nix
similarity index 100%
rename from nixos/home-manager/packages/gui/common.nix
rename to home/packages/gui/common.nix
diff --git a/nixos/home-manager/packages/gui/default.nix b/home/packages/gui/default.nix
similarity index 100%
rename from nixos/home-manager/packages/gui/default.nix
rename to home/packages/gui/default.nix
diff --git a/nixos/home-manager/packages/gui/foot.nix b/home/packages/gui/foot.nix
similarity index 100%
rename from nixos/home-manager/packages/gui/foot.nix
rename to home/packages/gui/foot.nix
diff --git a/nixos/home-manager/packages/gui/gaming.nix b/home/packages/gui/gaming.nix
similarity index 100%
rename from nixos/home-manager/packages/gui/gaming.nix
rename to home/packages/gui/gaming.nix
diff --git a/nixos/home-manager/packages/gui/kitty.nix b/home/packages/gui/kitty.nix
similarity index 100%
rename from nixos/home-manager/packages/gui/kitty.nix
rename to home/packages/gui/kitty.nix
diff --git a/nixos/home-manager/packages/gui/messaging.nix b/home/packages/gui/messaging.nix
similarity index 100%
rename from nixos/home-manager/packages/gui/messaging.nix
rename to home/packages/gui/messaging.nix
diff --git a/nixos/home-manager/packages/gui/nomachine.nix b/home/packages/gui/nomachine.nix
similarity index 100%
rename from nixos/home-manager/packages/gui/nomachine.nix
rename to home/packages/gui/nomachine.nix
diff --git a/nixos/home-manager/packages/gui/ukaea.nix b/home/packages/gui/ukaea.nix
similarity index 100%
rename from nixos/home-manager/packages/gui/ukaea.nix
rename to home/packages/gui/ukaea.nix
diff --git a/nixos/home-manager/packages/tui/common.nix b/home/packages/tui/common.nix
similarity index 100%
rename from nixos/home-manager/packages/tui/common.nix
rename to home/packages/tui/common.nix
diff --git a/nixos/home-manager/packages/tui/config/lazygit.nix b/home/packages/tui/config/lazygit.nix
similarity index 100%
rename from nixos/home-manager/packages/tui/config/lazygit.nix
rename to home/packages/tui/config/lazygit.nix
diff --git a/nixos/home-manager/packages/tui/config/tmux.conf b/home/packages/tui/config/tmux.conf
similarity index 100%
rename from nixos/home-manager/packages/tui/config/tmux.conf
rename to home/packages/tui/config/tmux.conf
diff --git a/nixos/home-manager/packages/tui/default.nix b/home/packages/tui/default.nix
similarity index 100%
rename from nixos/home-manager/packages/tui/default.nix
rename to home/packages/tui/default.nix
diff --git a/nixos/home-manager/packages/tui/lazygit.nix b/home/packages/tui/lazygit.nix
similarity index 100%
rename from nixos/home-manager/packages/tui/lazygit.nix
rename to home/packages/tui/lazygit.nix
diff --git a/nixos/home-manager/packages/tui/neovim.nix b/home/packages/tui/neovim.nix
similarity index 100%
rename from nixos/home-manager/packages/tui/neovim.nix
rename to home/packages/tui/neovim.nix
diff --git a/nixos/home-manager/packages/tui/tmux.nix b/home/packages/tui/tmux.nix
similarity index 100%
rename from nixos/home-manager/packages/tui/tmux.nix
rename to home/packages/tui/tmux.nix
diff --git a/nixos/home-manager/northstar-xenia.nix b/nixos/home-manager/northstar-xenia.nix
deleted file mode 100644
index 48e56a91..00000000
--- a/nixos/home-manager/northstar-xenia.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ ... }: {
-  imports = [
-    ./env/sway.nix
-    ./env/common-touchinput.nix
-    ./packages/env/bash.nix
-    ./packages/tui
-    ./packages/gui/browser-wayland.nix
-    ./packages/gui/foot.nix
-    ./packages/gui/kitty.nix
-  ];
-  # Home Manager needs a bit of information about you and the
-  # paths it should manage.
-  home.username = "xenia";
-  home.homeDirectory = "/home/xenia";
-
-  programs.git = {
-    userEmail = "evie@xenia.me.uk";
-  };
-
-  home.stateVersion = "22.11";
-}
diff --git a/nixos/home-manager/ukaea-elitherl.nix b/nixos/home-manager/ukaea-elitherl.nix
deleted file mode 100644
index 8007ffca..00000000
--- a/nixos/home-manager/ukaea-elitherl.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ ... }: {
-  imports = [
-    ./env/hyprland.nix
-    ./env/sway.nix
-    ./packages/env
-    ./packages/tui
-    ./packages/gui/browser.nix
-    ./packages/gui/cloud.nix
-    ./packages/gui/foot.nix
-    ./packages/gui/kitty.nix
-    ./packages/gui/messaging.nix
-    ./packages/gui/nomachine.nix
-    ./packages/gui/ukaea.nix
-  ];
-  # Home Manager needs a bit of information about you and the
-  # paths it should manage.
-  home.username = "elitherl";
-  home.homeDirectory = "/home/elitherl";
-
-  programs.git = {
-    userEmail = "evie.litherland-smith@ukaea.uk";
-  };
-
-  wayland.windowManager.hyprland.extraConfig =
-    builtins.readFile (./env/config/hypr/macchiato.conf) + "\n"
-    + builtins.readFile (./env/config/hypr/hyprland.conf) + "\n"
-    + builtins.readFile (./env/config/hypr/hyprland-H0615.conf);
-
-  home.stateVersion = "22.11";
-}