Move home-manager configs into top level of dotfiles for better separation

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";
+}

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";
+}

home/Legion-xenia.nix

@@ -0,0 +1,8 @@
+{ ... }: {
+  imports = [
+    ./common-personal.nix
+    ./packages/env/bash.nix
+    ./packages/tui
+  ];
+  home.stateVersion = "22.11";
+}

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";
+}

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";
 }

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";
 }

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";
+  };
+}

home/common.nix

@@ -2,5 +2,5 @@
 
 {
   nixpkgs.config.allowUnfree = true;
-  #programs.home-manager.enable = true;
+  programs.home-manager.enable = true;
 }

nixos/home-manager/northstar-xenia.nix

@@ -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";
-}

nixos/home-manager/ukaea-elitherl.nix

@@ -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";
-}