4 files changed, 44 insertions, 7 deletions
diff --git a/machines/git/configuration.nix b/machines/oxo/configuration.nix
index a244c64..ef7a84b 100644
--- a/machines/git/configuration.nix
+++ b/machines/oxo/configuration.nix
@@ -7,12 +7,12 @@
   ] ++ (map (path: ../../modules/${path}) [
     "core/global.nix"
     "ssh.nix"
-    "git/compromyse.nix"
+    "compromyse.nix"
+    "git/user.nix"
     "git/cgit.nix"
-    "git/git.nix"
   ]);
 
-  networking.hostName = "git";
+  networking.hostName = "oxo";
 
   boot.loader.grub = {
     enable = true;
@@ -26,7 +26,8 @@
     useGlobalPkgs = true;
     useUserPackages = true;
     users = {
-      "compromyse" = import ./home.nix;
+      git = import ./git-home.nix;
+      compromyse = import ./home.nix
     };
   };
 }
diff --git a/machines/git/home.nix b/machines/oxo/git-home.nix
index 723879e..ce20f9e 100644
--- a/machines/git/home.nix
+++ b/machines/oxo/git-home.nix
@@ -2,8 +2,8 @@
 
 {
   home = {
-    username = "compromyse";
-    homeDirectory = "/home/compromyse";
+    username = "git";
+    homeDirectory = "/home/git";
   };
 
   home.packages = with pkgs; [
@@ -11,7 +11,6 @@
   ];
 
   imports = (map (path: ../../config/${path}) [
-    "bash.nix"
     "git"
     "nvim"
   ]);
diff --git a/machines/git/hardware-configuration.nix b/machines/oxo/hardware-configuration.nix
index b10d174..b10d174 100644
--- a/machines/git/hardware-configuration.nix
+++ b/machines/oxo/hardware-configuration.nix
diff --git a/machines/oxo/home.nix b/machines/oxo/home.nix
new file mode 100644
index 0000000..8672e15
--- /dev/null
+++ b/machines/oxo/home.nix
@@ -0,0 +1,37 @@
+{ inputs, pkgs, ... }:
+
+{
+  home = {
+    username = "compromyse";
+    homeDirectory = "/home/compromyse";
+  };
+
+  home.packages = with pkgs; [
+    tmux
+    fzf
+    fd
+    ripgrep
+
+    unzip
+    zip
+  ];
+
+  programs = {
+    direnv = {
+      enable = true;
+      enableBashIntegration = true;
+      nix-direnv.enable = true;
+    };
+
+    bash.enable = true;
+  };
+
+  imports = (map (path: ../../config/${path}) [
+    "bash.nix"
+    "dotfiles.nix"
+    "git"
+    "nvim"
+  ]);
+
+  home.stateVersion = "23.11";
+}