restructure home-manager file layout to reduce clutter

nixos/H0615-elitherl.nix

@@ -2,10 +2,9 @@
 
 {
   imports = [
-    ./common/common.nix
+    ./common.nix
-    ./common/en_GB.nix
+    ./locales/en_GB.nix
-    ./common/plasma.nix
+    ./desktop/plasma.nix
-    ./common/desktop.nix
   ];
 
   networking.hostName = "H0615"; # Define your hostname.
@@ -22,7 +21,7 @@
   services.xserver.displayManager.autoLogin.user = "elitherl";
 
   # Set up home manager for user
-  home-manager.users.elitherl = import ./home-H0615-elitherl.nix;
+  home-manager.users.elitherl = import ./home-manager/H0615-elitherl.nix;
 
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions

nixos/desktop/plasma.nix

@@ -1,5 +1,8 @@
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
 {
+  imports = [
+    ./common.nix
+  ];
   # Enable the X11 windowing system.
   services.xserver.enable = true;
 

nixos/home-manager/H0615-elitherl.nix

@@ -1,10 +1,10 @@
 { pkgs, ... }: {
   imports = [
-    ./home/common.nix
+    ./common.nix
-    ./home/gui.nix
+    ./packages/gui.nix
-    ./home/dev.nix
+    ./packages/dev.nix
-    ./home/nomachine.nix
+    ./packages/nomachine.nix
-    ./home/python310.nix
+    ./packages/python310.nix
   ];
   # Home Manager needs a bit of information about you and the
   # paths it should manage.

nixos/home-manager/packages/dev.nix

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

nixos/home-manager/packages/gui.nix

@@ -1,4 +1,6 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+
+{
   home.packages = with pkgs; [
     wezterm
     firefox

nixos/home-manager/packages/neovim.nix

@@ -1,6 +1,9 @@
 { pkgs, ... }:
 
 {
+  imports = [
+    ./dev.nix
+  ];
   programs.neovim = {
     enable = true;
     defaultEditor = true;

nixos/home-manager/vanguard-xenia.nix

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

nixos/vanguard-xenia.nix

@@ -2,10 +2,9 @@
 
 {
   imports = [
-    ./common/common.nix
+    ./common.nix
-    ./common/en_GB.nix
+    ./locales/en_GB.nix
-    ./common/plasma.nix
+    ./desktop/plasma.nix
-    ./common/desktop.nix
   ];
 
   networking.hostName = "Vanguard"; # Define your hostname.
@@ -22,7 +21,7 @@
   services.xserver.displayManager.autoLogin.user = "xenia";
 
   # Set up home manager for user
-  home-manager.users.xenia = import ./home-vanguard-xenia.nix;
+  home-manager.users.xenia = import ./home-manager/vanguard-xenia.nix;
 
   # For Steam support
   hardware.opengl.driSupport32Bit = true;