From ec61ca9b086b1bdfc45f78effbd34d2ce8a91b9c Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Sun, 8 Sep 2024 13:52:18 +0100 Subject: [PATCH] plugins: fix "int flag" style options --- plugins/colorschemes/one.nix | 2 +- plugins/git/committia.nix | 6 +-- plugins/git/lazygit.nix | 16 +++---- plugins/languages/ledger.nix | 30 ++++++------- .../languages/markdown/markdown-preview.nix | 40 ++++++++--------- plugins/languages/typst/typst-vim.nix | 8 ++-- plugins/languages/vim-slime.nix | 16 +++---- plugins/languages/zig.nix | 6 +-- plugins/statuslines/airline.nix | 44 +++++++++---------- plugins/utils/direnv.nix | 8 ++-- plugins/utils/goyo.nix | 2 +- plugins/utils/sandwich.nix | 8 ++-- plugins/utils/sleuth.nix | 14 +++--- plugins/utils/tmux-navigator.nix | 8 ++-- tests/test-sources/plugins/git/committia.nix | 2 +- tests/test-sources/plugins/git/lazygit.nix | 6 +-- .../test-sources/plugins/languages/ledger.nix | 18 ++++---- .../languages/markdown/markdown-preview.nix | 24 +++++----- .../plugins/languages/typst/typst-vim.nix | 4 +- .../plugins/languages/vim-slime.nix | 8 ++-- tests/test-sources/plugins/languages/zig.nix | 2 +- .../plugins/statuslines/airline.nix | 36 +++++++-------- tests/test-sources/plugins/utils/direnv.nix | 4 +- tests/test-sources/plugins/utils/goyo.nix | 2 +- tests/test-sources/plugins/utils/sandwich.nix | 6 +-- tests/test-sources/plugins/utils/sleuth.nix | 6 +-- .../plugins/utils/tmux-navigator.nix | 10 ++--- 27 files changed, 168 insertions(+), 168 deletions(-) diff --git a/plugins/colorschemes/one.nix b/plugins/colorschemes/one.nix index 76e9c334..e9cf12c8 100644 --- a/plugins/colorschemes/one.nix +++ b/plugins/colorschemes/one.nix @@ -12,7 +12,7 @@ lib.nixvim.vim-plugin.mkVimPlugin { maintainers = [ lib.maintainers.GaetanLepage ]; settingsOptions = { - allow_italics = lib.nixvim.defaultNullOpts.mkBool false '' + allow_italics = lib.nixvim.defaultNullOpts.mkFlagInt 0 '' Whether to enable _italic_ (as long as your terminal supports it). ''; }; diff --git a/plugins/git/committia.nix b/plugins/git/committia.nix index a3eb7cd1..48919ec0 100644 --- a/plugins/git/committia.nix +++ b/plugins/git/committia.nix @@ -13,9 +13,9 @@ helpers.vim-plugin.mkVimPlugin { maintainers = [ helpers.maintainers.alisonjenkins ]; settingsOptions = { - open_only_vim_starting = helpers.defaultNullOpts.mkBool true '' - If `false`, committia.vim always attempts to open committia's buffer when `COMMIT_EDITMSG` buffer is opened. - If you use `vim-fugitive`, I recommend to set this value to `true`. + open_only_vim_starting = helpers.defaultNullOpts.mkFlagInt 1 '' + If `0`, committia.vim always attempts to open committia's buffer when `COMMIT_EDITMSG` buffer is opened. + If you use `vim-fugitive`, I recommend to set this value to `1`. ''; use_singlecolumn = helpers.defaultNullOpts.mkStr "always" '' diff --git a/plugins/git/lazygit.nix b/plugins/git/lazygit.nix index 68b10ee1..9c39fa77 100644 --- a/plugins/git/lazygit.nix +++ b/plugins/git/lazygit.nix @@ -33,16 +33,16 @@ helpers.vim-plugin.mkVimPlugin { "│" ] "Customize lazygit popup window border characters."; - floating_window_use_plenary = helpers.defaultNullOpts.mkBool false '' + floating_window_use_plenary = helpers.defaultNullOpts.mkFlagInt 0 '' Whether to use plenary.nvim to manage floating window if available. ''; - use_neovim_remote = helpers.defaultNullOpts.mkBool true '' - Whether to use neovim remote. Will fallback to `false` if neovim-remote is not installed. + use_neovim_remote = helpers.defaultNullOpts.mkFlagInt 1 '' + Whether to use neovim remote. Will fallback to `0` if neovim-remote is not installed. ''; - use_custom_config_file_path = helpers.defaultNullOpts.mkBool false '' - Config file path is evaluated if this value is `true`. + use_custom_config_file_path = helpers.defaultNullOpts.mkFlagInt 0 '' + Config file path is evaluated if this value is `1`. ''; config_file_path = helpers.defaultNullOpts.mkNullable ( @@ -63,9 +63,9 @@ helpers.vim-plugin.mkVimPlugin { "╰" "│" ]; - floating_window_use_plenary = false; - use_neovim_remote = true; - use_custom_config_file_path = false; + floating_window_use_plenary = 0; + use_neovim_remote = 1; + use_custom_config_file_path = 0; config_file_path = [ ]; }; diff --git a/plugins/languages/ledger.nix b/plugins/languages/ledger.nix index 751c4b71..b8ce7031 100644 --- a/plugins/languages/ledger.nix +++ b/plugins/languages/ledger.nix @@ -96,16 +96,16 @@ mkVimPlugin { Set this to get some kind of lines or visual aid. ''; - detailed_first = helpers.defaultNullOpts.mkBool true '' + detailed_first = helpers.defaultNullOpts.mkFlagInt 1 '' If you want the account completion to be sorted by level of detail/depth instead of - alphabetical, set this option to `true`. + alphabetical, set this option to `1`. ''; - fold_blanks = helpers.defaultNullOpts.mkBool false '' + fold_blanks = helpers.defaultNullOpts.mkFlagInt 0 '' By default vim will fold ledger transactions, leaving surrounding blank lines unfolded. You can use this option to hide blank lines following a transaction. - A value of `false` will disable folding of blank lines, `true` will allow folding of a + A value of `0` will disable folding of blank lines, `1` will allow folding of a single blank line between transactions; any larger value will enable folding unconditionally. @@ -117,7 +117,7 @@ mkVimPlugin { Decimal separator. ''; - align_last = helpers.defaultNullOpts.mkBool false '' + align_last = helpers.defaultNullOpts.mkFlagInt 0 '' Specify alignment on first or last matching separator. ''; @@ -129,11 +129,11 @@ mkVimPlugin { Default commodity used by `ledger#align_amount_at_cursor()`. ''; - align_commodity = helpers.defaultNullOpts.mkBool false '' + align_commodity = helpers.defaultNullOpts.mkFlagInt 0 '' Align on the commodity location instead of the amount ''; - commodity_before = helpers.defaultNullOpts.mkBool true '' + commodity_before = helpers.defaultNullOpts.mkFlagInt 1 '' Flag that tells whether the commodity should be prepended or appended to the amount. ''; @@ -141,7 +141,7 @@ mkVimPlugin { String to be put between the commodity and the amount: ''; - commodity_spell = helpers.defaultNullOpts.mkBool false '' + commodity_spell = helpers.defaultNullOpts.mkFlagInt 0 '' Flag that enable the spelling of the amount. ''; @@ -171,15 +171,15 @@ mkVimPlugin { The format is specified using the standard Ledger syntax for `--format`. ''; - use_location_list = helpers.defaultNullOpts.mkBool false '' + use_location_list = helpers.defaultNullOpts.mkFlagInt 0 '' Flag that tells whether a location list or a quickfix list should be used: The default is to use the quickfix window. - Set to `true` to use a location list. + Set to `1` to use a location list. ''; - qf_vertical = helpers.defaultNullOpts.mkBool false '' + qf_vertical = helpers.defaultNullOpts.mkFlagInt 0 '' Position of the quickfix/location list. - Set to `true` to open the quickfix window in a vertical split. + Set to `1` to open the quickfix window in a vertical split. ''; qf_size = helpers.defaultNullOpts.mkUnsignedInt 10 '' @@ -189,7 +189,7 @@ mkVimPlugin { vertical quickfix window. ''; - qf_hide_file = helpers.defaultNullOpts.mkBool true '' + qf_hide_file = helpers.defaultNullOpts.mkFlagInt 1 '' Flag to show or hide filenames in the quickfix window: Filenames in the quickfix window are hidden by default. Set this to 1 is @@ -210,8 +210,8 @@ mkVimPlugin { }; settingsExample = { - detailed_first = true; - fold_blanks = false; + detailed_first = 1; + fold_blanks = 0; maxwidth = 80; fillstring = " "; }; diff --git a/plugins/languages/markdown/markdown-preview.nix b/plugins/languages/markdown/markdown-preview.nix index 3d3fe569..329a2781 100644 --- a/plugins/languages/markdown/markdown-preview.nix +++ b/plugins/languages/markdown/markdown-preview.nix @@ -49,25 +49,25 @@ mkVimPlugin { ]; settingsOptions = { - auto_start = helpers.defaultNullOpts.mkBool false '' + auto_start = helpers.defaultNullOpts.mkFlagInt 0 '' Open the preview window after entering the markdown buffer. ''; - auto_close = helpers.defaultNullOpts.mkBool true '' + auto_close = helpers.defaultNullOpts.mkFlagInt 1 '' Auto close current preview window when change from markdown buffer to another buffer. ''; - refresh_slow = helpers.defaultNullOpts.mkBool false '' - Refresh markdown when save the buffer or leave from insert mode, default false is auto + refresh_slow = helpers.defaultNullOpts.mkFlagInt 0 '' + Refresh markdown when save the buffer or leave from insert mode, default `0` is auto refresh markdown as you edit or move the cursor. ''; - command_for_global = helpers.defaultNullOpts.mkBool false '' + command_for_global = helpers.defaultNullOpts.mkFlagInt 0 '' Enable markdown preview for all files (by default, the plugin is only enabled for markdown files). ''; - open_to_the_world = helpers.defaultNullOpts.mkBool false '' + open_to_the_world = helpers.defaultNullOpts.mkFlagInt 0 '' Make the preview server available to others in your network. By default, the server listens on localhost (127.0.0.1). ''; @@ -82,7 +82,7 @@ mkVimPlugin { The browser to open the preview page. ''; - echo_preview_url = helpers.defaultNullOpts.mkBool false '' + echo_preview_url = helpers.defaultNullOpts.mkFlagInt 0 '' Echo preview page url in command line when opening the preview page. ''; @@ -111,7 +111,7 @@ mkVimPlugin { `mermaid` options. ''; - disable_sync_scroll = helpers.defaultNullOpts.mkBool false '' + disable_sync_scroll = helpers.defaultNullOpts.mkFlagInt 0 '' Disable sync scroll. ''; @@ -129,7 +129,7 @@ mkVimPlugin { - "relative": The cursor position is always shown at the relative position of the preview page. ''; - hide_yaml_meta = helpers.defaultNullOpts.mkBool true '' + hide_yaml_meta = helpers.defaultNullOpts.mkFlagInt 1 '' Hide yaml metadata. ''; @@ -141,11 +141,11 @@ mkVimPlugin { `flowcharts` diagrams options. ''; - content_editable = helpers.defaultNullOpts.mkBool false '' + content_editable = helpers.defaultNullOpts.mkFlagInt 0 '' Content editable from the preview page. ''; - disable_filename = helpers.defaultNullOpts.mkBool false '' + disable_filename = helpers.defaultNullOpts.mkFlagInt 0 '' Disable filename header for the preview page. ''; @@ -195,27 +195,27 @@ mkVimPlugin { pluginDefault = literalMD "chosen based on system preferences"; }; - combine_preview = helpers.defaultNullOpts.mkBool false '' + combine_preview = helpers.defaultNullOpts.mkFlagInt 0 '' Combine preview window. If enable it will reuse previous opened preview window when you preview markdown file. - Ensure to set `auto_close = false` if you have enable this option. + Ensure to set `auto_close = 0` if you have enable this option. ''; - combine_preview_auto_refresh = helpers.defaultNullOpts.mkBool true '' + combine_preview_auto_refresh = helpers.defaultNullOpts.mkFlagInt 1 '' Auto refetch combine preview contents when change markdown buffer only when - `combine_preview` is `true`. + `combine_preview` is `1`. ''; }; settingsExample = { - auto_start = true; - auto_close = true; + auto_start = 1; + auto_close = 1; browser = "firefox"; - echo_preview_url = true; + echo_preview_url = 1; preview_options = { - disable_sync_scroll = true; + disable_sync_scroll = 1; sync_scroll_type = "middle"; - disable_filename = true; + disable_filename = 1; }; markdown_css = "/Users/username/markdown.css"; highlight_css.__raw = "vim.fn.expand('~/highlight.css')"; diff --git a/plugins/languages/typst/typst-vim.nix b/plugins/languages/typst/typst-vim.nix index eedb5943..7c9926a5 100644 --- a/plugins/languages/typst/typst-vim.nix +++ b/plugins/languages/typst/typst-vim.nix @@ -62,20 +62,20 @@ helpers.vim-plugin.mkVimPlugin { Specifies pdf viewer that `typst watch --open` will use. ''; - conceal_math = helpers.defaultNullOpts.mkBool false '' + conceal_math = helpers.defaultNullOpts.mkFlagInt 0 '' Enable concealment for math symbols in math mode (i.e. replaces symbols with their actual unicode character). Warning: this can affect performance ''; - auto_close_toc = helpers.defaultNullOpts.mkBool false '' + auto_close_toc = helpers.defaultNullOpts.mkFlagInt 0 '' Specifies whether TOC will be automatically closed after using it. ''; }; settingsExample = { cmd = "typst"; - conceal_math = true; - auto_close_toc = true; + conceal_math = 1; + auto_close_toc = 1; }; } diff --git a/plugins/languages/vim-slime.nix b/plugins/languages/vim-slime.nix index 6528f75b..24f37e52 100644 --- a/plugins/languages/vim-slime.nix +++ b/plugins/languages/vim-slime.nix @@ -42,7 +42,7 @@ mkVimPlugin { The vim terminal command to execute. ''; - no_mappings = helpers.defaultNullOpts.mkBool false '' + no_mappings = helpers.defaultNullOpts.mkFlagInt 0 '' Whether to disable the default mappings. ''; @@ -52,7 +52,7 @@ mkVimPlugin { whimrepl does not require or support this setting. ''; - preserve_curpos = helpers.defaultNullOpts.mkBool true '' + preserve_curpos = helpers.defaultNullOpts.mkFlagInt 1 '' Whether to preserve cursor position when sending a line or paragraph. ''; @@ -76,11 +76,11 @@ mkVimPlugin { ``` ''; - dont_ask_default = helpers.defaultNullOpts.mkBool false '' + dont_ask_default = helpers.defaultNullOpts.mkFlagInt 0 '' Whether to bypass the prompt and use the specified default configuration options. ''; - bracketed_paste = helpers.defaultNullOpts.mkBool false '' + bracketed_paste = helpers.defaultNullOpts.mkFlagInt 0 '' Sometimes REPL are too smart for their own good, e.g. autocompleting a bracket that should not be autocompleted when pasting code from a file. In this case it can be useful to rely on bracketed-paste @@ -92,14 +92,14 @@ mkVimPlugin { settingsExample = { target = "screen"; vimterminal_cmd = null; - no_mappings = false; + no_mappings = 0; paste_file = "$HOME/.slime_paste"; - preserve_curpos = true; + preserve_curpos = 1; default_config = { socket_name = "default"; target_pane = "{last}"; }; - dont_ask_default = false; - bracketed_paste = false; + dont_ask_default = 0; + bracketed_paste = 0; }; } diff --git a/plugins/languages/zig.nix b/plugins/languages/zig.nix index f7309320..103eb848 100644 --- a/plugins/languages/zig.nix +++ b/plugins/languages/zig.nix @@ -32,13 +32,13 @@ mkVimPlugin { ]; settingsOptions = { - fmt_autosave = helpers.defaultNullOpts.mkBool true '' + fmt_autosave = helpers.defaultNullOpts.mkFlagInt 1 '' This plugin enables automatic code formatting on save by default using zig fmt. - To disable it, you can set this option to `false`. + To disable it, you can set this option to `0`. ''; }; settingsExample = { - fmt_autosave = false; + fmt_autosave = 0; }; } diff --git a/plugins/statuslines/airline.nix b/plugins/statuslines/airline.nix index f4b784ea..098bb9ad 100644 --- a/plugins/statuslines/airline.nix +++ b/plugins/statuslines/airline.nix @@ -79,7 +79,7 @@ mkVimPlugin { ] )) // { - experimental = helpers.defaultNullOpts.mkBool true '' + experimental = helpers.defaultNullOpts.mkFlagInt 1 '' Enable experimental features. Currently: Enable Vim9 Script implementation. ''; @@ -92,19 +92,19 @@ mkVimPlugin { The separator used on the right side. ''; - detect_modified = helpers.defaultNullOpts.mkBool true '' + detect_modified = helpers.defaultNullOpts.mkFlagInt 1 '' Enable modified detection. ''; - detect_paste = helpers.defaultNullOpts.mkBool true '' + detect_paste = helpers.defaultNullOpts.mkFlagInt 1 '' Enable paste detection. ''; - detect_crypt = helpers.defaultNullOpts.mkBool true '' + detect_crypt = helpers.defaultNullOpts.mkFlagInt 1 '' Enable crypt detection. ''; - detect_spell = helpers.defaultNullOpts.mkBool true '' + detect_spell = helpers.defaultNullOpts.mkFlagInt 1 '' Enable spell detection. ''; @@ -114,11 +114,11 @@ mkVimPlugin { with helpers.nixvimTypes; oneOf [ rawLua - bool + intFlag (enum [ "flag" ]) ] ) - true + 1 '' Display spelling language when spell detection is enabled (if enough space is available). @@ -127,16 +127,16 @@ mkVimPlugin { 'spelllang' itself. ''; - detect_iminsert = helpers.defaultNullOpts.mkBool false '' + detect_iminsert = helpers.defaultNullOpts.mkFlagInt 0 '' Enable iminsert detection. ''; - inactive_collapse = helpers.defaultNullOpts.mkBool true '' + inactive_collapse = helpers.defaultNullOpts.mkFlagInt 1 '' Determine whether inactive windows should have the left section collapsed to only the filename of that buffer. ''; - inactive_alt_sep = helpers.defaultNullOpts.mkBool true '' + inactive_alt_sep = helpers.defaultNullOpts.mkFlagInt 1 '' Use alternative separators for the statusline of inactive windows. ''; @@ -169,12 +169,12 @@ mkVimPlugin { ``` ''; - powerline_fonts = helpers.defaultNullOpts.mkBool false '' + powerline_fonts = helpers.defaultNullOpts.mkFlagInt 0 '' By default, airline will use unicode symbols if your encoding matches utf-8. - If you want the powerline symbols set this variable to `true`. + If you want the powerline symbols set this variable to `1`. ''; - symbols_ascii = helpers.defaultNullOpts.mkBool false '' + symbols_ascii = helpers.defaultNullOpts.mkFlagInt 0 '' By default, airline will use unicode symbols if your encoding matches utf-8. If you want to use plain ascii symbols, set this variable: > ''; @@ -221,12 +221,12 @@ mkVimPlugin { ``` ''; - exclude_preview = helpers.defaultNullOpts.mkBool false '' + exclude_preview = helpers.defaultNullOpts.mkFlagInt 0 '' Defines whether the preview window should be excluded from having its window statusline modified (may help with plugins which use the preview window heavily). ''; - disable_statusline = helpers.defaultNullOpts.mkBool false '' + disable_statusline = helpers.defaultNullOpts.mkFlagInt 0 '' Disable the Airline statusline customization globally. This setting disables setting the 'statusline' option. @@ -234,20 +234,20 @@ mkVimPlugin { 'statusline' option totally configurable by a custom configuration. ''; - skip_empty_sections = helpers.defaultNullOpts.mkBool true '' + skip_empty_sections = helpers.defaultNullOpts.mkFlagInt 1 '' Do not draw separators for empty sections (only for the active window). ''; - highlighting_cache = helpers.defaultNullOpts.mkBool false '' + highlighting_cache = helpers.defaultNullOpts.mkFlagInt 0 '' Caches the changes to the highlighting groups, should therefore be faster. Set this to one, if you experience a sluggish Vim. ''; - focuslost_inactive = helpers.defaultNullOpts.mkBool false '' + focuslost_inactive = helpers.defaultNullOpts.mkFlagInt 0 '' Disable airline on FocusLost autocommand (e.g. when Vim loses focus). ''; - statusline_ontop = helpers.defaultNullOpts.mkBool false '' + statusline_ontop = helpers.defaultNullOpts.mkFlagInt 0 '' Display the statusline in the tabline (first top line). Setting this option, allows to use the statusline option to be used by a custom function @@ -266,7 +266,7 @@ mkVimPlugin { Display a short path in statusline. ''; - section_c_only_filename = helpers.defaultNullOpts.mkBool true '' + section_c_only_filename = helpers.defaultNullOpts.mkFlagInt 1 '' Display a only file name in statusline. ''; @@ -288,8 +288,8 @@ mkVimPlugin { }; settingsExample = { - powerline_fonts = true; + powerline_fonts = 1; theme = "base16"; - skip_empty_sections = true; + skip_empty_sections = 1; }; } diff --git a/plugins/utils/direnv.nix b/plugins/utils/direnv.nix index ee9570a5..2a305e3b 100644 --- a/plugins/utils/direnv.nix +++ b/plugins/utils/direnv.nix @@ -15,8 +15,8 @@ helpers.vim-plugin.mkVimPlugin { maintainers = [ helpers.maintainers.alisonjenkins ]; settingsOptions = { - direnv_auto = helpers.defaultNullOpts.mkBool true '' - It will not execute :DirenvExport automatically if the value is false. Default: true. + direnv_auto = helpers.defaultNullOpts.mkFlagInt 1 '' + It will not execute `:DirenvExport` automatically if the value is `0`. ''; direnv_edit_mode = @@ -32,8 +32,8 @@ helpers.vim-plugin.mkVimPlugin { Select the command to open buffers to edit. Default: 'edit'. ''; - direnv_silent_load = helpers.defaultNullOpts.mkBool true '' - Stop echoing output from Direnv command. Default: true + direnv_silent_load = helpers.defaultNullOpts.mkFlagInt 1 '' + Stop echoing output from Direnv command. ''; }; } diff --git a/plugins/utils/goyo.nix b/plugins/utils/goyo.nix index 7e297cc8..23d2a598 100644 --- a/plugins/utils/goyo.nix +++ b/plugins/utils/goyo.nix @@ -40,7 +40,7 @@ mkVimPlugin { height = helpers.mkNullOrOption types.ints.unsigned "height"; - linenr = helpers.defaultNullOpts.mkBool false '' + linenr = helpers.defaultNullOpts.mkFlagInt 0 '' Show line numbers when in Goyo mode. ''; }; diff --git a/plugins/utils/sandwich.nix b/plugins/utils/sandwich.nix index 2ad1841c..42ee42cc 100644 --- a/plugins/utils/sandwich.nix +++ b/plugins/utils/sandwich.nix @@ -28,14 +28,14 @@ helpers.vim-plugin.mkVimPlugin { maintainers = [ maintainers.GaetanLepage ]; settingsOptions = { - no_default_key_mappings = helpers.defaultNullOpts.mkBool false '' + no_default_key_mappings = helpers.defaultNullOpts.mkFlagInt 0 '' Whether to disable the default mappings. ''; }; settingsExample = { - no_default_key_mappings = true; - no_tex_ftplugin = true; - no_vim_ftplugin = true; + no_default_key_mappings = 1; + no_tex_ftplugin = 1; + no_vim_ftplugin = 1; }; } diff --git a/plugins/utils/sleuth.nix b/plugins/utils/sleuth.nix index 0d3974a8..fbfb85a0 100644 --- a/plugins/utils/sleuth.nix +++ b/plugins/utils/sleuth.nix @@ -12,27 +12,27 @@ helpers.vim-plugin.mkVimPlugin { maintainers = [ lib.maintainers.GaetanLepage ]; settingsOptions = { - heuristics = helpers.defaultNullOpts.mkBool true '' + heuristics = helpers.defaultNullOpts.mkFlagInt 1 '' Whether to enable/disable heuristics by default. You can also disable heuristics for individual filetypes: ```nix settings = { - heuristics = true; - gitcommit_heuristics = false; + heuristics = 1; + gitcommit_heuristics = 0; }; ``` ''; - no_filetype_indent_on = helpers.defaultNullOpts.mkBool false '' + no_filetype_indent_on = helpers.defaultNullOpts.mkFlagInt 0 '' Sleuth forces `|:filetype-indent-on|` by default, which enables file-type specific indenting algorithms and is highly recommended. ''; }; settingsExample = { - heuristics = true; - gitcommit_heuristics = false; - no_filetype_indent_on = true; + heuristics = 1; + gitcommit_heuristics = 0; + no_filetype_indent_on = 1; }; } diff --git a/plugins/utils/tmux-navigator.nix b/plugins/utils/tmux-navigator.nix index d795564d..07fbb87f 100644 --- a/plugins/utils/tmux-navigator.nix +++ b/plugins/utils/tmux-navigator.nix @@ -79,14 +79,14 @@ helpers.vim-plugin.mkVimPlugin { 2: `:wall` (write all buffers) ''; - disable_when_zoomed = helpers.defaultNullOpts.mkBool false '' + disable_when_zoomed = helpers.defaultNullOpts.mkFlagInt 0 '' By default, if you zoom the tmux pane running vim and then attempt to navigate "past" the edge of the vim session, tmux will unzoom the pane. This is the default tmux behavior, but may be confusing if you've become accustomed to navigation "wrapping" around the sides due to this plugin. This option disables the unzooming behavior, keeping all navigation within vim until the tmux pane is explicitly unzoomed. ''; - preserve_zoom = helpers.defaultNullOpts.mkBool false '' + preserve_zoom = helpers.defaultNullOpts.mkFlagInt 0 '' As noted in `disable_when_zoomed`, navigating from a vim pane to another tmux pane normally causes the window to be unzoomed. Some users may prefer the behavior of tmux's `-Z` option to `select-pane`, which keeps the window zoomed if it was zoomed. @@ -95,7 +95,7 @@ helpers.vim-plugin.mkVimPlugin { Naturally, if `disable_when_zoomed` is enabled, this option will have no effect. ''; - no_wrap = helpers.defaultNullOpts.mkBool false '' + no_wrap = helpers.defaultNullOpts.mkFlagInt 0 '' By default, if you try to move past the edge of the screen, tmux/vim will "wrap" around to the opposite side. This option disables "wrapping" in vim, but tmux will need to be configured separately. @@ -118,7 +118,7 @@ helpers.vim-plugin.mkVimPlugin { ``` ''; - no_mappings = helpers.defaultNullOpts.mkBool false '' + no_mappings = helpers.defaultNullOpts.mkFlagInt 0 '' By default ``, ``, ``, ``, & `` are mapped to navigating left, down, up, right, & previous, respectively. diff --git a/tests/test-sources/plugins/git/committia.nix b/tests/test-sources/plugins/git/committia.nix index 59f9eda8..39ad9b39 100644 --- a/tests/test-sources/plugins/git/committia.nix +++ b/tests/test-sources/plugins/git/committia.nix @@ -8,7 +8,7 @@ enable = true; settings = { - open_only_vim_starting = true; + open_only_vim_starting = 1; use_singlecolumn = "always"; min_window_width = 160; status_window_opencmd = "belowright split"; diff --git a/tests/test-sources/plugins/git/lazygit.nix b/tests/test-sources/plugins/git/lazygit.nix index 878d9282..1eec8dbf 100644 --- a/tests/test-sources/plugins/git/lazygit.nix +++ b/tests/test-sources/plugins/git/lazygit.nix @@ -20,9 +20,9 @@ "╰" "│" ]; - floating_window_use_plenary = false; - use_neovim_remote = true; - use_custom_config_file_path = false; + floating_window_use_plenary = 0; + use_neovim_remote = 1; + use_custom_config_file_path = 0; config_file_path = [ ]; }; }; diff --git a/tests/test-sources/plugins/languages/ledger.nix b/tests/test-sources/plugins/languages/ledger.nix index bb1a654e..720c1f77 100644 --- a/tests/test-sources/plugins/languages/ledger.nix +++ b/tests/test-sources/plugins/languages/ledger.nix @@ -15,25 +15,25 @@ descriptions_cmd = null; maxwidth = 0; fillstring = " "; - detailed_first = true; - fold_blanks = false; + detailed_first = 1; + fold_blanks = 0; decimal_sep = "."; - align_last = false; + align_last = 0; align_at = 60; default_commodity = ""; - align_commodity = false; - commodity_before = true; + align_commodity = 0; + commodity_before = 1; commodity_sep = ""; - commodity_spell = false; + commodity_spell = 0; date_format = "%Y/%m/%d"; main = "%"; winpos = "B"; qf_register_format = null; qf_reconcile_format = null; - use_location_list = false; - qf_vertical = false; + use_location_list = 0; + qf_vertical = 0; qf_size = 10; - qf_hide_file = true; + qf_hide_file = 1; cleared_string = "Cleared: "; pending_string = "Cleared or pending: "; target_string = "Difference from target: "; diff --git a/tests/test-sources/plugins/languages/markdown/markdown-preview.nix b/tests/test-sources/plugins/languages/markdown/markdown-preview.nix index 3481a41c..96c019b4 100644 --- a/tests/test-sources/plugins/languages/markdown/markdown-preview.nix +++ b/tests/test-sources/plugins/languages/markdown/markdown-preview.nix @@ -8,27 +8,27 @@ enable = true; settings = { - auto_start = true; - auto_close = true; - refresh_slow = false; - command_for_global = false; - open_to_the_world = false; + auto_start = 1; + auto_close = 1; + refresh_slow = 0; + command_for_global = 0; + open_to_the_world = 0; open_ip = ""; browser = "firefox"; - echo_preview_url = true; + echo_preview_url = 1; browser_func = ""; preview_options = { mkit = [ ]; katex = [ ]; uml = [ ]; maid = [ ]; - disable_sync_scroll = false; + disable_sync_scroll = 0; sync_scroll_type = "middle"; - hide_yaml_meta = true; + hide_yaml_meta = 1; sequence_diagrams = [ ]; flowchart_diagrams = [ ]; - content_editable = false; - disable_filename = false; + content_editable = 0; + disable_filename = 0; toc = [ ]; }; markdown_css = "/Users/username/markdown.css"; @@ -38,8 +38,8 @@ images_path = ""; filetypes = [ "markdown" ]; theme = "dark"; - combine_preview = false; - combine_preview_auto_refresh = true; + combine_preview = 0; + combine_preview_auto_refresh = 1; }; }; }; diff --git a/tests/test-sources/plugins/languages/typst/typst-vim.nix b/tests/test-sources/plugins/languages/typst/typst-vim.nix index b92e9f3a..581ace50 100644 --- a/tests/test-sources/plugins/languages/typst/typst-vim.nix +++ b/tests/test-sources/plugins/languages/typst/typst-vim.nix @@ -10,8 +10,8 @@ settings = { cmd = "typst"; pdf_viewer = "zathura"; - conceal_math = false; - auto_close_toc = false; + conceal_math = 0; + auto_close_toc = 0; }; keymaps = { diff --git a/tests/test-sources/plugins/languages/vim-slime.nix b/tests/test-sources/plugins/languages/vim-slime.nix index d9ecf91b..bca3f3fb 100644 --- a/tests/test-sources/plugins/languages/vim-slime.nix +++ b/tests/test-sources/plugins/languages/vim-slime.nix @@ -10,15 +10,15 @@ settings = { target = "screen"; vimterminal_cmd = null; - no_mappings = false; + no_mappings = 0; paste_file = "$HOME/.slime_paste"; - preserve_curpos = true; + preserve_curpos = 1; default_config = { socket_name = "default"; target_pane = "{last}"; }; - dont_ask_default = false; - bracketed_paste = false; + dont_ask_default = 0; + bracketed_paste = 0; }; }; }; diff --git a/tests/test-sources/plugins/languages/zig.nix b/tests/test-sources/plugins/languages/zig.nix index cede7b7b..54c5c84f 100644 --- a/tests/test-sources/plugins/languages/zig.nix +++ b/tests/test-sources/plugins/languages/zig.nix @@ -8,7 +8,7 @@ enable = true; settings = { - fmt_autosave = false; + fmt_autosave = 0; }; }; }; diff --git a/tests/test-sources/plugins/statuslines/airline.nix b/tests/test-sources/plugins/statuslines/airline.nix index 677797ca..cde77d4e 100644 --- a/tests/test-sources/plugins/statuslines/airline.nix +++ b/tests/test-sources/plugins/statuslines/airline.nix @@ -14,21 +14,21 @@ section_x = "foo"; section_y = "foo"; section_z = "foo"; - experimental = true; + experimental = 1; left_sep = ">"; right_sep = "<"; - detect_modified = true; - detect_paste = true; - detect_crypt = true; - detect_spell = true; - detect_spelllang = true; - detect_iminsert = false; - inactive_collapse = true; - inactive_alt_sep = true; + detect_modified = 1; + detect_paste = 1; + detect_crypt = 1; + detect_spell = 1; + detect_spelllang = 1; + detect_iminsert = 0; + inactive_collapse = 1; + inactive_alt_sep = 1; theme = "dark"; theme_patch_func = null; - powerline_fonts = false; - symbols_ascii = false; + powerline_fonts = 0; + symbols_ascii = 0; mode_map = { __ = "-"; c = "C"; @@ -95,14 +95,14 @@ "%{b:vaffle.dir}" ]; }; - exclude_preview = false; - disable_statusline = false; - skip_empty_sections = true; - highlighting_cache = false; - focuslost_inactive = false; - statusline_ontop = false; + exclude_preview = 0; + disable_statusline = 0; + skip_empty_sections = 1; + highlighting_cache = 0; + focuslost_inactive = 0; + statusline_ontop = 0; stl_path_style = "short"; - section_c_only_filename = true; + section_c_only_filename = 1; symbols = { branch = ""; colnr = " ℅:"; diff --git a/tests/test-sources/plugins/utils/direnv.nix b/tests/test-sources/plugins/utils/direnv.nix index ff83d550..43b21442 100644 --- a/tests/test-sources/plugins/utils/direnv.nix +++ b/tests/test-sources/plugins/utils/direnv.nix @@ -8,9 +8,9 @@ enable = true; settings = { - direnv_auto = false; + direnv_auto = 0; direnv_edit_mode = "vsplit"; - direnv_silent_load = false; + direnv_silent_load = 0; }; }; }; diff --git a/tests/test-sources/plugins/utils/goyo.nix b/tests/test-sources/plugins/utils/goyo.nix index 18bc9c8a..8fb10dc5 100644 --- a/tests/test-sources/plugins/utils/goyo.nix +++ b/tests/test-sources/plugins/utils/goyo.nix @@ -10,7 +10,7 @@ settings = { width = 80; height = 85; - linenr = false; + linenr = 0; }; }; }; diff --git a/tests/test-sources/plugins/utils/sandwich.nix b/tests/test-sources/plugins/utils/sandwich.nix index 5962e378..d85b34f5 100644 --- a/tests/test-sources/plugins/utils/sandwich.nix +++ b/tests/test-sources/plugins/utils/sandwich.nix @@ -8,9 +8,9 @@ enable = true; settings = { - no_default_key_mappings = true; - no_tex_ftplugin = true; - no_vim_ftplugin = true; + no_default_key_mappings = 1; + no_tex_ftplugin = 1; + no_vim_ftplugin = 1; }; }; diff --git a/tests/test-sources/plugins/utils/sleuth.nix b/tests/test-sources/plugins/utils/sleuth.nix index b261d34d..f3b128e3 100644 --- a/tests/test-sources/plugins/utils/sleuth.nix +++ b/tests/test-sources/plugins/utils/sleuth.nix @@ -8,9 +8,9 @@ enable = true; settings = { - heuristics = true; - gitcommit_heuristics = false; - no_filetype_indent_on = true; + heuristics = 1; + gitcommit_heuristics = 0; + no_filetype_indent_on = 1; }; }; }; diff --git a/tests/test-sources/plugins/utils/tmux-navigator.nix b/tests/test-sources/plugins/utils/tmux-navigator.nix index abb66742..39c80aad 100644 --- a/tests/test-sources/plugins/utils/tmux-navigator.nix +++ b/tests/test-sources/plugins/utils/tmux-navigator.nix @@ -13,10 +13,10 @@ settings = { save_on_switch = 2; - disable_when_zoomed = true; - preserve_zoom = true; - no_wrap = true; - no_mappings = true; + disable_when_zoomed = 1; + preserve_zoom = 1; + no_wrap = 1; + no_mappings = 1; }; }; }; @@ -48,7 +48,7 @@ } ]; - settings.no_mappings = true; + settings.no_mappings = 1; }; }; }