From 9a1dc0653a9246731a7abd306502e52b31b8b9ae Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sun, 26 May 2024 21:38:29 +0200 Subject: nixvim: don't use deprecated keymaps.*.lua --- common/nixvim.nix | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/common/nixvim.nix b/common/nixvim.nix index ba6a8c5..c116ee7 100644 --- a/common/nixvim.nix +++ b/common/nixvim.nix @@ -107,8 +107,7 @@ in [ { key = "fu"; - action = "require('telescope').extensions.undo.undo"; - lua = true; + action.__raw = "require('telescope').extensions.undo.undo"; options = { silent = true; desc = "Telescope undo"; @@ -117,8 +116,7 @@ in { key = "-"; - action = "require('oil').open"; - lua = true; + action.__raw = "require('oil').open"; options.desc = "Open parent directory"; } @@ -127,15 +125,13 @@ in # TODO: noremap? buffer local? silent? { key = "gs"; - action = "require('gitsigns').stage_hunk"; - lua = true; + action.__raw = "require('gitsigns').stage_hunk"; options.desc = "Stage hunk"; } { key = "gr"; - action = "require('gitsigns').reset_hunk"; - lua = true; + action.__raw = "require('gitsigns').reset_hunk"; options.desc = "Reset hunk"; } @@ -143,49 +139,43 @@ in { key = "gS"; - action = "require('gitsigns').stage_buffer"; - lua = true; + action.__raw = "require('gitsigns').stage_buffer"; options.desc = "Stage buffer"; } { key = "gR"; - action = "require('gitsigns').reset_buffer"; - lua = true; + action.__raw = "require('gitsigns').reset_buffer"; options.desc = "Stage buffer"; } { key = "gu"; - action = "require('gitsigns').undo_stage_hunk"; - lua = true; + action.__raw = "require('gitsigns').undo_stage_hunk"; options.desc = "Undo stage hunk"; } { key = "gp"; - action = "require('gitsigns').preview_hunk_inline"; - lua = true; + action.__raw = "require('gitsigns').preview_hunk_inline"; options.desc = "Preview hunk"; } { key = "gb"; - action = "function() require('gitsigns').blame_line { full = true } end"; - lua = true; + action.__raw = "function() require('gitsigns').blame_line { full = true } end"; options.desc = "Blame line"; } { key = "]g"; - action = '' + action.__raw = '' function() if vim.wo.diff then return ']c' end vim.schedule(function() package.loaded.gitsigns.next_hunk() end) return '' end ''; - lua = true; options = { expr = true; desc = "Next hunk"; @@ -194,14 +184,13 @@ in { key = "[g"; - action = '' + action.__raw = '' function() if vim.wo.diff then return '[c' end vim.schedule(function() package.loaded.gitsigns.prev_hunk() end) return '' end ''; - lua = true; options = { expr = true; desc = "Next hunk"; @@ -222,7 +211,7 @@ in { mode = "n"; key = "yod"; - action = '' + action.__raw = '' function() if vim.wo.diff then vim.cmd.diffoff() @@ -233,7 +222,6 @@ in end end ''; - lua = true; options.desc = "Toggle diff"; } ]; -- cgit v1.2.3