From 5003d9723a8afb36dc4d3e6707a8662d4f519dc8 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Thu, 27 Jun 2024 18:30:37 +0800 Subject: [PATCH] nixvimConfigs/fiesta: update deprecated `lua` attribute for keymaps --- configs/nixvim/fiesta/default.nix | 5 +-- .../fiesta/modules/setups/debugging.nix | 43 +++++++++---------- .../fiesta/modules/setups/fuzzy-finder.nix | 29 +++++-------- .../modules/setups/snippets/default.nix | 11 +++-- 4 files changed, 38 insertions(+), 50 deletions(-) diff --git a/configs/nixvim/fiesta/default.nix b/configs/nixvim/fiesta/default.nix index 0be24c7d..8afab5de 100644 --- a/configs/nixvim/fiesta/default.nix +++ b/configs/nixvim/fiesta/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, helpers, ... }: { imports = [ ./modules ]; @@ -41,8 +41,7 @@ { mode = "n"; key = "bd"; - action = "vim.cmd.bdelete"; - lua = true; + action = helpers.mkRaw "vim.cmd.bdelete"; options.desc = "Delete current buffer"; } ]; diff --git a/configs/nixvim/fiesta/modules/setups/debugging.nix b/configs/nixvim/fiesta/modules/setups/debugging.nix index b95d2f39..a365ffd2 100644 --- a/configs/nixvim/fiesta/modules/setups/debugging.nix +++ b/configs/nixvim/fiesta/modules/setups/debugging.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, helpers, ... }: let nixvimCfg = config.nixvimConfigs.fiesta; @@ -24,24 +24,23 @@ in { mode = "n"; key = "${bindingPrefix}${binding}"; - lua = true; } // settings; in lib.mapAttrsToList mkDAPBinding { "b" = { options.desc = "Toggle breakpoint"; - action = "require('dap').toggle_breakpoint"; + action = helpers.mkRaw "require('dap').toggle_breakpoint"; }; "B" = { options.desc = "Set breakpoint"; - action = "require('dap').set_breakpoint"; + action = helpers.mkRaw "require('dap').set_breakpoint"; }; "Bp" = { options.desc = "Set breakpoint with log message"; - action = '' + action = helpers.mkRaw '' function() require('dap').set_breakpoint(nil, nil, vim.fn.input('Log point message: ')) end @@ -50,92 +49,92 @@ in "n" = { options.desc = "Continue"; - action = "require('dap').continue"; + action = helpers.mkRaw "require('dap').continue"; }; # You know, like a comma is supposed to do. I got nothing on this one # but this is the best choice for now. "," = { options.desc = "Pause"; - action = "require('dap').pause"; + action = helpers.mkRaw "require('dap').pause"; }; "d" = { options.desc = "Terminate"; - action = "require('dap').terminate"; + action = helpers.mkRaw "require('dap').terminate"; }; "l" = { options.desc = "Step over"; - action = "require('dap').step_over"; + action = helpers.mkRaw "require('dap').step_over"; }; "j" = { options.desc = "Step into"; - action = "require('dap').step_into"; + action = helpers.mkRaw "require('dap').step_into"; }; "J" = { options.desc = "Go up"; - action = "require('dap').up"; + action = helpers.mkRaw "require('dap').up"; }; "k" = { options.desc = "Step out"; - action = "require('dap').step_out"; + action = helpers.mkRaw "require('dap').step_out"; }; "K" = { options.desc = "Go down"; - action = "require('dap').down"; + action = helpers.mkRaw "require('dap').down"; }; "rs" = { options.desc = "Restart session"; - action = "require('dap').restart"; + action = helpers.mkRaw "require('dap').restart"; }; "rr" = { options.desc = "Open debugging REPL"; - action = "require('dap').repl.open"; + action = helpers.mkRaw "require('dap').repl.open"; }; "rl" = { options.desc = "Run last configuration"; - action = "require('dap').run_last"; + action = helpers.mkRaw "require('dap').run_last"; }; "ph" = { options.desc = "View the value under the cursor"; - action = "require('dap.ui.widgets').hover"; + action = helpers.mkRaw "require('dap.ui.widgets').hover"; mode = [ "n" "v" ]; }; "pp" = { options.desc = "See value in preview window"; - action = "require('dap.ui.widgets').preview"; + action = helpers.mkRaw "require('dap.ui.widgets').preview"; mode = [ "n" "v" ]; }; } ++ lib.mapAttrsToList mkDAPBinding { "" = { options.desc = "Continue"; - action = "require('dap').continue"; + action = helpers.mkRaw "require('dap').continue"; }; "" = { options.desc = "Step over"; - action = "require('dap').step_over"; + action = helpers.mkRaw "require('dap').step_over"; }; "" = { options.desc = "Step into"; - action = "require('dap').step_into"; + action = helpers.mkRaw "require('dap').step_into"; }; "" = { options.desc = "Step out"; - action = "require('dap').step_out"; + action = helpers.mkRaw "require('dap').step_out"; }; }; }; diff --git a/configs/nixvim/fiesta/modules/setups/fuzzy-finder.nix b/configs/nixvim/fiesta/modules/setups/fuzzy-finder.nix index 37433a71..8c0f49c3 100644 --- a/configs/nixvim/fiesta/modules/setups/fuzzy-finder.nix +++ b/configs/nixvim/fiesta/modules/setups/fuzzy-finder.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, lib, helpers, ... }: let nixvimCfg = config.nixvimConfigs.fiesta; @@ -31,26 +31,23 @@ in lib.mapAttrsToList mkTelescopeKeymap ({ "A" = { options.desc = "Resume from last use"; - action = "require('telescope.builtin').resume"; - lua = true; + action = helpers.mkRaw "require('telescope.builtin').resume"; }; "b" = { options.desc = "List buffers"; - action = "require('telescope.builtin').buffers"; - lua = true; + action = helpers.mkRaw "require('telescope.builtin').buffers"; }; "f" = { options.desc = "Find files"; - action = '' + action = helpers.mkRaw '' function() require('telescope.builtin').find_files { hidden = true } end ''; - lua = true; }; "F" = { options.desc = "Find files in current directory"; - action = '' + action = helpers.mkRaw '' function() require('telescope.builtin').find_files { cwd = require('telescope.utils').buffer_dir(), @@ -58,34 +55,28 @@ in } end ''; - lua = true; }; "g" = { options.desc = "Find files tracked by Git"; - action = "require('telescope.builtin').git_files"; - lua = true; + action = helpers.mkRaw "require('telescope.builtin').git_files"; }; "G" = { options.desc = "Live grep for the whole project"; - action = "require('telescope.builtin').live_grep"; - lua = true; + action = helpers.mkRaw "require('telescope.builtin').live_grep"; }; "h" = { options.desc = "Find section from help tags"; - action = "require('telescope.builtin').help_tags"; - lua = true; + action = helpers.mkRaw "require('telescope.builtin').help_tags"; }; "m" = { options.desc = "Find manpage entries"; - action = "require('telescope.builtin').man_pages"; - lua = true; + action = helpers.mkRaw "require('telescope.builtin').man_pages"; }; } // lib.optionalAttrs nixvimCfg.setups.treesitter.enable { "t" = { options.desc = "List symbols from treesitter queries"; - action = "require('telescope.builtin').treesitter"; - lua = true; + action = helpers.mkRaw "require('telescope.builtin').treesitter"; }; }); }; diff --git a/configs/nixvim/fiesta/modules/setups/snippets/default.nix b/configs/nixvim/fiesta/modules/setups/snippets/default.nix index 88f9a2ef..648fb614 100644 --- a/configs/nixvim/fiesta/modules/setups/snippets/default.nix +++ b/configs/nixvim/fiesta/modules/setups/snippets/default.nix @@ -1,11 +1,10 @@ -{ config, lib, ... }: +{ config, lib, helpers, ... }: let nixvimCfg = config.nixvimConfigs.fiesta; cfg = nixvimCfg.setups.snippets; luasnipKeymapConfig = { - lua = true; mode = [ "i" "s" ]; }; in @@ -40,7 +39,7 @@ in (luasnipKeymapConfig // { key = ""; options.desc = "Jump to next node"; - action = '' + action = helpers.mkRaw '' function() ls = require("luasnip") if ls.jumpable(1) then @@ -53,7 +52,7 @@ in (luasnipKeymapConfig // { key = ""; options.desc = "Jump to previous node"; - action = '' + action = helpers.mkRaw '' function() ls = require("luasnip") if ls.jumpable(-1) then @@ -66,7 +65,7 @@ in (luasnipKeymapConfig // { key = ""; options.desc = "Expand or jump to next node"; - action = '' + action = helpers.mkRaw '' function() ls = require("luasnip") if ls.expand_or_jumpable() then @@ -79,7 +78,7 @@ in (luasnipKeymapConfig // { key = ""; options.desc = "Show extra choices"; - action = '' + action = helpers.mkRaw '' function() require("luasnip.extras.select_choice")() end