diff --git a/global/home/default.nix b/global/home/default.nix
index 771699a..c434756 100644
--- a/global/home/default.nix
+++ b/global/home/default.nix
@@ -29,10 +29,14 @@ let
 in {
   imports = [
     ./graphical.nix
+
+    ../../lib/scripts.nix
+
     ../../lib/programs/home/neovim/.
+    ../../lib/programs/home/git.nix
+
     ../../lib/modules/home/terminal.nix
     ../../lib/modules/home/scripts.nix
-    ../../lib/scripts.nix
     ../../lib/modules/home/email.nix
     ../../lib/modules/home/editor.nix
     ../../lib/modules/home/mpd.nix
diff --git a/lib/mkconf.nix b/lib/mkconf.nix
index b4391e2..492212d 100644
--- a/lib/mkconf.nix
+++ b/lib/mkconf.nix
@@ -28,13 +28,13 @@ nixpkgs.lib.nixosSystem {
     }
     {
       imports = [
+        (import ./modules/gamer.nix {inherit user;})
+
         (import ./modules/keyboard.nix {inherit user;})
         (import ./modules/display.nix {inherit user;})
         (import ./modules/work.nix {inherit user;})
-        (import ./modules/git.nix {inherit user userName;})
         (import ./modules/laptop.nix {inherit user;})
         (import ./modules/personal.nix {inherit user;})
-        (import ./modules/gamer.nix {inherit user;})
         (import ./programs/hyprland.nix {inherit user;})
         (import ../hardware/${name}.nix {inherit user;})
         (import ../global/system.nix user)
@@ -48,7 +48,6 @@ nixpkgs.lib.nixosSystem {
       ];
 
       roles.work.enable = work;
-      roles.git.enable = true;
       roles.personal.enable = !work;
     }
   ];
diff --git a/lib/modules/git.nix b/lib/modules/git.nix
deleted file mode 100644
index 3156bc8..0000000
--- a/lib/modules/git.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  user,
-  userName,
-}: {
-  lib,
-  pkgs,
-  config,
-  ...
-}:
-with lib; let
-  cfg = config.roles.git;
-in {
-  options.roles = {
-    git = {
-      enable = mkEnableOption "email settings";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    home-manager.users.${user}.imports = [
-      {
-        programs.git = {
-          enable = true;
-          aliases = {
-            graph = "log --oneline --all --graph";
-            amend = "commit --amend --no-edit";
-          };
-          delta = {
-            enable = true;
-          };
-          extraConfig = {
-            pull.rebase = true;
-          };
-        };
-      }
-    ];
-  };
-}
diff --git a/lib/programs/home/git.nix b/lib/programs/home/git.nix
new file mode 100644
index 0000000..cc2774b
--- /dev/null
+++ b/lib/programs/home/git.nix
@@ -0,0 +1,15 @@
+{
+  programs.git = {
+    enable = true;
+    aliases = {
+      graph = "log --oneline --all --graph";
+      amend = "commit --amend --no-edit";
+    };
+    delta = {
+      enable = true;
+    };
+    extraConfig = {
+      pull.rebase = true;
+    };
+  };
+}