diff --git a/configs/nixvim/fiesta/default.nix b/configs/nixvim/fiesta/default.nix
index 9fe1eb20..20696fcf 100644
--- a/configs/nixvim/fiesta/default.nix
+++ b/configs/nixvim/fiesta/default.nix
@@ -14,6 +14,7 @@
       fuzzy-finder.enable = true;
       debugging.enable = true;
       desktop-utils.enable = true;
+      qol.enable = true;
     };
 
     # Some general settings.
@@ -46,7 +47,5 @@
         options.desc = "Delete current buffer";
       }
     ];
-
-    plugins.nvim-autopairs.enable = true;
   };
 }
diff --git a/configs/nixvim/fiesta/modules/default.nix b/configs/nixvim/fiesta/modules/default.nix
index 1ad0ea51..5a9e5845 100644
--- a/configs/nixvim/fiesta/modules/default.nix
+++ b/configs/nixvim/fiesta/modules/default.nix
@@ -8,6 +8,7 @@
     ./setups/lsp.nix
     ./setups/note-taking.nix
     ./setups/snippets
+    ./setups/qol.nix
     ./setups/treesitter.nix
     ./setups/ui.nix
   ];
diff --git a/configs/nixvim/fiesta/modules/setups/qol.nix b/configs/nixvim/fiesta/modules/setups/qol.nix
new file mode 100644
index 00000000..7f37e1da
--- /dev/null
+++ b/configs/nixvim/fiesta/modules/setups/qol.nix
@@ -0,0 +1,25 @@
+{ config, lib, helpers, ... }:
+
+let
+  nixvimCfg = config.nixvimConfigs.fiesta;
+  cfg = nixvimCfg.setups.devenvs;
+in
+{
+  options.nixvimConfigs.fiesta.setups.qol.enable =
+    lib.mkEnableOption "quality-of-life improvements";
+
+  config = lib.mkIf cfg.enable {
+    plugins.mini = {
+      enable = true;
+      modules = {
+        ai = {
+          n_lines = 50;
+          search_method = "cover_or_next";
+        };
+        surround = { };
+        align = { };
+        bracketed = { };
+      };
+    };
+  };
+}