mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-28 03:20:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

plugins: swith to the new behaviour of mkRaw

Browse source
This commit is contained in:
Gaetan Lepage 2023-11-22 12:00:32 +01:00 • committed by Gaétan Lepage
parent 8cf2d943d2
commit 19f39c3b1b
32 changed files with 66 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/utils/auto-save.nix
View file

@ -120,13 +120,11 @@ in {
cleaning_interval = cleaningInterval;
};
trigger_events = cfg.triggerEvents;
condition =
helpers.ifNonNull' cfg.condition
(helpers.mkRaw cfg.condition);
condition = helpers.mkRaw cfg.condition;
write_all_buffers = cfg.writeAllBuffers;
debounce_delay = cfg.debounceDelay;
callbacks = with cfg.callbacks;
mapAttrs (name: value: helpers.ifNonNull' value (helpers.mkRaw value)) {
mapAttrs (_: helpers.mkRaw) {
inherit enabling disabling;
before_asserting_save = beforeAssertingSave;
before_saving = beforeSaving;

4
plugins/utils/auto-session.nix
View file

@ -160,8 +160,8 @@ in {
then
with cfg.cwdChangeHandling; {
restore_upcoming_session = restoreUpcomingSession;
pre_cwd_changed_hook = helpers.ifNonNull' preCwdChangedHook (helpers.mkRaw preCwdChangedHook);
post_cwd_changed_hook = helpers.ifNonNull' postCwdChangedHook (helpers.mkRaw postCwdChangedHook);
pre_cwd_changed_hook = helpers.mkRaw preCwdChangedHook;
post_cwd_changed_hook = helpers.mkRaw postCwdChangedHook;
}
else cfg.cwdChangeHandling;
bypass_session_save_file_types = cfg.bypassSessionSaveFileTypes;

4
plugins/utils/better-escape.nix
View file

@ -60,8 +60,8 @@ in {
{
inherit mapping;
timeout =
if isInt timeout
then helpers.mkRaw "timeout"
if isString timeout
then helpers.mkRaw timeout
else timeout;
clear_empty_lines = clearEmptyLines;
inherit keys;

2
plugins/utils/coverage.nix
View file

@ -278,7 +278,7 @@ in {
summary_pass = summaryPass;
summary_fail = summaryFail;
};
load_coverage_cb = helpers.ifNonNull' loadCoverageCb (helpers.mkRaw loadCoverageCb);
load_coverage_cb = helpers.mkRaw loadCoverageCb;
inherit signs;
sign_group = signGroup;
summary = with summary; {

10
plugins/utils/flash.nix
View file

@ -387,8 +387,6 @@ in {
// configOpts;
config = let
mkRawIfNonNull = v: helpers.ifNonNull' v (helpers.mkRaw v);
mkGlobalConfig = c: {
inherit (c) labels;
search =
@ -408,14 +406,14 @@ in {
rainbow = {
inherit (c.label.rainbow) enabled shade;
};
format = mkRawIfNonNull c.label.format;
format = helpers.mkRaw c.label.format;
};
highlight = {
inherit (c.highlight) backdrop matches priority groups;
};
action = mkRawIfNonNull c.action;
action = helpers.mkRaw c.action;
inherit (c) pattern continue;
config = mkRawIfNonNull c.config;
config = helpers.mkRaw c.config;
prompt = {
inherit (c.prompt) enabled prefix;
win_config = c.prompt.winConfig;
@ -446,7 +444,7 @@ in {
jump_labels = c.jumpLabels;
multi_line = c.multiLine;
inherit (c) keys;
char_actions = mkRawIfNonNull c.charActions;
char_actions = helpers.mkRaw c.charActions;
});
treesitter = mkModeConfig cfg.modes.treesitter (c: {});
treesitter_search = mkModeConfig cfg.modes.treesitterSearch (c: {});

4
plugins/utils/notify.nix
View file

@ -139,8 +139,8 @@ in {
}
)
icons;
on_open = helpers.ifNonNull' onOpen (helpers.mkRaw onOpen);
on_close = helpers.ifNonNull' onClose (helpers.mkRaw onClose);
on_open = helpers.mkRaw onOpen;
on_close = helpers.mkRaw onClose;
inherit render;
minimum_width = minimumWidth;
inherit fps;

4
plugins/utils/nvim-autopairs.nix
View file

@ -81,9 +81,7 @@ in {
disable_in_macro = cfg.disableInMacro;
disable_in_visualblock = cfg.disableInVisualblock;
disable_in_replace_mode = cfg.disableInReplaceMode;
ignored_next_char =
helpers.ifNonNull' cfg.ignoredNextChar
(helpers.mkRaw cfg.ignoredNextChar);
ignored_next_char = helpers.mkRaw cfg.ignoredNextChar;
enable_moveright = cfg.enableMoveright;
enable_afterquote = cfg.enableAfterQuote;
enable_check_bracket_line = cfg.enableCheckBracketLine;

5
plugins/utils/nvim-bqf.nix
View file

@ -135,10 +135,7 @@ in {
win_vheight = winVheight;
inherit wrap;
buf_label = bufLabel;
should_preview_cb =
if (shouldPreviewCb == null)
then null
else helpers.mkRaw shouldPreviewCb;
should_preview_cb = helpers.mkRaw shouldPreviewCb;
};
func_map = cfg.funcMap;
filter = {

4
plugins/utils/nvim-ufo.nix
View file

@ -58,9 +58,9 @@ in {
options = with cfg;
{
open_fold_hl_timeout = openFoldHlTimeout;
provider_selector = helpers.ifNonNull' providerSelector (helpers.mkRaw providerSelector);
provider_selector = helpers.mkRaw providerSelector;
close_fold_kinds = closeFoldKinds;
fold_virt_text_handler = helpers.ifNonNull' foldVirtTextHandler (helpers.mkRaw foldVirtTextHandler);
fold_virt_text_handler = helpers.mkRaw foldVirtTextHandler;
enable_get_fold_virt_text = enableGetFoldVirtText;
preview = with preview; {

8
plugins/utils/oil.nix
View file

@ -381,12 +381,8 @@ in {
use_default_keymaps = cfg.useDefaultKeymaps;
view_options = with cfg.viewOptions; {
show_hidden = showHidden;
is_hidden_file =
helpers.ifNonNull' isHiddenFile
(helpers.mkRaw isHiddenFile);
is_always_hidden =
helpers.ifNonNull' isAlwaysHidden
(helpers.mkRaw isAlwaysHidden);
is_hidden_file = helpers.mkRaw isHiddenFile;
is_always_hidden = helpers.mkRaw isAlwaysHidden;
};
float = with cfg.float; {
inherit padding;

2
plugins/utils/persistence.nix
View file

@ -57,7 +57,7 @@ with lib; {
extraConfigLua = let
opts = {
inherit (cfg) dir options;
pre_save = helpers.mkRawIfNonNull cfg.preSave;
pre_save = helpers.mkRaw cfg.preSave;
save_empty = cfg.saveEmpty;
};
in ''

14
plugins/utils/toggleterm.nix
View file

@ -177,12 +177,12 @@ in {
else helpers.mkRaw size
);
open_mapping = helpers.ifNonNull' openMapping (helpers.mkRaw "[[${openMapping}]]");
on_create = helpers.ifNonNull' onCreate (helpers.mkRaw onCreate);
on_open = helpers.ifNonNull' onOpen (helpers.mkRaw onOpen);
on_close = helpers.ifNonNull' onClose (helpers.mkRaw onClose);
on_stdout = helpers.ifNonNull' onStdout (helpers.mkRaw onStdout);
on_stderr = helpers.ifNonNull' onStderr (helpers.mkRaw onStderr);
on_exit = helpers.ifNonNull' onExit (helpers.mkRaw onExit);
on_create = helpers.mkRaw onCreate;
on_open = helpers.mkRaw onOpen;
on_close = helpers.mkRaw onClose;
on_stdout = helpers.mkRaw onStdout;
on_stderr = helpers.mkRaw onStderr;
on_exit = helpers.mkRaw onExit;
hide_numbers = hideNumbers;
shade_filetypes = shadeFiletypes;
shade_terminals = shadeTerminals;
@ -197,7 +197,7 @@ in {
float_opts = floatOpts;
winbar = with winbar; {
inherit enabled;
name_formatter = helpers.ifNonNull' nameFormatter (helpers.mkRaw nameFormatter);
name_formatter = helpers.mkRaw nameFormatter;
};
};
in

12
plugins/utils/wilder.nix
View file

@ -237,15 +237,9 @@ in {
pipeline =
helpers.ifNonNull' pipeline
(map helpers.mkRaw pipeline);
render =
helpers.ifNonNull' render
(helpers.mkRaw render);
preHook =
helpers.ifNonNull' preHook
(helpers.mkRaw preHook);
postHook =
helpers.ifNonNull' postHook
(helpers.mkRaw postHook);
render = helpers.mkRaw render;
preHook = helpers.mkRaw preHook;
postHook = helpers.mkRaw postHook;
}
// cfg.extraOptions;
in