diff --git a/flake-modules/dev/list-plugins/list-plugins.py b/flake-modules/dev/list-plugins/list-plugins.py
index 5fadc6b6..9d185696 100755
--- a/flake-modules/dev/list-plugins/list-plugins.py
+++ b/flake-modules/dev/list-plugins/list-plugins.py
@@ -11,8 +11,9 @@ EXCLUDES: list[str] = [
     # Patterns
     "TEMPLATE.nix",
     "deprecations.nix",
-    "renamed-options",
     "helpers.nix",
+    "renamed-options",
+    "settings-options.nix",
     # Specific files
     "colorschemes/base16/theme-list.nix",
     "plugins/by-name/dap/dapHelpers.nix",
diff --git a/plugins/by-name/cmp-git/default.nix b/plugins/by-name/cmp-git/default.nix
new file mode 100644
index 00000000..f11cf704
--- /dev/null
+++ b/plugins/by-name/cmp-git/default.nix
@@ -0,0 +1,66 @@
+{
+  lib,
+  ...
+}:
+lib.nixvim.neovim-plugin.mkNeovimPlugin {
+  name = "cmp-git";
+  moduleName = "cmp_git";
+
+  imports = [
+    { cmpSourcePlugins.git = "cmp-git"; }
+  ];
+
+  maintainers = [ lib.maintainers.GaetanLepage ];
+
+  settingsOptions = import ./settings-options.nix { inherit lib; };
+
+  settingsExample = {
+    remotes = [
+      "upstream"
+      "origin"
+      "foo"
+    ];
+    github.issues = {
+      filter = "all";
+      limit = 250;
+      state = "all";
+      format = ''
+        function(_, issue)
+          local icon = ({
+            open = '',
+            closed = '',
+          })[string.lower(issue.state)]
+          return string.format('%s #%d: %s', icon, issue.number, issue.title)
+        end
+      '';
+      sort_by = ''
+        function(issue)
+          local kind_rank = issue.pull_request and 1 or 0
+          local state_rank = issue.state == 'open' and 0 or 1
+          local age = os.difftime(os.time(), require('cmp_git.utils').parse_github_date(issue.updatedAt))
+          return string.format('%d%d%010d', kind_rank, state_rank, age)
+        end
+      '';
+    };
+    trigger_actions = [
+      {
+        debug_name = "git_commits";
+        trigger_character = ":";
+        action = ''
+          function(sources, trigger_char, callback, params, git_info)
+            return sources.git:get_commits(callback, params, trigger_char)
+          end
+        '';
+      }
+      {
+        debug_name = "github_issues";
+        trigger_character = "#";
+        action = ''
+          function(sources, trigger_char, callback, params, git_info)
+            return sources.github:get_issues(callback, git_info, trigger_char)
+          end
+        '';
+      }
+    ];
+  };
+}
diff --git a/plugins/by-name/cmp-git/settings-options.nix b/plugins/by-name/cmp-git/settings-options.nix
new file mode 100644
index 00000000..de7bf91c
--- /dev/null
+++ b/plugins/by-name/cmp-git/settings-options.nix
@@ -0,0 +1,232 @@
+{ lib }:
+let
+  inherit (lib) types;
+  inherit (lib.nixvim) defaultNullOpts;
+
+  mkAction =
+    action: target:
+    defaultNullOpts.mkLuaFn "require('cmp_git.${action}').git.${target}" ''
+      Function used to ${action} the ${lib.replaceStrings [ "_" ] [ " " ] target}.
+    '';
+in
+{
+
+  filetypes = defaultNullOpts.mkListOf types.str [
+    "gitcommit"
+    "octo"
+  ] "Filetypes for which to trigger.";
+
+  remotes = defaultNullOpts.mkListOf types.str [
+    "upstream"
+    "origin"
+  ] "List of git remotes.";
+
+  enableRemoteUrlRewrites = defaultNullOpts.mkBool false ''
+    Whether to enable remote URL rewrites.
+  '';
+
+  git = {
+    commits = {
+      limit = defaultNullOpts.mkUnsignedInt 100 ''
+        Max number of git commits to fetch.
+      '';
+
+      sort_by = mkAction "sort" "commits";
+      format = mkAction "format" "commits";
+    };
+  };
+
+  github = {
+    hosts = defaultNullOpts.mkListOf types.str [ ] ''
+      List of private instances of github.
+    '';
+
+    issues = {
+      fields = defaultNullOpts.mkListOf types.str [
+        "title"
+        "number"
+        "body"
+        "updatedAt"
+        "state"
+      ] "The fields used for issues.";
+
+      filter = defaultNullOpts.mkStr "all" ''
+        The filter to use when fetching issues.
+      '';
+
+      limit = defaultNullOpts.mkUnsignedInt 100 ''
+        Max number of issues to fetch.
+      '';
+
+      state = defaultNullOpts.mkStr "open" ''
+        Which issues to fetch (`"open"`, `"closed"` or `"all"`).
+      '';
+
+      sort_by = mkAction "sort" "issues";
+      format = mkAction "format" "issues";
+    };
+
+    mentions = {
+      limit = defaultNullOpts.mkUnsignedInt 100 ''
+        Max number of mentions to fetch.
+      '';
+
+      sort_by = mkAction "sort" "mentions";
+      format = mkAction "format" "mentions";
+    };
+
+    pull_requests = {
+      fields = defaultNullOpts.mkListOf types.str [
+        "title"
+        "number"
+        "body"
+        "updatedAt"
+        "state"
+      ] "The fields used for pull requests.";
+
+      limit = defaultNullOpts.mkUnsignedInt 100 ''
+        Max number of pull requests to fetch.
+      '';
+
+      state = defaultNullOpts.mkStr "open" ''
+        Which issues to fetch (`"open"`, `"closed"`, `"merged"` or `"all"`).
+      '';
+
+      sort_by = mkAction "sort" "pull_requests";
+      format = mkAction "format" "pull_requests";
+    };
+  };
+
+  gitlab = {
+    hosts = defaultNullOpts.mkListOf types.str [ ] ''
+      List of private instances of gitlab.
+    '';
+
+    issues = {
+      limit = defaultNullOpts.mkUnsignedInt 100 ''
+        Max number of issues to fetch.
+      '';
+
+      state = defaultNullOpts.mkStr "open" ''
+        Which issues to fetch (`"open"`, `"closed"` or `"all"`).
+      '';
+
+      sort_by = mkAction "sort" "issues";
+      format = mkAction "format" "issues";
+    };
+
+    mentions = {
+      limit = defaultNullOpts.mkUnsignedInt 100 ''
+        Max number of mentions to fetch.
+      '';
+
+      sort_by = mkAction "sort" "mentions";
+      format = mkAction "format" "mentions";
+    };
+
+    merge_requests = {
+      limit = defaultNullOpts.mkUnsignedInt 100 ''
+        Max number of merge requests to fetch.
+      '';
+
+      state = defaultNullOpts.mkStr "open" ''
+        Which issues to fetch (`"open"`, `"closed"`, `"locked"` or `"merged"`).
+      '';
+
+      sort_by = mkAction "sort" "merge_requests";
+      format = mkAction "format" "merge_requests";
+    };
+  };
+
+  trigger_actions =
+    defaultNullOpts.mkListOf
+      (types.submodule {
+        options = {
+          debug_name = lib.nixvim.mkNullOrStr "Debug name.";
+
+          trigger_character = lib.mkOption {
+            type = types.str;
+            example = ":";
+            description = ''
+              The trigger character.
+              Has to be a single character
+            '';
+          };
+
+          action = lib.mkOption {
+            type = lib.types.strLuaFn;
+            description = ''
+              The parameters to the action function are the different sources (currently `git`,
+              `gitlab` and `github`), the completion callback, the trigger character, the
+              parameters passed to complete from nvim-cmp, and the current git info.
+            '';
+            example = ''
+              function(sources, trigger_char, callback, params, git_info)
+                return sources.git:get_commits(callback, params, trigger_char)
+              end
+            '';
+          };
+        };
+      })
+      [
+        {
+          debug_name = "git_commits";
+          trigger_character = ":";
+          action = ''
+            function(sources, trigger_char, callback, params, git_info)
+              return sources.git:get_commits(callback, params, trigger_char)
+            end
+          '';
+        }
+        {
+          debug_name = "gitlab_issues";
+          trigger_character = "#";
+          action = ''
+            function(sources, trigger_char, callback, params, git_info)
+                return sources.gitlab:get_issues(callback, git_info, trigger_char)
+            end
+          '';
+        }
+        {
+          debug_name = "gitlab_mentions";
+          trigger_character = "@";
+          action = ''
+            function(sources, trigger_char, callback, params, git_info)
+                return sources.gitlab:get_mentions(callback, git_info, trigger_char)
+            end
+          '';
+        }
+        {
+          debug_name = "gitlab_mrs";
+          trigger_character = "!";
+          action = ''
+            function(sources, trigger_char, callback, params, git_info)
+              return sources.gitlab:get_merge_requests(callback, git_info, trigger_char)
+            end
+          '';
+        }
+        {
+          debug_name = "github_issues_and_pr";
+          trigger_character = "#";
+          action = ''
+            function(sources, trigger_char, callback, params, git_info)
+              return sources.github:get_issues_and_prs(callback, git_info, trigger_char)
+            end
+          '';
+        }
+        {
+          debug_name = "github_mentions";
+          trigger_character = "@";
+          action = ''
+            function(sources, trigger_char, callback, params, git_info)
+              return sources.github:get_mentions(callback, git_info, trigger_char)
+            end
+          '';
+        }
+      ]
+      ''
+        If you want specific behaviour for a trigger or new behaviour for a trigger, you need to
+        add an entry in the `trigger_actions` list of the config.
+        The two necessary fields are the `trigger_character` and the `action`.
+      '';
+}
diff --git a/plugins/cmp/sources/cmp-git.nix b/plugins/cmp/sources/cmp-git.nix
deleted file mode 100644
index 6a241af9..00000000
--- a/plugins/cmp/sources/cmp-git.nix
+++ /dev/null
@@ -1,298 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}:
-let
-  inherit (lib) types;
-  inherit (lib.nixvim) defaultNullOpts;
-
-  cfg = config.plugins.cmp-git;
-
-  mkAction =
-    action: target:
-    defaultNullOpts.mkLuaFn "require('cmp_git.${action}').git.${target}" ''
-      Function used to ${action} the ${lib.replaceStrings [ "_" ] [ " " ] target}.
-    '';
-in
-{
-  options.plugins.cmp-git.settings = lib.nixvim.mkSettingsOption {
-    description = "Options provided to the `require('cmp_git').setup` function.";
-    options = {
-      filetypes = defaultNullOpts.mkListOf types.str [
-        "gitcommit"
-        "octo"
-      ] "Filetypes for which to trigger.";
-
-      remotes = defaultNullOpts.mkListOf types.str [
-        "upstream"
-        "origin"
-      ] "List of git remotes.";
-
-      enableRemoteUrlRewrites = defaultNullOpts.mkBool false ''
-        Whether to enable remote URL rewrites.
-      '';
-
-      git = {
-        commits = {
-          limit = defaultNullOpts.mkUnsignedInt 100 ''
-            Max number of git commits to fetch.
-          '';
-
-          sort_by = mkAction "sort" "commits";
-          format = mkAction "format" "commits";
-        };
-      };
-
-      github = {
-        hosts = defaultNullOpts.mkListOf types.str [ ] ''
-          List of private instances of github.
-        '';
-
-        issues = {
-          fields = defaultNullOpts.mkListOf types.str [
-            "title"
-            "number"
-            "body"
-            "updatedAt"
-            "state"
-          ] "The fields used for issues.";
-
-          filter = defaultNullOpts.mkStr "all" ''
-            The filter to use when fetching issues.
-          '';
-
-          limit = defaultNullOpts.mkUnsignedInt 100 ''
-            Max number of issues to fetch.
-          '';
-
-          state = defaultNullOpts.mkStr "open" ''
-            Which issues to fetch (`"open"`, `"closed"` or `"all"`).
-          '';
-
-          sort_by = mkAction "sort" "issues";
-          format = mkAction "format" "issues";
-        };
-
-        mentions = {
-          limit = defaultNullOpts.mkUnsignedInt 100 ''
-            Max number of mentions to fetch.
-          '';
-
-          sort_by = mkAction "sort" "mentions";
-          format = mkAction "format" "mentions";
-        };
-
-        pull_requests = {
-          fields = defaultNullOpts.mkListOf types.str [
-            "title"
-            "number"
-            "body"
-            "updatedAt"
-            "state"
-          ] "The fields used for pull requests.";
-
-          limit = defaultNullOpts.mkUnsignedInt 100 ''
-            Max number of pull requests to fetch.
-          '';
-
-          state = defaultNullOpts.mkStr "open" ''
-            Which issues to fetch (`"open"`, `"closed"`, `"merged"` or `"all"`).
-          '';
-
-          sort_by = mkAction "sort" "pull_requests";
-          format = mkAction "format" "pull_requests";
-        };
-      };
-
-      gitlab = {
-        hosts = defaultNullOpts.mkListOf types.str [ ] ''
-          List of private instances of gitlab.
-        '';
-
-        issues = {
-          limit = defaultNullOpts.mkUnsignedInt 100 ''
-            Max number of issues to fetch.
-          '';
-
-          state = defaultNullOpts.mkStr "open" ''
-            Which issues to fetch (`"open"`, `"closed"` or `"all"`).
-          '';
-
-          sort_by = mkAction "sort" "issues";
-          format = mkAction "format" "issues";
-        };
-
-        mentions = {
-          limit = defaultNullOpts.mkUnsignedInt 100 ''
-            Max number of mentions to fetch.
-          '';
-
-          sort_by = mkAction "sort" "mentions";
-          format = mkAction "format" "mentions";
-        };
-
-        merge_requests = {
-          limit = defaultNullOpts.mkUnsignedInt 100 ''
-            Max number of merge requests to fetch.
-          '';
-
-          state = defaultNullOpts.mkStr "open" ''
-            Which issues to fetch (`"open"`, `"closed"`, `"locked"` or `"merged"`).
-          '';
-
-          sort_by = mkAction "sort" "merge_requests";
-          format = mkAction "format" "merge_requests";
-        };
-      };
-
-      trigger_actions =
-        defaultNullOpts.mkListOf
-          (types.submodule {
-            options = {
-              debug_name = lib.nixvim.mkNullOrStr "Debug name.";
-
-              trigger_character = lib.mkOption {
-                type = types.str;
-                example = ":";
-                description = ''
-                  The trigger character.
-                  Has to be a single character
-                '';
-              };
-
-              action = lib.mkOption {
-                type = lib.types.strLuaFn;
-                description = ''
-                  The parameters to the action function are the different sources (currently `git`,
-                  `gitlab` and `github`), the completion callback, the trigger character, the
-                  parameters passed to complete from nvim-cmp, and the current git info.
-                '';
-                example = ''
-                  function(sources, trigger_char, callback, params, git_info)
-                    return sources.git:get_commits(callback, params, trigger_char)
-                  end
-                '';
-              };
-            };
-          })
-          [
-            {
-              debug_name = "git_commits";
-              trigger_character = ":";
-              action = ''
-                function(sources, trigger_char, callback, params, git_info)
-                  return sources.git:get_commits(callback, params, trigger_char)
-                end
-              '';
-            }
-            {
-              debug_name = "gitlab_issues";
-              trigger_character = "#";
-              action = ''
-                function(sources, trigger_char, callback, params, git_info)
-                    return sources.gitlab:get_issues(callback, git_info, trigger_char)
-                end
-              '';
-            }
-            {
-              debug_name = "gitlab_mentions";
-              trigger_character = "@";
-              action = ''
-                function(sources, trigger_char, callback, params, git_info)
-                    return sources.gitlab:get_mentions(callback, git_info, trigger_char)
-                end
-              '';
-            }
-            {
-              debug_name = "gitlab_mrs";
-              trigger_character = "!";
-              action = ''
-                function(sources, trigger_char, callback, params, git_info)
-                  return sources.gitlab:get_merge_requests(callback, git_info, trigger_char)
-                end
-              '';
-            }
-            {
-              debug_name = "github_issues_and_pr";
-              trigger_character = "#";
-              action = ''
-                function(sources, trigger_char, callback, params, git_info)
-                  return sources.github:get_issues_and_prs(callback, git_info, trigger_char)
-                end
-              '';
-            }
-            {
-              debug_name = "github_mentions";
-              trigger_character = "@";
-              action = ''
-                function(sources, trigger_char, callback, params, git_info)
-                  return sources.github:get_mentions(callback, git_info, trigger_char)
-                end
-              '';
-            }
-          ]
-          ''
-            If you want specific behaviour for a trigger or new behaviour for a trigger, you need to
-            add an entry in the `trigger_actions` list of the config.
-            The two necessary fields are the `trigger_character` and the `action`.
-          '';
-    };
-
-    example = {
-      remotes = [
-        "upstream"
-        "origin"
-        "foo"
-      ];
-      github.issues = {
-        filter = "all";
-        limit = 250;
-        state = "all";
-        format = ''
-          function(_, issue)
-            local icon = ({
-              open = '',
-              closed = '',
-            })[string.lower(issue.state)]
-            return string.format('%s #%d: %s', icon, issue.number, issue.title)
-          end
-        '';
-        sort_by = ''
-          function(issue)
-            local kind_rank = issue.pull_request and 1 or 0
-            local state_rank = issue.state == 'open' and 0 or 1
-            local age = os.difftime(os.time(), require('cmp_git.utils').parse_github_date(issue.updatedAt))
-            return string.format('%d%d%010d', kind_rank, state_rank, age)
-          end
-        '';
-      };
-      trigger_actions = [
-        {
-          debug_name = "git_commits";
-          trigger_character = ":";
-          action = ''
-            function(sources, trigger_char, callback, params, git_info)
-              return sources.git:get_commits(callback, params, trigger_char)
-            end
-          '';
-        }
-        {
-          debug_name = "github_issues";
-          trigger_character = "#";
-          action = ''
-            function(sources, trigger_char, callback, params, git_info)
-              return sources.github:get_issues(callback, git_info, trigger_char)
-            end
-          '';
-        }
-      ];
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    extraConfigLua = ''
-      require('cmp_git').setup(${lib.nixvim.toLuaObject cfg.settings})
-    '';
-  };
-}
diff --git a/plugins/cmp/sources/default.nix b/plugins/cmp/sources/default.nix
index 54227f6a..c217b591 100644
--- a/plugins/cmp/sources/default.nix
+++ b/plugins/cmp/sources/default.nix
@@ -69,10 +69,6 @@ let
       pluginName = "cmp-fuzzy-path";
       sourceName = "fuzzy_path";
     }
-    {
-      pluginName = "cmp-git";
-      sourceName = "git";
-    }
     {
       pluginName = "cmp-greek";
       sourceName = "greek";
@@ -198,7 +194,6 @@ in
   # For extra cmp plugins
   imports = [
     ./copilot-cmp.nix
-    ./cmp-git.nix
     ./cmp-tabnine.nix
     ./crates-nvim.nix
   ] ++ pluginModules;
diff --git a/tests/test-sources/plugins/cmp/cmp-git.nix b/tests/test-sources/plugins/by-name/cmp-git/default.nix
similarity index 100%
rename from tests/test-sources/plugins/cmp/cmp-git.nix
rename to tests/test-sources/plugins/by-name/cmp-git/default.nix