diff --git a/plugins/bufferlines/barbecue.nix b/plugins/bufferlines/barbecue.nix
index 89f63c9a..628018f6 100644
--- a/plugins/bufferlines/barbecue.nix
+++ b/plugins/bufferlines/barbecue.nix
@@ -24,13 +24,19 @@ in
       Whether to create winbar updater autocmd.
     '';
 
-    includeBuftypes = mkListStr ''[""]'' ''
+    includeBuftypes = mkListStr [ "" ] ''
       Buftypes to enable winbar in.
     '';
 
-    excludeFiletypes = mkListStr ''["netrw" "toggleterm"]'' ''
-      Filetypes not to enable winbar in.
-    '';
+    excludeFiletypes =
+      mkListStr
+        [
+          "netrw"
+          "toggleterm"
+        ]
+        ''
+          Filetypes not to enable winbar in.
+        '';
 
     modifiers = {
       dirname = helpers.defaultNullOpts.mkStr ":~:." ''
diff --git a/plugins/bufferlines/bufferline.nix b/plugins/bufferlines/bufferline.nix
index 0dce187d..803b5413 100644
--- a/plugins/bufferlines/bufferline.nix
+++ b/plugins/bufferlines/bufferline.nix
@@ -208,7 +208,7 @@ in
           "nvim_lsp"
           "coc"
         ])
-      ) "false" "diagnostics";
+      ) false "diagnostics";
 
       diagnosticsIndicator = helpers.defaultNullOpts.mkLuaFn null "Either `null` or a function that returns the diagnostics indicator.";
 
@@ -217,7 +217,7 @@ in
       offsets = helpers.defaultNullOpts.mkNullable (types.listOf types.attrs) null "offsets";
 
       groups = {
-        items = helpers.defaultNullOpts.mkNullable (types.listOf types.attrs) "[]" "List of groups.";
+        items = helpers.defaultNullOpts.mkListOf types.attrs [ ] "List of groups.";
 
         options = {
           toggleHiddenOnEnter = helpers.defaultNullOpts.mkBool true "Re-open hidden groups on bufenter.";
@@ -227,7 +227,7 @@ in
       hover = {
         enabled = mkEnableOption "hover";
 
-        reveal = helpers.defaultNullOpts.mkNullable (types.listOf types.str) "[]" "reveal";
+        reveal = helpers.defaultNullOpts.mkListOf types.str [ ] "reveal";
 
         delay = helpers.defaultNullOpts.mkInt 200 "delay";
       };
diff --git a/plugins/bufferlines/navic.nix b/plugins/bufferlines/navic.nix
index 232d91ec..e936e5cb 100644
--- a/plugins/bufferlines/navic.nix
+++ b/plugins/bufferlines/navic.nix
@@ -49,11 +49,17 @@ in
         Enable to have nvim-navic automatically attach to every LSP for current buffer. Its disabled by default.
       '';
 
-      preference = helpers.defaultNullOpts.mkNullable (with types; listOf str) "[]" ''
-        Table ranking lsp_servers. Lower the index, higher the priority of the server. If there are more than one server attached to a buffer. In the example below will prefer clangd over pyright
-
-        Example: `[ "clangd" "pyright" ]`.
-      '';
+      preference = helpers.defaultNullOpts.mkListOf' {
+        type = types.str;
+        pluginDefault = [ ];
+        example = [
+          "clangd"
+          "pyright"
+        ];
+        description = ''
+          Table ranking lsp_servers. Lower the index, higher the priority of the server. If there are more than one server attached to a buffer. In the example below will prefer clangd over pyright
+        '';
+      };
     };
 
     highlight = helpers.defaultNullOpts.mkBool false ''