Fix structure levels

home/Legion-xenia.nix

@@ -1,6 +1,6 @@
 { ... }: {
   imports = [
-    ./env/personal.nix
+    ./env/xenia.nix
     ./tui
   ];
   home.stateVersion = "22.11";

home/Monarch-tux.nix

@@ -1,21 +1,8 @@
 { ... }:
 {
   imports = [
-    ./env/personal.nix
+    ./env/tux.nix
     ./tui
   ];
-  # Home Manager needs a bit of information about you and the
-  # paths it should manage.
-  home.username = "tux";
-  home.homeDirectory = "/Users/tux";
-
-  programs.git = {
-    userEmail = "evie@xenia.me.uk";
-  };
-
-  programs.zsh.envExtra = ''
-    eval "$(/opt/homebrew/bin/brew shellenv)"
-  '';
-
   home.stateVersion = "22.11";
 }

home/Northstar-xenia.nix

@@ -1,6 +1,6 @@
 { ... }: {
   imports = [
-    ./env/personal.nix
+    ./env/user/xenia.nix
     ./tui
   ];
   home.stateVersion = "22.11";

home/Vanguard-xenia.nix

@@ -1,6 +1,6 @@
 { ... }: {
   imports = [
-    ./env/personal.nix
+    ./env/xenia.nix
     ./desktop/gtk.nix
     ./desktop/wayland.nix
     ./tui

home/env/user/elitherl.nix

@@ -1,6 +1,6 @@
 { ... }:
 {
-  imports = [ ./common ];
+  imports = [ ../default.nix ];
   # Home Manager needs a bit of information about you and the
   # paths it should manage.
   home.username = "elitherl";

home/env/user/tux.nix

@@ -0,0 +1,16 @@
+{ ... }:
+{
+  imports = [ ../default.nix ];
+  # Home Manager needs a bit of information about you and the
+  # paths it should manage.
+  home.username = "tux";
+  home.homeDirectory = "/Users/tux";
+
+  programs.git = {
+    userEmail = "evie@xenia.me.uk";
+  };
+
+  programs.zsh.envExtra = ''
+    eval "$(/opt/homebrew/bin/brew shellenv)"
+  '';
+}

home/env/user/xenia.nix

@@ -1,6 +1,6 @@
 { ... }:
 {
-  imports = [ ./common ];
+  imports = [ ../default.nix ];
   # Home Manager needs a bit of information about you and the
   # paths it should manage.
   home.username = "xenia";

home/ukaea-elitherl.nix

@@ -2,7 +2,7 @@
   imports = [
     ./desktop/gtk.nix
     ./desktop/wayland.nix
-    ./env/work.nix
+    ./env/elitherl.nix
     ./tui
     ./gui/chromium-wayland.nix
     ./gui/neovide.nix