diff --git a/flake.nix b/flake.nix
index 7959a3b9..4e6069c4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -51,6 +51,7 @@
 
             plugins.undotree.enable = true;
             plugins.gitgutter.enable = true;
+            plugins.commentary.enable = true;
 
             plugins.lsp = {
               enable = true;
diff --git a/plugins/default.nix b/plugins/default.nix
index 09f84908..1d89f20c 100644
--- a/plugins/default.nix
+++ b/plugins/default.nix
@@ -9,6 +9,7 @@
     ./git/gitgutter.nix
 
     ./utils/undotree.nix
+    ./utils/commentary.nix
 
     ./languages/treesitter.nix
 
diff --git a/plugins/utils/commentary.nix b/plugins/utils/commentary.nix
new file mode 100644
index 00000000..71095afb
--- /dev/null
+++ b/plugins/utils/commentary.nix
@@ -0,0 +1,20 @@
+{ pkgs, config, lib, ... }:
+with lib;
+let
+  cfg = config.programs.nixvim.plugins.commentary;
+in
+{
+  # TODO Add support for aditional filetypes. This requires autocommands!
+
+  options = {
+    programs.nixvim.plugins.commentary = {
+      enable = mkEnableOption "Enable commentary";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    programs.nixvim = {
+      extraPlugins = [ pkgs.vimPlugins.vim-commentary ];
+    };
+  };
+}