Further restructuring, set up default.nix files to allow importing all common expressions by importing top level packages directory

nixos/home-manager/H0615-elitherl.nix

@@ -1,20 +1,16 @@
-{ pkgs, ... }: {
+{ ... }: {
   imports = [
     ./common.nix
-    ./packages/gui.nix
-    ./packages/neovim.nix
-    ./packages/python310.nix
-    ./packages/nomachine.nix
+    ./packages
+    ./packages/gui/nomachine.nix
+    ./packages/gui/zotero.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";
 
-  home.packages = with pkgs; [
-    teams
-  ];
-
   programs.git = {
     userEmail = "evie.litherland-smith@ukaea.uk";
   };

nixos/home-manager/common.nix

@@ -1,8 +1,7 @@
-{ config, pkgs, ... }:
+{ ... }:
 
 {
   nixpkgs.config.allowUnfree = true;
-
   programs.home-manager.enable = true;
   programs.ssh = {
     enable = true;

nixos/home-manager/packages/default.nix

@@ -0,0 +1,9 @@
+{ ... }:
+
+{
+  imports = [
+    ./tui
+    ./gui
+    ./env
+  ];
+}

nixos/home-manager/packages/dev.nix

@@ -1,15 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    gnumake
-    gcc
-    direnv
-  ];
-
-  programs.git.enable = true;
-  programs.lazygit = {
-    enable = true;
-    settings = import ./config/lazygit.nix;
-  };
-}

nixos/home-manager/packages/env/default.nix

@@ -0,0 +1,8 @@
+{ ... }:
+
+{
+  imports = [
+    ./qemu.nix
+    ./python310.nix
+  ];
+}

nixos/home-manager/packages/env/python310.nix

@@ -1,10 +1,6 @@
 { config, pkgs, ... }:
 
 {
-  imports = [
-    ./dev.nix
-  ];
-
   home.packages = with pkgs; [
     python310Full
     python310Packages.pipx

nixos/home-manager/packages/env/qemu.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    qemu
+  ];
+}

nixos/home-manager/packages/gui/default.nix

@@ -1,6 +1,9 @@
 { pkgs, ... }:
 
 {
+  imports = [
+    ./messaging.nix
+  ];
   home.packages = with pkgs; [
     wezterm
     firefox

nixos/home-manager/packages/gui/gaming.nix

@@ -5,5 +5,6 @@
     mesa
     steam
     steam-run
+    discord
   ];
 }

nixos/home-manager/packages/gui/messaging.nix

@@ -4,6 +4,5 @@
   home.packages = with pkgs; [
     signal-desktop
     element-desktop
-    discord
   ];
 }

nixos/home-manager/packages/gui/ukaea.nix

@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    teams
+    zoom-us
+  ];
+}

nixos/home-manager/packages/gui/zotero.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    zotero
+  ];
+}

nixos/home-manager/packages/tui/default.nix

@@ -0,0 +1,9 @@
+{ ... }:
+
+{
+  imports = [
+    ./neovim.nix
+    ./lazygit.nix
+  ];
+  programs.neovim.defaultEditor = true;
+}

nixos/home-manager/packages/tui/lazygit.nix

@@ -0,0 +1,8 @@
+{ ... }:
+
+{
+  programs.lazygit = {
+    enable = true;
+    settings = import ./config/lazygit.nix;
+  };
+}

nixos/home-manager/packages/tui/neovim.nix

@@ -1,13 +1,7 @@
 { pkgs, ... }:
 
 {
-  imports = [
-    ./dev.nix
-  ];
-  programs.neovim = {
-    enable = true;
-    defaultEditor = true;
-  };
+  programs.neovim.enable = true;
   home.packages = with pkgs; [
     gnumake
     gcc

nixos/home-manager/vanguard-xenia.nix

@@ -1,10 +1,8 @@
-{ pkgs, ... }: {
+{ ... }: {
   imports = [
     ./common.nix
-    ./packages/gui.nix
-    ./packages/gaming.nix
-    ./packages/messaging.nix
-    ./packages/neovim.nix
+    ./packages
+    ./packages/gui/gaming.nix
     ./packages/nomachine.nix
   ];
   # Home Manager needs a bit of information about you and the