fix nix syntax change in update
This commit is contained in:
parent
5dae59a42b
commit
beea26ee85
4 changed files with 35 additions and 35 deletions
|
|
@ -1,3 +1,4 @@
|
||||||
|
{ helpers, ...}:
|
||||||
{
|
{
|
||||||
plugins.leap = {
|
plugins.leap = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
@ -11,8 +12,7 @@
|
||||||
"o"
|
"o"
|
||||||
];
|
];
|
||||||
key = "<leader>ss";
|
key = "<leader>ss";
|
||||||
action = "function() require('leap').leap {} end";
|
action = helpers.mkRaw "function() require('leap').leap {} end";
|
||||||
lua = true;
|
|
||||||
# action = "require('leap').leap";
|
# action = "require('leap').leap";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -80,7 +80,7 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
nil_ls = {
|
nil-ls = {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
tsserver = {
|
tsserver = {
|
||||||
|
|
|
||||||
|
|
@ -17,22 +17,22 @@
|
||||||
# };
|
# };
|
||||||
undo = {
|
undo = {
|
||||||
enable = true;
|
enable = true;
|
||||||
mappings = {
|
settings.mappings = {
|
||||||
i = {
|
i = {
|
||||||
"<cr>" = "yank_additions";
|
"<cr>" = "require('telescope-undo.actions').yank_additions";
|
||||||
"<s-cr>" = "yank_deletions";
|
"<s-cr>" = "require('telescope-undo.actions').yank_deletions";
|
||||||
"<c-cr>" = "restore";
|
"<c-cr>" = "require('telescope-undo.actions').restore";
|
||||||
};
|
};
|
||||||
n = {
|
n = {
|
||||||
"y" = "yank_additions";
|
"y" = "require('telescope-undo.actions').yank_additions";
|
||||||
"Y" = "yank_deletions";
|
"Y" = "require('telescope-undo.actions').yank_deletions";
|
||||||
"u" = "restore";
|
"u" = "require('telescope-undo.actions').restore";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
# If you'd prefer Telescope not to enter a normal-like mode when hitting escape (and instead exiting), you can map <Esc> to do so via:
|
# If you'd prefer Telescope not to enter a normal-like mode when hitting escape (and instead exiting), you can map <Esc> to do so via:
|
||||||
defaults = {
|
settings.defaults = {
|
||||||
mappings = {
|
mappings = {
|
||||||
i = {
|
i = {
|
||||||
"<esc>" = {
|
"<esc>" = {
|
||||||
|
|
@ -47,95 +47,95 @@
|
||||||
keymaps = {
|
keymaps = {
|
||||||
"<leader><space>" = {
|
"<leader><space>" = {
|
||||||
action = "find_files, {}";
|
action = "find_files, {}";
|
||||||
desc = "Find project files";
|
options.desc = "Find project files";
|
||||||
};
|
};
|
||||||
"<leader>/" = {
|
"<leader>/" = {
|
||||||
action = "live_grep";
|
action = "live_grep";
|
||||||
desc = "Grep (root dir)";
|
options.desc = "Grep (root dir)";
|
||||||
};
|
};
|
||||||
"<leader>:" = {
|
"<leader>:" = {
|
||||||
action = "command_history, {}";
|
action = "command_history, {}";
|
||||||
desc = "Command History";
|
options.desc = "Command History";
|
||||||
};
|
};
|
||||||
"<leader>b" = {
|
"<leader>b" = {
|
||||||
action = "buffers, {}";
|
action = "buffers, {}";
|
||||||
desc = "+buffer";
|
options.desc = "+buffer";
|
||||||
};
|
};
|
||||||
"<leader>ff" = {
|
"<leader>ff" = {
|
||||||
action = "find_files, {}";
|
action = "find_files, {}";
|
||||||
desc = "Find project files";
|
options.desc = "Find project files";
|
||||||
};
|
};
|
||||||
"<leader>fr" = {
|
"<leader>fr" = {
|
||||||
action = "oldfiles, {}";
|
action = "oldfiles, {}";
|
||||||
desc = "Recent";
|
options.desc = "Recent";
|
||||||
};
|
};
|
||||||
"<leader>fb" = {
|
"<leader>fb" = {
|
||||||
action = "buffers, {}";
|
action = "buffers, {}";
|
||||||
desc = "Buffers";
|
options.desc = "Buffers";
|
||||||
};
|
};
|
||||||
"<C-p>" = {
|
"<C-p>" = {
|
||||||
action = "git_files, {}";
|
action = "git_files, {}";
|
||||||
desc = "Search git files";
|
options.desc = "Search git files";
|
||||||
};
|
};
|
||||||
"<leader>gc" = {
|
"<leader>gc" = {
|
||||||
action = "git_commits, {}";
|
action = "git_commits, {}";
|
||||||
desc = "Commits";
|
options.desc = "Commits";
|
||||||
};
|
};
|
||||||
"<leader>gs" = {
|
"<leader>gs" = {
|
||||||
action = "git_status, {}";
|
action = "git_status, {}";
|
||||||
desc = "Status";
|
options.desc = "Status";
|
||||||
};
|
};
|
||||||
"<leader>sa" = {
|
"<leader>sa" = {
|
||||||
action = "autocommands, {}";
|
action = "autocommands, {}";
|
||||||
desc = "Auto Commands";
|
options.desc = "Auto Commands";
|
||||||
};
|
};
|
||||||
"<leader>sb" = {
|
"<leader>sb" = {
|
||||||
action = "current_buffer_fuzzy_find, {}";
|
action = "current_buffer_fuzzy_find, {}";
|
||||||
desc = "Buffer";
|
options.desc = "Buffer";
|
||||||
};
|
};
|
||||||
"<leader>sc" = {
|
"<leader>sc" = {
|
||||||
action = "command_history, {}";
|
action = "command_history, {}";
|
||||||
desc = "Command History";
|
options.desc = "Command History";
|
||||||
};
|
};
|
||||||
"<leader>sC" = {
|
"<leader>sC" = {
|
||||||
action = "commands, {}";
|
action = "commands, {}";
|
||||||
desc = "Commands";
|
options.desc = "Commands";
|
||||||
};
|
};
|
||||||
"<leader>sD" = {
|
"<leader>sD" = {
|
||||||
action = "diagnostics, {}";
|
action = "diagnostics, {}";
|
||||||
desc = "Workspace diagnostics";
|
options.desc = "Workspace diagnostics";
|
||||||
};
|
};
|
||||||
"<leader>sh" = {
|
"<leader>sh" = {
|
||||||
action = "help_tags, {}";
|
action = "help_tags, {}";
|
||||||
desc = "Help pages";
|
options.desc = "Help pages";
|
||||||
};
|
};
|
||||||
"<leader>sH" = {
|
"<leader>sH" = {
|
||||||
action = "highlights, {}";
|
action = "highlights, {}";
|
||||||
desc = "Search Highlight Groups";
|
options.desc = "Search Highlight Groups";
|
||||||
};
|
};
|
||||||
"<leader>sk" = {
|
"<leader>sk" = {
|
||||||
action = "keymaps, {}";
|
action = "keymaps, {}";
|
||||||
desc = "Keymaps";
|
options.desc = "Keymaps";
|
||||||
};
|
};
|
||||||
"<leader>sM" = {
|
"<leader>sM" = {
|
||||||
action = "man_pages, {}";
|
action = "man_pages, {}";
|
||||||
desc = "Man pages";
|
options.desc = "Man pages";
|
||||||
};
|
};
|
||||||
"<leader>sm" = {
|
"<leader>sm" = {
|
||||||
action = "marks, {}";
|
action = "marks, {}";
|
||||||
desc = "Jump to Mark";
|
options.desc = "Jump to Mark";
|
||||||
};
|
};
|
||||||
"<leader>so" = {
|
"<leader>so" = {
|
||||||
action = "vim_options, {}";
|
action = "vim_options, {}";
|
||||||
desc = "Options";
|
options.desc = "Options";
|
||||||
};
|
};
|
||||||
"<leader>sR" = {
|
"<leader>sR" = {
|
||||||
action = "resume, {}";
|
action = "resume, {}";
|
||||||
desc = "Resume";
|
options.desc = "Resume";
|
||||||
};
|
};
|
||||||
"<leader>uC" = {
|
"<leader>uC" = {
|
||||||
action = "colorscheme, {}";
|
action = "colorscheme, {}";
|
||||||
desc = "Colorscheme preview";
|
options.desc = "Colorscheme preview";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
mapleader = " ";
|
mapleader = " ";
|
||||||
maplocalleader = " ";
|
maplocalleader = " ";
|
||||||
};
|
};
|
||||||
options = {
|
opts = {
|
||||||
relativenumber = true;
|
relativenumber = true;
|
||||||
splitbelow = true;
|
splitbelow = true;
|
||||||
redrawtime = 5000;
|
redrawtime = 5000;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue