diff --git a/homes/emenel/default.nix b/homes/emenel/default.nix
index 6eb2015..245b024 100644
--- a/homes/emenel/default.nix
+++ b/homes/emenel/default.nix
@@ -2,7 +2,7 @@
 {
 
   imports = with nix-config.homeModules; [
-    # mako
+    git-conf
     yazi
     shell-conf # shell, shell utils, cli tools, libs, tui's
     email
@@ -21,7 +21,7 @@
       ]
 
       (with pkgs; [
-        # samba4Full
+        # sambaFull
         dconf
         # xorg.libX11
         # xorg.libxcb
diff --git a/homes/media/default.nix b/homes/media/default.nix
index ba825f6..42e6b51 100644
--- a/homes/media/default.nix
+++ b/homes/media/default.nix
@@ -3,13 +3,13 @@
 
   imports = with nix-config.homeModules; [
     shell-conf # shell, shell utils, cli tools, libs, tui's
+    git-conf
   ];
 
   home = {
     packages = with pkgs; [
       cifs-utils
       beets
-      keyutils
       wezterm
     ];
 
@@ -26,47 +26,7 @@
 
   programs = {
     home-manager.enable = true;
-
     password-store.enable = true;
-
-    git = {
-      enable = true;
-      lfs = {
-        enable = true;
-      };
-      userEmail = "matt@emenel.ca";
-      userName = "Matt Nish-Lapidus";
-      ignores = [
-        ".DS_Store"
-      ];
-      extraConfig = {
-        core = {
-          editor = "$EDITOR";
-          pager = "${pkgs.delta}/bin/delta";
-        };
-        interactive = {
-          diffFilter = "${pkgs.delta}/bin/delta --color-only";
-        };
-        delta = {
-          navigate = true;
-          dark = true;
-          line-numbers = true;
-          side-by-side = true;
-        };
-        merge = {
-          conflictstyle = "zdiff3";
-        };
-        init = {
-          defaultBranch = "main";
-        };
-      };
-      aliases = {
-        co = "checkout";
-        cm = "commit -m";
-        aa = "add .";
-        p = "push";
-      };
-    };
   };
 
   systemd.user = {
diff --git a/hosts/media-server/configuration.nix b/hosts/media-server/configuration.nix
index 4f74d9b..b7bc0fe 100644
--- a/hosts/media-server/configuration.nix
+++ b/hosts/media-server/configuration.nix
@@ -156,9 +156,13 @@
   nixarr = {
     enable = true;
 
-    mediaDir = "/data/media";
+    # mediaDir = "/mnt/filez/media";
     stateDir = "/data/media/.state/nixarr";
 
+    mediaUsers = [
+      "media"
+    ];
+
     transmission = {
       enable = true;
     };
diff --git a/modules/home/git-conf.nix b/modules/home/git-conf.nix
new file mode 100644
index 0000000..e5931ae
--- /dev/null
+++ b/modules/home/git-conf.nix
@@ -0,0 +1,42 @@
+{ pkgs, ... }:
+
+{
+   programs.git = {
+      enable = true;
+      lfs = {
+        enable = true;
+      };
+      userEmail = "matt@emenel.ca";
+      userName = "Matt Nish-Lapidus";
+      ignores = [
+        ".DS_Store"
+      ];
+      extraConfig = {
+        core = {
+          editor = "$EDITOR";
+          pager = "${pkgs.delta}/bin/delta";
+        };
+        interactive = {
+          diffFilter = "${pkgs.delta}/bin/delta --color-only";
+        };
+        delta = {
+          navigate = true;
+          dark = true;
+          line-numbers = true;
+          side-by-side = true;
+        };
+        merge = {
+          conflictstyle = "zdiff3";
+        };
+        init = {
+          defaultBranch = "main";
+        };
+      };
+      aliases = {
+        co = "checkout";
+        cm = "commit -m";
+        aa = "add .";
+        p = "push";
+      };
+    };
+}