mirror of
https://github.com/NotAShelf/neovim-flake.git
synced 2025-01-09 05:39:49 +01:00
Compare commits
9 commits
ab5132a423
...
7b470d77e3
Author | SHA1 | Date | |
---|---|---|---|
|
7b470d77e3 | ||
8bab0497fb | |||
f26744c6ce | |||
62d296a2dc | |||
8c66f10550 | |||
ea3d488cf4 | |||
|
0946d43921 | ||
|
7eb8d07bcf | ||
|
ed69816f68 |
4 changed files with 26 additions and 34 deletions
|
@ -92,7 +92,7 @@ in {
|
||||||
cmd = ${
|
cmd = ${
|
||||||
if isList cfg.dap.package
|
if isList cfg.dap.package
|
||||||
then expToLua cfg.dap.package
|
then expToLua cfg.dap.package
|
||||||
else ''${cfg.dap.package}/bin/haskell-debug-adapter''
|
else ''{"${cfg.dap.package}/bin/haskell-debug-adapter"}''
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
''}
|
''}
|
||||||
|
|
|
@ -4,51 +4,33 @@
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (lib.modules) mkIf;
|
inherit (lib.modules) mkIf;
|
||||||
inherit (lib.nvim.dag) entryAnywhere;
|
|
||||||
inherit (lib.nvim.lua) toLuaObject;
|
|
||||||
|
|
||||||
cfg = config.vim.utility.surround;
|
cfg = config.vim.utility.surround;
|
||||||
mkLznKey = mode: key: {
|
mkLznKey = mode: key: {
|
||||||
inherit key mode;
|
inherit mode key;
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
vim = {
|
vim = {
|
||||||
startPlugins = ["nvim-surround"];
|
|
||||||
pluginRC.surround = entryAnywhere "require('nvim-surround').setup(${toLuaObject cfg.setupOpts})";
|
|
||||||
|
|
||||||
lazy.plugins.nvim-surround = {
|
lazy.plugins.nvim-surround = {
|
||||||
package = "nvim-surround";
|
package = "nvim-surround";
|
||||||
|
|
||||||
setupModule = "nvim-surround";
|
setupModule = "nvim-surround";
|
||||||
inherit (cfg) setupOpts;
|
inherit (cfg) setupOpts;
|
||||||
|
|
||||||
keys =
|
keys = [
|
||||||
[
|
(mkLznKey "i" cfg.setupOpts.keymaps.insert)
|
||||||
(mkLznKey ["i"] cfg.setupOpts.keymaps.insert)
|
(mkLznKey "i" cfg.setupOpts.keymaps.insert_line)
|
||||||
(mkLznKey ["i"] cfg.setupOpts.keymaps.insert_line)
|
(mkLznKey "x" cfg.setupOpts.keymaps.visual)
|
||||||
(mkLznKey ["x"] cfg.setupOpts.keymaps.visual)
|
(mkLznKey "x" cfg.setupOpts.keymaps.visual_line)
|
||||||
(mkLznKey ["x"] cfg.setupOpts.keymaps.visual_line)
|
(mkLznKey "n" cfg.setupOpts.keymaps.normal)
|
||||||
(mkLznKey ["n"] cfg.setupOpts.keymaps.normal)
|
(mkLznKey "n" cfg.setupOpts.keymaps.normal_cur)
|
||||||
(mkLznKey ["n"] cfg.setupOpts.keymaps.normal_cur)
|
(mkLznKey "n" cfg.setupOpts.keymaps.normal_line)
|
||||||
(mkLznKey ["n"] cfg.setupOpts.keymaps.normal_line)
|
(mkLznKey "n" cfg.setupOpts.keymaps.normal_cur_line)
|
||||||
(mkLznKey ["n"] cfg.setupOpts.keymaps.normal_cur_line)
|
(mkLznKey "n" cfg.setupOpts.keymaps.delete)
|
||||||
(mkLznKey ["n"] cfg.setupOpts.keymaps.delete)
|
(mkLznKey "n" cfg.setupOpts.keymaps.change)
|
||||||
(mkLznKey ["n"] cfg.setupOpts.keymaps.change)
|
(mkLznKey "n" cfg.setupOpts.keymaps.change_line)
|
||||||
(mkLznKey ["n"] cfg.setupOpts.keymaps.change_line)
|
];
|
||||||
]
|
|
||||||
++ map (mkLznKey ["n" "i" "v"]) [
|
|
||||||
"<Plug>(nvim-surround-insert)"
|
|
||||||
"<Plug>(nvim-surround-insert-line)"
|
|
||||||
"<Plug>(nvim-surround-normal)"
|
|
||||||
"<Plug>(nvim-surround-normal-cur)"
|
|
||||||
"<Plug>(nvim-surround-normal-line)"
|
|
||||||
"<Plug>(nvim-surround-normal-cur-line)"
|
|
||||||
"<Plug>(nvim-surround-visual)"
|
|
||||||
"<Plug>(nvim-surround-visual-line)"
|
|
||||||
"<Plug>(nvim-surround-delete)"
|
|
||||||
"<Plug>(nvim-surround-change)"
|
|
||||||
"<Plug>(nvim-surround-change-line)"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -76,6 +76,7 @@
|
||||||
else
|
else
|
||||||
mkLuaInline ''
|
mkLuaInline ''
|
||||||
function()
|
function()
|
||||||
|
${optionalString (spec.beforeSetup != null) spec.beforeSetup}
|
||||||
${
|
${
|
||||||
optionalString (spec.setupModule != null)
|
optionalString (spec.setupModule != null)
|
||||||
"require(${toJSON spec.setupModule}).setup(${toLuaObject spec.setupOpts})"
|
"require(${toJSON spec.setupModule}).setup(${toLuaObject spec.setupOpts})"
|
||||||
|
|
|
@ -74,6 +74,15 @@
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
beforeSetup = mkOption {
|
||||||
|
type = nullOr lines;
|
||||||
|
default = null;
|
||||||
|
description = ''
|
||||||
|
Lua code to run after the plugin is loaded, but before the setup
|
||||||
|
function is called.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
setupModule = mkOption {
|
setupModule = mkOption {
|
||||||
type = nullOr str;
|
type = nullOr str;
|
||||||
default = null;
|
default = null;
|
||||||
|
|
Loading…
Reference in a new issue