Move nix home definitions from config to nixos directory

config/git/config

@@ -1,30 +0,0 @@
-# vim: ft=gitconfig
-[include]
-    path = user_email
-
-[user]
-    name = Evie Litherland-Smith
-
-[core]
-    editor = nvim
-    autocrlf = input
-[pull]
-    rebase = false
-[color]
-    ui = true
-[diff]
-	tool = nvimdiff
-	algorithm = minimal
-[difftool]
-	prompt = no
-	trustExitCode = yes
-[alias]
-	dt = difftool
-	mt = mergetool
-[merge]
-	tool = nvimdiff2
-[mergetool]
-	keepBackup = yes
-	prompt = no
-[init]
-	defaultBranch = main

config/nixpkgs/home.nix

@@ -1,31 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  imports = [
-    ./neovim.nix
-  ];
-  # Home Manager needs a bit of information about you and the
-  # paths it should manage.
-  home.username = "xenia";
-  home.homeDirectory = "/home/xenia";
-
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
-
-  home.packages = with pkgs; [
-    wezterm
-    git
-    zsh
-    starship
-    firefox
-    bitwarden
-    gcc
-  ];
-
-  programs.git = {
-    enable = true;
-    userName = "Evie Litherland-Smith";
-    userEmail = "evie@xenia.me.uk";
-  };
-
-}

nixos/home/common.nix

@@ -0,0 +1,11 @@
+{ config, pkgs, ... }:
+
+{
+  programs.home-manager.enable = true;
+
+  home.packages = with pkgs; [
+    wezterm
+    zsh
+    starship
+  ];
+}

nixos/home/dev.nix

@@ -0,0 +1,13 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ./neovim.nix
+  ];
+
+  home.packages = with pkgs; [
+    git
+    lazygit
+    gcc
+  ];
+}

nixos/vanguard-xenia.nix

@@ -75,8 +75,24 @@ in
 
   home-manager.users.xenia = { pkgs, ... }: {
     imports = [
-      /home/xenia/.config/nixpkgs/home.nix
+      ./home/common.nix
+      ./home/dev.nix
     ];
+    # Home Manager needs a bit of information about you and the
+    # paths it should manage.
+    home.username = "xenia";
+    home.homeDirectory = "/home/xenia";
+
+    home.packages = with pkgs; [
+      firefox
+      bitwarden
+    ];
+
+    programs.git = {
+      enable = true;
+      userName = "Evie Litherland-Smith";
+      userEmail = "evie@xenia.me.uk";
+    };
     home.stateVersion = "22.11";
 
   };