diff --git a/hosts/PW05CH3L/configuration.nix b/hosts/PW05CH3L/configuration.nix
index 79b2cee5..56fa8359 100644
--- a/hosts/PW05CH3L/configuration.nix
+++ b/hosts/PW05CH3L/configuration.nix
@@ -6,6 +6,7 @@
     ../../modules/mixins/direnv.nix
     ../../modules/mixins/docker.nix
     ../../modules/mixins/fzf.nix
+    ../../modules/mixins/git.nix
     ../../modules/mixins/phpactor
     ../../modules/mixins/starship.nix
     ../../modules/mixins/tmux.nix
diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
index 0b233173..82770a5a 100644
--- a/hosts/t480/configuration.nix
+++ b/hosts/t480/configuration.nix
@@ -14,6 +14,7 @@
     ../../modules/mixins/flameshot.nix
     ../../modules/mixins/fonts.nix
     ../../modules/mixins/fzf.nix
+    ../../modules/mixins/git.nix
     ../../modules/mixins/gtk.nix
     ../../modules/mixins/mpv.nix
     ../../modules/mixins/phpactor
diff --git a/modules/home-manager/cli/default.nix b/modules/home-manager/cli/default.nix
index 72d9b78b..a833e666 100644
--- a/modules/home-manager/cli/default.nix
+++ b/modules/home-manager/cli/default.nix
@@ -3,7 +3,6 @@
 {
   imports = [
     ./bin
-    ./git.nix
     ./zsh
   ];
 }
diff --git a/modules/home-manager/cli/git.nix b/modules/home-manager/cli/git.nix
deleted file mode 100644
index d0d64c77..00000000
--- a/modules/home-manager/cli/git.nix
+++ /dev/null
@@ -1,152 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  home.file."${config.xdg.configHome}/git/message".text = ''
-
-
-    # Description
-    #
-    # - Why is this change necessary?
-    # - How does it address the issue?
-    # - What side effects does this change have?
-    #
-    # For breaking changes, uncomment the following line and describe the change:
-    #
-    # BREAKING CHANGE:
-    #
-    #
-    # Add any issue IDs or commit SHAs that this commit references:
-    #
-    # Refs:
-
-  '';
-
-  programs = {
-    git = {
-      enable = true;
-      userName = "Oliver Davies";
-      userEmail = "oliver@oliverdavies.dev";
-
-      includes = [
-        {
-          condition = "gitdir:${config.xdg.userDirs.extraConfig.XDG_REPOS_DIR}/tfw";
-          contents.user.email = "oliver.davies@tfw.wales";
-        }
-      ];
-
-      aliases = {
-        aa = "add --all";
-        assume = "update-index --assume-unchanged";
-        assumed = "!git ls-files -v | grep '^[hsmrck?]' | cut -c 3-";
-        b = "branch";
-        blame = "blame -w -C -C -C";
-        browse = "!gh repo view --web";
-        ca = "commit --amend --verbose";
-        car = "commit --amend --no-edit";
-        cl = "!hub clone";
-        co = "checkout";
-        compare = "!hub compare";
-        current-branch = "rev-parse --abbrev-ref HEAD";
-        dc = "diff --color --word-diff --cached";
-        df = "diff --color --word-diff";
-        dup = "!git checkout develop && git fetch origin && echo && git sl develop..origin/develop && echo && git pull --quiet && git checkout -";
-        fixup = "commit --fixup";
-        issues = "!gh issue list --web";
-        mup = "!git master-to-main-wrapper checkout %BRANCH% && git fetch origin && echo && git sl %BRANCH%..origin/%BRANCH% && echo && git pull --quiet && git checkout -";
-        no-ff = "merge --no-ff";
-        pl = "pull";
-        prune = "remote prune origin";
-        ps = "push";
-        pulls = "!gh pr list --web";
-        rbc = "rebase --continue";
-        rdup = "!git dup && git rebase develop";
-        remotes = "remote -v";
-        repush = "!git pull --rebase && git push";
-        ri = "rebase --interactive";
-        rid = "!git rebase -i $(git merge-base develop HEAD)";
-        rim = "!git rebase -i $(git master-to-main-wrapper merge-base %BRANCH% HEAD)";
-        rip = "!git rebase -i $(git merge-base production HEAD)";
-        ris = "!git rebase -i $(git merge-base staging HEAD)";
-        riu = "!git rebase -i $(git rev-parse --abbrev-ref --symbolic-full-name @{u})";
-        rmup = "!git mup && git master-to-main-wrapper rebase %BRANCH%";
-        sl = "log --oneline --decorate -20";
-        sla = "log --oneline --decorate --graph --all -20";
-        slap = "log --oneline --decorate --graph --all";
-        slp = "log --oneline --decorate";
-        stash = "stash --included-untracked";
-        unassume = "update-index --no-assume-unchanged";
-        uncommit = "reset --soft HEAD^";
-        unstage = "reset";
-        update = "!git fetch --all --jobs=4 --prune --progress && git rebase --autostash --stat";
-        upstream = "rev-parse --abbrev-ref --symbolic-full-name @{u}";
-        ureset = "!git reset --hard $(git upstream)";
-        worktrees = "worktree list";
-      };
-
-      ignores = [
-        "/.ddev/providers/"
-        "/.direnv/"
-        "/.ignored/"
-        "/.issue-id"
-        "/.phpactor.json"
-        "/notes"
-        "/todo"
-      ];
-
-      extraConfig = {
-        branch = {
-          autosetupmerge = true;
-          autosetuprebase = "always";
-          sort = "-committerdate";
-        };
-
-        checkout.defaultRemote = "origin";
-        color.ui = true;
-        column.ui = "auto";
-        commit.template = "${config.xdg.configHome}/git/message";
-
-        core = {
-          editor = "nvim";
-          excludesFile = "~/.config/git/ignore";
-        };
-
-        diff.tool = "vimdiff";
-        fetch.prune = true;
-        gpg.format = "ssh";
-        grep.lineNumber = true;
-        help.autocorrect = "1";
-        init.defaultBranch = "main";
-
-        maintenance = {
-          auto = false;
-          strategy = "incremental";
-        };
-
-        merge.ff = "only";
-
-        push = {
-          autoSetupRemote = true;
-          default = "upstream";
-        };
-
-        pull = {
-          ff = "only";
-          rebase = true;
-        };
-
-        rebase = {
-          autosquash = true;
-          autostash = true;
-        };
-
-        user.signingkey = "~/.ssh/id_rsa.pub";
-      };
-    };
-  };
-
-  home.packages = with pkgs; [ nixpkgs-2411.git-instafix ];
-
-  home.sessionVariables = {
-    GIT_INSTAFIX_UPSTREAM = "origin/main";
-  };
-}
diff --git a/modules/mixins/git.nix b/modules/mixins/git.nix
new file mode 100644
index 00000000..f7955fab
--- /dev/null
+++ b/modules/mixins/git.nix
@@ -0,0 +1,156 @@
+{
+  home-manager.users.opdavies =
+    { config, pkgs, ... }:
+    {
+      home.file."${config.xdg.configHome}/git/message".text = ''
+
+
+        # Description
+        #
+        # - Why is this change necessary?
+        # - How does it address the issue?
+        # - What side effects does this change have?
+        #
+        # For breaking changes, uncomment the following line and describe the change:
+        #
+        # BREAKING CHANGE:
+        #
+        #
+        # Add any issue IDs or commit SHAs that this commit references:
+        #
+        # Refs:
+
+      '';
+
+      programs = {
+        git = {
+          enable = true;
+          userName = "Oliver Davies";
+          userEmail = "oliver@oliverdavies.dev";
+
+          includes = [
+            {
+              condition = "gitdir:${config.xdg.userDirs.extraConfig.XDG_REPOS_DIR}/tfw";
+              contents.user.email = "oliver.davies@tfw.wales";
+            }
+          ];
+
+          aliases = {
+            aa = "add --all";
+            assume = "update-index --assume-unchanged";
+            assumed = "!git ls-files -v | grep '^[hsmrck?]' | cut -c 3-";
+            b = "branch";
+            blame = "blame -w -C -C -C";
+            browse = "!gh repo view --web";
+            ca = "commit --amend --verbose";
+            car = "commit --amend --no-edit";
+            cl = "!hub clone";
+            co = "checkout";
+            compare = "!hub compare";
+            current-branch = "rev-parse --abbrev-ref HEAD";
+            dc = "diff --color --word-diff --cached";
+            df = "diff --color --word-diff";
+            dup = "!git checkout develop && git fetch origin && echo && git sl develop..origin/develop && echo && git pull --quiet && git checkout -";
+            fixup = "commit --fixup";
+            issues = "!gh issue list --web";
+            mup = "!git master-to-main-wrapper checkout %BRANCH% && git fetch origin && echo && git sl %BRANCH%..origin/%BRANCH% && echo && git pull --quiet && git checkout -";
+            no-ff = "merge --no-ff";
+            pl = "pull";
+            prune = "remote prune origin";
+            ps = "push";
+            pulls = "!gh pr list --web";
+            rbc = "rebase --continue";
+            rdup = "!git dup && git rebase develop";
+            remotes = "remote -v";
+            repush = "!git pull --rebase && git push";
+            ri = "rebase --interactive";
+            rid = "!git rebase -i $(git merge-base develop HEAD)";
+            rim = "!git rebase -i $(git master-to-main-wrapper merge-base %BRANCH% HEAD)";
+            rip = "!git rebase -i $(git merge-base production HEAD)";
+            ris = "!git rebase -i $(git merge-base staging HEAD)";
+            riu = "!git rebase -i $(git rev-parse --abbrev-ref --symbolic-full-name @{u})";
+            rmup = "!git mup && git master-to-main-wrapper rebase %BRANCH%";
+            sl = "log --oneline --decorate -20";
+            sla = "log --oneline --decorate --graph --all -20";
+            slap = "log --oneline --decorate --graph --all";
+            slp = "log --oneline --decorate";
+            stash = "stash --included-untracked";
+            unassume = "update-index --no-assume-unchanged";
+            uncommit = "reset --soft HEAD^";
+            unstage = "reset";
+            update = "!git fetch --all --jobs=4 --prune --progress && git rebase --autostash --stat";
+            upstream = "rev-parse --abbrev-ref --symbolic-full-name @{u}";
+            ureset = "!git reset --hard $(git upstream)";
+            worktrees = "worktree list";
+          };
+
+          ignores = [
+            "/.ddev/providers/"
+            "/.direnv/"
+            "/.ignored/"
+            "/.issue-id"
+            "/.phpactor.json"
+            "/notes"
+            "/todo"
+          ];
+
+          extraConfig = {
+            branch = {
+              autosetupmerge = true;
+              autosetuprebase = "always";
+              sort = "-committerdate";
+            };
+
+            checkout.defaultRemote = "origin";
+            color.ui = true;
+            column.ui = "auto";
+            commit.template = "${config.xdg.configHome}/git/message";
+
+            core = {
+              editor = "nvim";
+              excludesFile = "~/.config/git/ignore";
+            };
+
+            diff.tool = "vimdiff";
+            fetch.prune = true;
+            gpg.format = "ssh";
+            grep.lineNumber = true;
+            help.autocorrect = "1";
+            init.defaultBranch = "main";
+
+            maintenance = {
+              auto = false;
+              strategy = "incremental";
+            };
+
+            merge.ff = "only";
+
+            push = {
+              autoSetupRemote = true;
+              default = "upstream";
+            };
+
+            pull = {
+              ff = "only";
+              rebase = true;
+            };
+
+            rebase = {
+              autosquash = true;
+              autostash = true;
+            };
+
+            user.signingkey = "~/.ssh/id_rsa.pub";
+          };
+        };
+      };
+
+      home = {
+        packages = with pkgs; [ nixpkgs-2411.git-instafix ];
+
+        sessionVariables = {
+          GIT_INSTAFIX_UPSTREAM = "origin/main";
+        };
+      };
+    };
+}