diff --git a/plugins/by-name/commentary/default.nix b/plugins/by-name/commentary/default.nix
index a2705381..6073257b 100644
--- a/plugins/by-name/commentary/default.nix
+++ b/plugins/by-name/commentary/default.nix
@@ -1,29 +1,16 @@
 {
   lib,
   helpers,
-  config,
-  pkgs,
   ...
 }:
-with lib;
-let
-  cfg = config.plugins.commentary;
-in
-{
+helpers.vim-plugin.mkVimPlugin {
+  name = "commentary";
+  packPathName = "vim-commentary";
+  package = "vim-commentary";
+
   # TODO Add support for additional filetypes. This requires autocommands!
 
-  options = {
-    plugins.commentary = {
-      enable = mkEnableOption "commentary";
+  maintainers = [ lib.maintainers.GaetanLepage ];
 
-      package = lib.mkPackageOption pkgs "commentary" {
-        default = [
-          "vimPlugins"
-          "vim-commentary"
-        ];
-      };
-    };
-  };
-
-  config = mkIf cfg.enable { extraPlugins = [ cfg.package ]; };
+  # This plugin has no config options
 }