From e160e7ada27fd82b3803e9a67f15753001ae5e30 Mon Sep 17 00:00:00 2001
From: Dmitriy Pleshevskiy <dmitriy@pleshevski.ru>
Date: Wed, 15 May 2024 18:57:46 +0300
Subject: [PATCH] modules/vim: rename default to vimDefault

---
 modules/vim/options.nix | 293 ++++++++++++++++++++--------------------
 1 file changed, 148 insertions(+), 145 deletions(-)

diff --git a/modules/vim/options.nix b/modules/vim/options.nix
index 7e05ad5..bf9221c 100644
--- a/modules/vim/options.nix
+++ b/modules/vim/options.nix
@@ -5,16 +5,16 @@ let
   mkVimOptOption =
     key:
     { type
-    , default
+    , vimDefault
+    , default ? null
     , description ? ""
     , extraHelp ? [ ]
     , apply ? null
     }:
     lib.mkOption {
       type = lib.types.nullOr type;
-      inherit apply;
-      default = null;
-      defaultText = lib.literalExpression (builtins.toJSON default);
+      inherit apply default;
+      defaultText = lib.literalExpression (builtins.toJSON vimDefault);
       description = lib.concatLines (
         [ description "" ]
         ++ map (help: "`:help ${help}") ([ key ] ++ extraHelp)
@@ -24,7 +24,7 @@ let
 
   sharedGlobalOrWindow = with lib; with types; {
     fillchars = {
-      type = (listOf (enum [
+      type = listOf (enum [
         "stl"
         "stlnc"
         "wbr"
@@ -43,8 +43,8 @@ let
         "msgsep"
         "eob"
         "lastline"
-      ]));
-      default = [ ];
+      ]);
+      vimDefault = [ ];
       description = ''
         Characters to fill the statuslines, vertical separators and special lines in the window.
       '';
@@ -54,17 +54,19 @@ let
   sharedGlobalOrBuffer = with lib; with types; {
     autoread = {
       type = bool;
+      vimDefault = true;
       description = ''
         When a file has been detected to have been changed outside of Vim and
         it has not been changed inside of Vim, automatically read it again.
         When the file has been deleted this is not done, so you have the text
         from before it was deleted.  When it appears again then it is read.
-        |timestamp|
       '';
+      extraHelp = [ "timestamp" ];
     };
 
     backupcopy = {
-      type = (listOf (enum [ "yes" "no" "auto" "breaksymlink" "breakhardlink" ]));
+      type = listOf (enum [ "yes" "no" "auto" "breaksymlink" "breakhardlink" ]);
+      vimDefault = [ "auto" ];
       description = ''
         When writing a file and a backup is made, this option tells how it's
         done.  This is a comma-separated list of words.
@@ -73,7 +75,7 @@ let
 
     formatprg = {
       type = str;
-      default = "";
+      vimDefault = "";
       description = ''
         The name of an external program that will be used to format the lines
         selected with the |gq| operator.  The program must take the input on
@@ -83,7 +85,7 @@ let
 
     grepprg = {
       type = str;
-      default = ''
+      vimDefault = ''
         default "grep -n ",
         Unix: "grep -n $* /dev/null"
       '';
@@ -91,7 +93,7 @@ let
 
     include = {
       type = str;
-      default = ''^\s*#\s*include'';
+      vimDefault = ''^\s*#\s*include'';
       description = ''
         Pattern to be used to find an include command.
       '';
@@ -99,7 +101,7 @@ let
 
     keywordprg = {
       type = str;
-      default = ''
+      vimDefault = ''
         Windows: ":help"
         otherwise: ":Man"
       '';
@@ -109,8 +111,8 @@ let
     };
 
     lispwords = {
-      type = (listOf str);
-      default = is very long;
+      type = listOf str;
+      vimDefault = is very long;
       description = ''
         list of words that influence the Lisp indenting when
         enabled with the |'lisp'| option.
@@ -119,7 +121,7 @@ let
 
     makeencoding = {
       type = str;
-      default = "";
+      vimDefault = "";
       description = ''
         Encoding used for reading the output of external commands.  When empty,
         encoding is not converted.
@@ -167,7 +169,7 @@ let
 
     arabicshape = {
       type = bool;
-      default = false;
+      vimDefault = false;
       description = ''
         When on and 'termbidi' is off, the required visual character
         corrections that need to take place for displaying the Arabic language
@@ -219,7 +221,7 @@ let
     };
 
     backspace = {
-      type = (listOf (enum [ "indent" "eol" "start" "nostop" ]));
+      type = listOf (enum [ "indent" "eol" "start" "nostop" ]);
       description = ''
         Influences the working of <BS>, <Del>, CTRL-W and CTRL-U in Insert
         mode.  This is a list of items, separated by commas.  Each item allows
@@ -243,7 +245,7 @@ let
     };
 
     backupdir = {
-      type = (listOf (either str path));
+      type = listOf (either str path);
       description = ''
         List of directories for the backup file, separated with commas.
  
@@ -264,7 +266,7 @@ let
     };
 
     backupskip = {
-      type = (listOf (either str path));
+      type = listOf (either str path);
       description = ''
         A list of file patterns.  When one of the patterns matches with the
         name of the file which is written, no backup file is created.  Both
@@ -278,7 +280,7 @@ let
     };
 
     belloff = {
-      type = (listOf (enum [
+      type = listOf (enum [
         "all"
         "backspace"
         "cursor"
@@ -296,7 +298,7 @@ let
         "shell"
         "spell"
         "willmode"
-      ]));
+      ]);
       description = ''
         Specifies for which events the bell will not be rung. It is a comma-
         separated list of items. For each item that is present, the bell
@@ -353,7 +355,7 @@ let
     };
 
     casemap = {
-      type = (listOf (enum [ "internal" "keepascii" ]));
+      type = listOf (enum [ "internal" "keepascii" ]);
       description = ''
         Specifies details about changing the case of letters.  It may contain
         these words, separated by a comma:
@@ -377,7 +379,7 @@ let
 
     charconvert = {
       type = str;
-      default = "";
+      vimDefault = "";
       description = ''
         An expression that is used for character encoding conversion.  It is
         evaluated when a file that is to be read or has been written has a
@@ -387,7 +389,7 @@ let
     };
 
     clipboard = {
-      type = (listOf (enum [ "unnamed" "unnamedplus" ]));
+      type = listOf (enum [ "unnamed" "unnamedplus" ]);
       description = ''
         This option is a list of comma-separated names.
  
@@ -411,14 +413,14 @@ let
     };
 
     completeopt = {
-      type = (listOf (enum [
+      type = listOf (enum [
         "menu"
         "menuone"
         "longest"
         "preview"
         "noinsert"
         "noselect"
-      ]));
+      ]);
       description = ''
         A comma-separated list of options for Insert mode completion |ins-completion|.
  
@@ -441,7 +443,7 @@ let
 
     cpoptions = {
       type = str;
-      default = true;
+      vimDefault = true;
       description = ''
         A sequence of single character flags.  When a character is present
         this indicates Vi-compatible behavior.  This is used for things where
@@ -453,7 +455,7 @@ let
     };
 
     debug = {
-      type = (listOf (enum [ "msg" "throw" "beep" ]));
+      type = listOf (enum [ "msg" "throw" "beep" ]);
       description = ''
         These values can be used:
         - msg	Error messages that would otherwise be omitted will be given anyway.
@@ -487,7 +489,7 @@ let
     };
 
     dictionary = {
-      type = (listOf (either str path));
+      type = listOf (either str path);
       description = ''
         List of file names, separated by commas, that are used to lookup words
         for keyword completion commands |i_CTRL-X_CTRL-K|.  Each file should
@@ -509,7 +511,7 @@ let
     };
 
     diffopt = {
-      type = (listOf str);
+      type = listOf str;
       description = ''
         Option settings for diff mode.
  
@@ -526,7 +528,7 @@ let
     };
 
     directory = {
-      type = (listOf (either str path));
+      type = listOf (either str path);
       description = ''
         List of directory names for the swap file, separated with commas.
  
@@ -534,7 +536,7 @@ let
     };
 
     display = {
-      type = (listOf (enum [ "lastline" "truncate" "uhex" "msgsep" ]));
+      type = listOf (enum [ "lastline" "truncate" "uhex" "msgsep" ]);
       description = ''
         Change the way text is displayed.
  
@@ -582,7 +584,7 @@ let
 
     errorbells = {
       type = bool;
-      default = false;
+      vimDefault = false;
       description = ''
         Ring the bell (beep or screen flash) for error messages.  This only
         makes a difference for error messages, the bell will be used always
@@ -593,7 +595,7 @@ let
 
     errorfile = {
       type = str;
-      default = "errors.err";
+      vimDefault = "errors.err";
       description = ''
         Name of the errorfile for the QuickFix mode.
  
@@ -610,8 +612,8 @@ let
     };
 
     eventignore = {
-      type = (listOf str);
-      default = [ ];
+      type = listOf str;
+      vimDefault = [ ];
       description = ''
         A list of autocommand event names, which are to be ignored.
         When set to "all" or when "all" is one of the items, all autocommand
@@ -622,7 +624,7 @@ let
 
     exrc = {
       type = bool;
-      default = false;
+      vimDefault = false;
       description = ''
         Automatically execute .nvim.lua, .nvimrc, and .exrc files in the
         current directory, if the file is in the |trust| list. Use |:trust| to
@@ -633,8 +635,8 @@ let
     };
 
     fileencodings = {
-      type = (listOf str);
-      default = ''["ucs-bom" "utf-8" "default" "latin1"]'';
+      type = listOf str;
+      vimDefault = ''["ucs-bom" "utf-8" "default" "latin1"]'';
       description = ''
         This is a list of character encodings considered when starting to edit
         an existing file.
@@ -643,8 +645,8 @@ let
     };
 
     fileformats = {
-      type = (listOf (enum [ "dos" "unix" "mac" ]));
-      default = ''
+      type = listOf (enum [ "dos" "unix" "mac" ]);
+      vimDefault = ''
         Windows default: ["dos" "unix"],
         Unix default: ["unix" "dos"]
       '';
@@ -658,7 +660,7 @@ let
 
     fileignorecase = {
       type = bool;
-      default = ''
+      vimDefault = ''
         `true` for systems where case in file names is normally ignored"
       '';
       description = ''
@@ -669,7 +671,7 @@ let
 
     foldclose = {
       type = str;
-      default = "";
+      vimDefault = "";
       description = ''
         When set to "all", a fold is closed when the cursor isn't in it and
         its level is higher than 'foldlevel'.  Useful if you want folds to
@@ -680,7 +682,7 @@ let
 
     foldlevelstart = {
       type = number;
-      default = -1;
+      vimDefault = -1;
       description = ''
         Sets 'foldlevel' when starting to edit another buffer in a window.
         Useful to always start editing with all folds closed (value zero),
@@ -693,7 +695,7 @@ let
     };
 
     foldopen = {
-      type = (listOf (enum [
+      type = listOf (enum [
         "all"
         "block"
         "hor"
@@ -705,8 +707,8 @@ let
         "search"
         "tag"
         "undo"
-      ]));
-      default = ''
+      ]);
+      vimDefault = ''
         [
           "block"
           "hor"
@@ -728,7 +730,7 @@ let
 
     fsync = {
       type = bool;
-      default = true;
+      vimDefault = true;
       description = ''
         When on, the OS function fsync() will be called after saving a file
         (|:write|, |writefile()|, …), |swap-file|, |undo-persistence| and |shada-file|.
@@ -739,9 +741,9 @@ let
       '';
     };
 
-    gdefault = {
+    gvimDefault = {
       type = bool;
-      default = false;
+      vimDefault = false;
       description = ''
         When on, the ":substitute" flag 'g' is default on.  This means that
         all matches in a line are substituted instead of one.  When a 'g' flag
@@ -753,7 +755,7 @@ let
 
     grepformat = {
       type = str;
-      default = ''%f:%l:%m,%f:%l%m,%f  %l%m'';
+      vimDefault = ''%f:%l:%m,%f:%l%m,%f  %l%m'';
       description = ''
         Format to recognize for the ":grep" command output.
  
@@ -763,7 +765,7 @@ let
 
     guicursor = {
       type = str;
-      default = "n-v-c-sm:block,i-ci-ve:ver25,r-cr-o:hor20";
+      vimDefault = "n-v-c-sm:block,i-ci-ve:ver25,r-cr-o:hor20";
       description = ''
         Configures the cursor style for each mode. Works in the GUI and many
         terminals.  See |tui-cursor-shape|.
@@ -774,8 +776,8 @@ let
     };
 
     guifont = {
-      type = (listOf str);
-      default = [ ];
+      type = listOf str;
+      vimDefault = [ ];
       description = ''
         This is a list of fonts which will be used for the GUI version of Vim.
         In its simplest form the value is just one font name.  When
@@ -787,8 +789,8 @@ let
     };
 
     guifontwide = {
-      type = (listOf str);
-      default = [ ];
+      type = listOf str;
+      vimDefault = [ ];
       description = ''
         list of fonts to be used for double-width characters.
         The first font that can be loaded is used.
@@ -798,7 +800,7 @@ let
 
     guioptions = {
       type = str;
-      default = "egmrLT";
+      vimDefault = "egmrLT";
       description = ''
         This option only has an effect in the GUI version of Vim.  It is a
         sequence of letters which describes what components and options of the
@@ -809,7 +811,7 @@ let
 
     guitablabel = {
       type = str;
-      default = "";
+      vimDefault = "";
       description = ''
         When non-empty describes the text to use in a label of the GUI tab
         pages line.  When empty and when the result is empty Vim will use a
@@ -821,7 +823,7 @@ let
 
     guitabtooltip = {
       type = str;
-      default = "";
+      vimDefault = "";
       description = ''
         When non-empty describes the text to use in a tooltip for the GUI tab
         pages line.  When empty Vim will use a default tooltip.
@@ -831,7 +833,7 @@ let
 
     helpfile = {
       type = (either str path);
-      default = ''
+      vimDefault = ''
         default (MS-Windows) "$VIMRUNTIME\doc\help.txt"
                 (others) "$VIMRUNTIME/doc/help.txt"
  
@@ -840,7 +842,7 @@ let
 
     helpheight = {
       type = number;
-      default = 20;
+      vimDefault = 20;
       description = ''
         Minimal initial height of the help window when it is opened with the ":help" command.
  
@@ -848,8 +850,8 @@ let
     };
 
     helplang = {
-      type = (listOf str);
-      default = messages language or empty;
+      type = listOf str;
+      vimDefault = messages language or empty;
       description = ''
         list of languages.  Vim will use the first language
         for which the desired help can be found.
@@ -859,7 +861,7 @@ let
 
     hidden = {
       type = bool;
-      default = true;
+      vimDefault = true;
       description = ''
         When off a buffer is unloaded (including loss of undo information)
         when it is abandoned.  When on a buffer becomes hidden when it is
@@ -875,7 +877,7 @@ let
 
     history = {
       type = number;
-      default = 10000;
+      vimDefault = 10000;
       description = ''
         A history of ":" commands, and a history of previous search patterns
         is remembered.  This option decides how many entries may be stored in
@@ -889,7 +891,7 @@ let
 
     hlsearch = {
       type = bool;
-      default = true;
+      vimDefault = true;
       description = ''
         When there is a previous search pattern, highlight all its matches.
  
@@ -902,7 +904,7 @@ let
 
     icon = {
       type = bool;
-      default = false;
+      vimDefault = false;
       description = ''
         When on, the icon text of the window will be set to the value of
         'iconstr' (if it is not empty), or to the name of the file
@@ -916,7 +918,7 @@ let
 
     iconstring = {
       type = str;
-      default = "";
+      vimDefault = "";
       description = ''
         When this option is not empty, it will be used for the icon text of the window.
  
@@ -925,7 +927,7 @@ let
 
     ignorecase = {
       type = bool;
-      default = false;
+      vimDefault = false;
       description = ''
         Ignore case in search patterns.  Also used when searching in the tags file.
 
@@ -936,7 +938,7 @@ let
 
     imcmdline = {
       type = bool;
-      default = false;
+      vimDefault = false;
       description = ''
         When set the Input Method is always on when starting to edit a command
         line, unless entering a search pattern.
@@ -947,7 +949,7 @@ let
 
     imdisable = {
       type = bool;
-      default = ''
+      vimDefault = ''
         false
         true for some systems (SGI)
       '';
@@ -960,7 +962,7 @@ let
 
     inccommand = {
       type = (enum [ "nosplit" "split" ]);
-      default = "nosplit";
+      vimDefault = "nosplit";
       description = ''
         When nonempty, shows the effects of |:substitute|, |:smagic|,
         |:snomagic| and user commands with the |:command-preview| flag as you
@@ -971,7 +973,7 @@ let
 
     incsearch = {
       type = bool;
-      default = true;
+      vimDefault = true;
       description = ''
         While typing a search command, show where the pattern, as it was typed
         so far, matches.  The matched str is highlighted.  If the pattern
@@ -982,7 +984,7 @@ let
 
     isfname = {
       type = str;
-      default = ''
+      vimDefault = ''
         Windows: "@,48-57,/,\,.,-,_,+,,,#,$,%,{,},[,],:,@-@,!,~,="
         otherwise: "@,48-57,/,.,-,_,+,,,#,$,%,~,="
       '';
@@ -990,7 +992,7 @@ let
 
     isident = {
       type = str;
-      default = ''
+      vimDefault = ''
         Windows: "@,48-57,_,128-167,224-235"
         otherwise: "@,48-57,_,192-255"
       '';
@@ -1004,7 +1006,7 @@ let
 
     isprint = {
       type = str;
-      default = "@,161-255";
+      vimDefault = "@,161-255";
       description = ''
         The characters given by this option are displayed directly on the
         screen.  It is also used for "\p" in a |pattern|.
@@ -1015,7 +1017,7 @@ let
 
     jumpoptions = {
       type = str;
-      default = "";
+      vimDefault = "";
       description = ''
         List of words that change the behavior of the |jumplist|
  
@@ -1025,7 +1027,7 @@ let
 
     joinspaces = {
       type = bool;
-      default = false;
+      vimDefault = false;
       description = ''
         Insert two spaces after a '.', '?' and '!' with a join command.
         Otherwise only one space is inserted.
@@ -1034,8 +1036,8 @@ let
     };
 
     keymodel = {
-      type = (listOf str);
-      default = [ ];
+      type = listOf str;
+      vimDefault = [ ];
       description = ''
         List of comma-separated words, which enable special things that keys can do.
  
@@ -1043,8 +1045,8 @@ let
     };
 
     langmap = {
-      type = (listOf str);
-      default = [ ];
+      type = listOf str;
+      vimDefault = [ ];
       description = ''
         This option allows switching your keyboard into a special language
         mode.  When you are typing text in Insert mode the characters are
@@ -1058,7 +1060,7 @@ let
 
     langmenu = {
       type = str;
-      default = "";
+      vimDefault = "";
       description = ''
         Language to use for menu translation.
  
@@ -1067,7 +1069,7 @@ let
 
     langremap = {
       type = bool;
-      default = false;
+      vimDefault = false;
       description = ''
         When off, setting 'langmap' does not apply to characters resulting from
         a mapping.  If setting 'langmap' disables some of your mappings, make
@@ -1078,7 +1080,7 @@ let
 
     laststatus = {
       type = number;
-      default = 2;
+      vimDefault = 2;
       description = ''
         The value of this option influences when the last window will have a
         status line:
@@ -1092,7 +1094,7 @@ let
 
     lazyredraw = {
       type = bool;
-      default = false;
+      vimDefault = false;
       description = ''
         When this option is set, the screen will not be redrawn while
         executing macros, registers and other commands that have not been
@@ -1105,7 +1107,7 @@ let
 
     linespace = {
       type = number;
-      default = 0;
+      vimDefault = 0;
       description = ''
         Number of pixel lines inserted between characters.  Useful if the font
         uses the full character cell height, making lines touch each other.
@@ -1116,7 +1118,7 @@ let
 
     loadplugins = {
       type = bool;
-      default = true;
+      vimDefault = true;
       description = ''
         When on the plugin scripts are loaded when starting up |load-plugins|.
         This option can be reset in your |vimrc| file to disable the loading
@@ -1127,7 +1129,7 @@ let
 
     magic = {
       type = bool;
-      default = true;
+      vimDefault = true;
       description = ''
         Changes the special characters that can be used in search patterns.
         See |pattern|.
@@ -1139,7 +1141,7 @@ let
 
     makeef = {
       type = (either str path);
-      default = "";
+      vimDefault = "";
       description = ''
         Name of the errorfile for the |:make| command (see |:make_makeprg|)
         and the |:grep| command.
@@ -1154,7 +1156,7 @@ let
   window = with lib; with types; sharedGlobalOrWindow // {
     arabic = {
       type = bool;
-      default = false;
+      vimDefault = false;
       description = ''
         This option can be set to start editing Arabic text.
  
@@ -1163,7 +1165,7 @@ let
 
     breakindent = {
       type = bool;
-      default = false;
+      vimDefault = false;
       description = ''
         Every wrapped line will continue visually indented (same amount of
         space as the beginning of that line), thus preserving horizontal blocks
@@ -1174,7 +1176,7 @@ let
 
     breakindentopt = {
       type = commas;
-      default = [ ];
+      vimDefault = [ ];
       description = ''
         Settings for 'breakindent
  
@@ -1183,7 +1185,7 @@ let
 
     colorcolumn = {
       type = commas;
-      default = [ ];
+      vimDefault = [ ];
       description = ''
         'colorcolumn' is a comma-separated list of screen columns that are
         highlighted with ColorColumn |hl-ColorColumn|.  Useful to align
@@ -1194,7 +1196,7 @@ let
 
     concealcursor = {
       type = str;
-      default = "";
+      vimDefault = "";
       description = ''
         Sets the modes in which text in the cursor line can also be concealed.
  
@@ -1203,7 +1205,7 @@ let
 
     conceallevel = {
       type = number;
-      default = 0;
+      vimDefault = 0;
       description = ''
         Determine how text with the "conceal" syntax attribute |:syn-conceal|
         is shown
@@ -1214,7 +1216,7 @@ let
 
     cursorbind = {
       type = bool;
-      default = false;
+      vimDefault = false;
       description = ''
         When this option is set, as the cursor in the current
         window moves other cursorbound windows (windows that also have
@@ -1226,7 +1228,7 @@ let
 
     foldcolumn = {
       type = str;
-      default = "0";
+      vimDefault = "0";
       description = ''
         When and how to draw the foldcolumn. Valid values are:
             "auto":       resize to the minimum amount of folds to display.
@@ -1240,7 +1242,7 @@ let
 
     foldenable = {
       type = bool;
-      default = false;
+      vimDefault = false;
       description = ''
         When off, all folds are open.  This option can be used to quickly
         switch between showing all text unfolded and viewing the text with
@@ -1254,7 +1256,7 @@ let
 
     foldexpr = {
       type = str;
-      default = "0";
+      vimDefault = "0";
       description = ''
         The expression used for when 'foldmethod' is "expr".  It is evaluated
         for each line to obtain its fold level.
@@ -1265,7 +1267,7 @@ let
 
     foldignore = {
       type = str;
-      default = "#";
+      vimDefault = "#";
       description = ''
         Used only when 'foldmethod' is "indent".  Lines starting with
         characters in 'foldignore' will get their fold level from surrounding
@@ -1277,7 +1279,7 @@ let
 
     foldlevel = {
       type = number;
-      default = 0;
+      vimDefault = 0;
       description = ''
         Sets the fold level: Folds with a higher level will be closed.
         Setting this option to zero will close all folds.  Higher numbers will
@@ -1289,9 +1291,9 @@ let
     };
 
     foldmarker = {
-      type = (listOf str);
+      type = listOf str;
       apply = x: assert (x == null || builtins.length x == 2 || abort "`foldmarker` must contain start and end markers in the list"); x;
-      default = ''["{{{" "}}}"]'';
+      vimDefault = ''["{{{" "}}}"]'';
       description = ''
         The start and end marker used when 'foldmethod' is "marker".
  
@@ -1300,7 +1302,7 @@ let
 
     foldmethod = {
       type = (enum [ "manual" "indent" "expr" "marker" "syntax" "diff" ]);
-      default = "manual";
+      vimDefault = "manual";
       description = ''
         The kind of folding used for the current window.
       '';
@@ -1316,7 +1318,7 @@ let
 
     foldminlines = {
       type = number;
-      default = 1;
+      vimDefault = 1;
       description = ''
         Sets the number of screen lines above which a fold can be displayed
         closed.  Also for manually closed folds.
@@ -1326,7 +1328,7 @@ let
 
     foldnestmax = {
       type = number;
-      default = 20;
+      vimDefault = 20;
       description = ''
         Sets the maximum nesting of folds for the "indent" and "syntax"
         methods.  This avoids that too many folds will be created.  Using more
@@ -1337,7 +1339,7 @@ let
 
     foldtext = {
       type = str;
-      default = "foldtext()";
+      vimDefault = "foldtext()";
       description = ''
         An expression which is used to specify the text displayed for a closed fold.
  
@@ -1347,7 +1349,7 @@ let
 
     linebreak = {
       type = bool;
-      default = false;
+      vimDefault = false;
       description = ''
         If on, Vim will wrap long lines at a character in 'breakat' rather
         than at the last character that fits on the screen.  Unlike
@@ -1359,7 +1361,7 @@ let
 
     list = {
       type = bool;
-      default = false;
+      vimDefault = false;
       description = ''
         List mode: By default, show tabs as ">", trailing spaces as "-", and
         non-breakable space characters as "+". Useful to see the difference
@@ -1484,7 +1486,7 @@ let
   buffer = with lib; with types; sharedGlobalOrBuffer // {
     autoindent = {
       type = bool;
-      default = true;
+      vimDefault = true;
       description = ''
         Copy indent from current line when starting a new line (typing <CR>
         in Insert mode or when using the "o" or "O" command).  If you do not
@@ -1496,7 +1498,7 @@ let
 
     binary = {
       type = bool;
-      default = false;
+      vimDefault = false;
       description = ''
         This option should be set before editing a binary file.  You can also
         use the |-b| Vim argument.
@@ -1505,7 +1507,7 @@ let
 
     bomb = {
       type = bool;
-      default = false;
+      vimDefault = false;
       description = ''
         When writing a file and the following conditions are met, a BOM (Byte
         Order Mark) is prepended to the file:
@@ -1519,7 +1521,7 @@ let
 
     bufhidden = {
       type = (enum [ "" "hide" "unload" "delete" "wipe" ]);
-      default = "";
+      vimDefault = "";
       description = ''
         This option specifies what happens when a buffer is no longer
         displayed in a window
@@ -1529,7 +1531,7 @@ let
 
     buflisted = {
       type = bool;
-      default = true;
+      vimDefault = true;
       description = ''
         When this option is set, the buffer shows up in the buffer list.
  
@@ -1538,7 +1540,7 @@ let
 
     buftype = {
       type = (enum [ "" "acwrite" "help" "nofile" "nowrite" "quickfix" "terminal" "prompt" ]);
-      default = "";
+      vimDefault = "";
       description = ''
         This option is used together with 'bufhidden' and 'swapfile' to
         specify special kinds of buffers.
@@ -1549,7 +1551,7 @@ let
 
     cindent = {
       type = bool;
-      default = false;
+      vimDefault = false;
       description = ''
         Enables automatic C program indenting.
  
@@ -1558,7 +1560,7 @@ let
 
     cinkeys = {
       type = str;
-      default = "0{,0},0),0],:,0#,!^F,o,O,e";
+      vimDefault = "0{,0},0),0],:,0#,!^F,o,O,e";
       description = ''
         A list of keys that, when typed in Insert mode, cause reindenting of
         the current line.
@@ -1568,7 +1570,7 @@ let
 
     cinoptions = {
       type = str;
-      default = "";
+      vimDefault = "";
       description = ''
         The 'cinoptions' affect the way 'cindent' reindents lines in a C
         program.
@@ -1578,7 +1580,7 @@ let
 
     cinwords = {
       type = commas;
-      default = ''["if" "else" "while" "do" "for" "switch"]'';
+      vimDefault = ''["if" "else" "while" "do" "for" "switch"]'';
       descrpition = ''
         These keywords start an extra indent in the next line when
         'smartindent' or 'cindent' is set.  For 'cindent' this is only done at
@@ -1589,7 +1591,7 @@ let
 
     cinscopedecls = {
       type = commas;
-      default = ''["public" "protected" "private"]'';
+      vimDefault = ''["public" "protected" "private"]'';
       descrpition = ''
         Keywords that are interpreted as a C++ scope declaration by |cino-g|.
         Useful e.g. for working with the Qt framework that defines additional
@@ -1600,7 +1602,7 @@ let
 
     comments = {
       type = commas;
-      default = ''
+      vimDefault = ''
         [
           "s1/*"
           "mb:8"
@@ -1622,7 +1624,7 @@ let
 
     commentstring = {
       type = str;
-      default = "";
+      vimDefault = "";
       description = ''
         A template for a comment.  The "%s" in the value is replaced with the
         comment text.  Currently only used to add markers for folding, see
@@ -1634,7 +1636,7 @@ let
 
     complete = {
       type = commas;
-      default = ''["." "w" "b" "u" "t"]'';
+      vimDefault = ''["." "w" "b" "u" "t"]'';
       description = ''
         This option specifies how keyword completion |ins-completion| works
         when CTRL-P or CTRL-N are used.
@@ -1645,7 +1647,7 @@ let
 
     completefunc = {
       type = str;
-      default = "";
+      vimDefault = "";
       description = ''
         This option specifies a function to be used for Insert mode completion
         with CTRL-X CTRL-U.
@@ -1659,7 +1661,7 @@ let
 
     copyindent = {
       type = bool;
-      default = false;
+      vimDefault = false;
       description = ''
         Copy the structure of the existing lines indent when autoindenting a
         new line.  Normally the new indent is reconstructed by a series of
@@ -1677,7 +1679,7 @@ let
 
     expandtab = {
       type = bool;
-      default = false;
+      vimDefault = false;
       description = ''
         In Insert mode: Use the appropriate number of spaces to insert a
         <Tab>.  Spaces are used in indents with the '>' and '<' commands and
@@ -1688,7 +1690,7 @@ let
 
     fileencoding = {
       type = str;
-      default = "";
+      vimDefault = "";
       description = ''
         File-content encoding for the current buffer. Conversion is done with
         iconv() or as specified with 'charconvert'.
@@ -1703,7 +1705,7 @@ let
 
     fileformat = {
       type = (enum [ "dos" "unix" "mac" ]);
-      default = ''
+      vimDefault = ''
         Windows default: "dos",
         Unix default: "unix"
       '';
@@ -1734,7 +1736,7 @@ let
 
     fixendofline = {
       type = bool;
-      default = true;
+      vimDefault = true;
       description = ''
         When writing a file and this option is on, <EOL> at the end of file
         will be restored if missing.  Turn this option off if you want to
@@ -1752,7 +1754,7 @@ let
 
     formatexpr = {
       type = str;
-      default = "";
+      vimDefault = "";
       description = ''
         Expression which is evaluated to format a range of lines for the |gq|
         operator or automatic formatting (see 'formatoptions').  When this
@@ -1763,7 +1765,7 @@ let
 
     formatlistpat = {
       type = str;
-      default = ''^\s*\d\+[\]:.)}\t ]\s*'';
+      vimDefault = ''^\s*\d\+[\]:.)}\t ]\s*'';
       description = ''
         A pattern that is used to recognize a list header.  This is used for
         the "n" flag in 'formatoptions'.
@@ -1776,7 +1778,7 @@ let
 
     formatoptions = {
       type = str;
-      default = "tcqj";
+      vimDefault = "tcqj";
       description = ''
         This is a sequence of letters which describes how automatic
         formatting is to be done.
@@ -1787,7 +1789,7 @@ let
 
     iminsert = {
       type = number;
-      default = 0;
+      vimDefault = 0;
       description = ''
         Specifies whether :lmap or an Input Method (IM) is to be used in
         Insert mode.  Valid values:
@@ -1800,7 +1802,7 @@ let
 
     imsearch = {
       type = number;
-      default = -1;
+      vimDefault = -1;
       description = ''
         Specifies whether :lmap or an Input Method (IM) is to be used when
         entering a search pattern.  Valid values:
@@ -1815,7 +1817,7 @@ let
 
     includexpr = {
       type = str;
-      default = "";
+      vimDefault = "";
       description = ''
         Expression to be used to transform the str found with the 'include'
         option to a file name.
@@ -1825,7 +1827,7 @@ let
 
     indentexpr = {
       type = str;
-      default = "";
+      vimDefault = "";
       description = ''
         Expression which is evaluated to obtain the proper indent for a line.
         It is used when a new line is created, for the |=| operator and
@@ -1836,7 +1838,7 @@ let
 
     indentkeys = {
       type = str;
-      default = "0{,0},0),0],:,0#,!^F,o,O,e";
+      vimDefault = "0{,0},0),0],:,0#,!^F,o,O,e";
       description = ''
         A list of keys that, when typed in Insert mode, cause reindenting of
         the current line.
@@ -1846,7 +1848,7 @@ let
 
     infercase = {
       type = bool;
-      default = false;
+      vimDefault = false;
       description = ''
         When doing keyword completion in insert mode |ins-completion|, and
         'ignorecase' is also on, the case of the match is adjusted depending
@@ -1859,7 +1861,7 @@ let
 
     iskeyward = {
       type = str;
-      default = "@,48-57,_,192-255";
+      vimDefault = "@,48-57,_,192-255";
       description = ''
         Keywords are used in searching and recognizing with many commands:
         "w", "*", "[i", etc.  It is also used for "\k" in a |pattern|.
@@ -1870,7 +1872,7 @@ let
 
     keymap = {
       type = str;
-      default = "";
+      vimDefault = "";
       description = ''
         Name of a keyboard mapping.
  
@@ -1880,7 +1882,7 @@ let
 
     lisp = {
       type = bool;
-      default = false;
+      vimDefault = false;
       description = ''
         Lisp mode: When <Enter> is typed in insert mode set the indent for
         the next line to Lisp standards (well, sort of).  Also happens with
@@ -1890,8 +1892,8 @@ let
     };
 
     lispoptions = {
-      type = (listOf str);
-      default = [ ];
+      type = listOf str;
+      vimDefault = [ ];
       description = ''
         list of items that influence the Lisp indenting when
         enabled with the |'lisp'| option.  Currently only one item is
@@ -1900,6 +1902,7 @@ let
         - expr:1	use 'indentexpr' for Lisp indenting when it is set
         - expr:0	do not use 'indentexpr' for Lisp indenting (default)
       '';
+      extraHelp = [ "list" ];
     };
   };
 in