NotAShelf/nvf
1
0
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-02-22 03:18:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

treewide: update lazy.plugins syntax

Browse source
This commit is contained in:
Pei Yang Ching 2024-10-17 17:17:18 +02:00
parent 854fd340e3
commit d49e46ab16
13 changed files with 262 additions and 286 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/plugins/comments/comment-nvim/config.nix
View file

@ -15,8 +15,7 @@ in {
"comment-nvim" "comment-nvim"
]; ];
vim.lazy.plugins = [ vim.lazy.plugins.comment-nvim = {
{
package = "comment-nvim"; package = "comment-nvim";
setupModule = "Comment"; setupModule = "Comment";
inherit (cfg) setupOpts; inherit (cfg) setupOpts;
@ -41,7 +40,6 @@ in {
(mkLznBinding ["x"] cfg.mappings.toggleSelectedLine "<Plug>(comment_toggle_linewise_visual)" mappings.toggleSelectedLine.description) (mkLznBinding ["x"] cfg.mappings.toggleSelectedLine "<Plug>(comment_toggle_linewise_visual)" mappings.toggleSelectedLine.description)
(mkLznBinding ["x"] cfg.mappings.toggleSelectedBlock "<Plug>(comment_toggle_blockwise_visual)" mappings.toggleSelectedBlock.description) (mkLznBinding ["x"] cfg.mappings.toggleSelectedBlock "<Plug>(comment_toggle_blockwise_visual)" mappings.toggleSelectedBlock.description)
]; ];
} };
];
}; };
} }

6
modules/plugins/debugger/nvim-dap/config.nix
View file

@ -54,8 +54,7 @@ in {
vim = { vim = {
startPlugins = ["nvim-nio"]; startPlugins = ["nvim-nio"];
lazy.plugins = [ lazy.plugins.nvim-dap-ui = {
{
package = "nvim-dap-ui"; package = "nvim-dap-ui";
setupModule = "dapui"; setupModule = "dapui";
setupOpts = {}; setupOpts = {};
@ -63,8 +62,7 @@ in {
keys = [ keys = [
(mkSetLuaLznBinding mappings.toggleDapUI "function() require('dapui').toggle() end") (mkSetLuaLznBinding mappings.toggleDapUI "function() require('dapui').toggle() end")
]; ];
} };
];
pluginRC.nvim-dap-ui = entryAfter ["nvim-dap"] ( pluginRC.nvim-dap-ui = entryAfter ["nvim-dap"] (
optionalString cfg.ui.autoStart '' optionalString cfg.ui.autoStart ''

6
modules/plugins/filetree/neo-tree/config.nix
View file

@ -16,15 +16,13 @@ in {
"nui-nvim" # ui library "nui-nvim" # ui library
]; ];
lazy.plugins = [ lazy.plugins.neo-tree-nvim = {
{
package = "neo-tree-nvim"; package = "neo-tree-nvim";
setupModule = "neo-tree"; setupModule = "neo-tree";
inherit (cfg) setupOpts; inherit (cfg) setupOpts;
cmd = ["Neotree"]; cmd = ["Neotree"];
} };
];
visuals.nvimWebDevicons.enable = true; visuals.nvimWebDevicons.enable = true;
}; };

12
modules/plugins/filetree/nvimtree/config.nix
View file

@ -15,12 +15,12 @@
inherit (self.options.vim.filetree.nvimTree) mappings; inherit (self.options.vim.filetree.nvimTree) mappings;
in { in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
vim.binds.whichKey.register = pushDownDefault { vim = {
binds.whichKey.register = pushDownDefault {
"<leader>t" = "+NvimTree"; "<leader>t" = "+NvimTree";
}; };
vim.lazy.plugins = [ lazy.plugins.nvim-tree-lua = {
{
package = "nvim-tree-lua"; package = "nvim-tree-lua";
setupModule = "nvim-tree"; setupModule = "nvim-tree";
inherit (cfg) setupOpts; inherit (cfg) setupOpts;
@ -31,10 +31,9 @@ in {
(mkLznBinding ["n"] cfg.mappings.findFile ":NvimTreeFindFile<cr>" mappings.findFile.description) (mkLznBinding ["n"] cfg.mappings.findFile ":NvimTreeFindFile<cr>" mappings.findFile.description)
(mkLznBinding ["n"] cfg.mappings.focus ":NvimTreeFocus<cr>" mappings.focus.description) (mkLznBinding ["n"] cfg.mappings.focus ":NvimTreeFocus<cr>" mappings.focus.description)
]; ];
} };
];
vim.pluginRC.nvimtreelua = entryAnywhere '' pluginRC.nvimtreelua = entryAnywhere ''
${ ${
optionalString cfg.setupOpts.disable_netrw '' optionalString cfg.setupOpts.disable_netrw ''
-- disable netrew completely -- disable netrew completely
@ -85,4 +84,5 @@ in {
} }
''; '';
}; };
};
} }

6
modules/plugins/lsp/trouble/config.nix
View file

@ -14,8 +14,7 @@
in { in {
config = mkIf (cfg.enable && cfg.trouble.enable) { config = mkIf (cfg.enable && cfg.trouble.enable) {
vim = { vim = {
lazy.plugins = [ lazy.plugins.trouble = {
{
package = "trouble"; package = "trouble";
setupModule = "trouble"; setupModule = "trouble";
inherit (cfg.trouble) setupOpts; inherit (cfg.trouble) setupOpts;
@ -29,8 +28,7 @@ in {
(mkSetLznBinding mappings.quickfix "<cmd>TroubleToggle quickfix<CR>") (mkSetLznBinding mappings.quickfix "<cmd>TroubleToggle quickfix<CR>")
(mkSetLznBinding mappings.locList "<cmd>TroubleToggle loclist<CR>") (mkSetLznBinding mappings.locList "<cmd>TroubleToggle loclist<CR>")
]; ];
} };
];
binds.whichKey.register = pushDownDefault { binds.whichKey.register = pushDownDefault {
"<leader>l" = "Trouble"; "<leader>l" = "Trouble";

6
modules/plugins/terminal/toggleterm/config.nix
View file

@ -14,8 +14,7 @@
in { in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
vim = { vim = {
lazy.plugins = [ lazy.plugins.toggleterm-nvim = {
{
package = "toggleterm-nvim"; package = "toggleterm-nvim";
cmd = ["ToggleTerm" "ToggleTermSendCurrentLine" "ToggleTermSendVisualLines" "ToggleTermSendVisualSelection" "ToggleTermSetName" "ToggleTermToggleAll"]; cmd = ["ToggleTerm" "ToggleTermSendCurrentLine" "ToggleTermSendVisualLines" "ToggleTermSendVisualSelection" "ToggleTermSetName" "ToggleTermToggleAll"];
keys = [ keys = [
@ -45,8 +44,7 @@ in {
vim.keymap.set('n', ${toJSON cfg.lazygit.mappings.open}, function() lazygit:toggle() end, {silent = true, noremap = true, desc = '${lazygitMapDesc}'}) vim.keymap.set('n', ${toJSON cfg.lazygit.mappings.open}, function() lazygit:toggle() end, {silent = true, noremap = true, desc = '${lazygitMapDesc}'})
''; '';
} };
];
}; };
}; };
} }

6
modules/plugins/utility/binds/cheatsheet/config.nix
View file

@ -9,15 +9,13 @@
cfg = config.vim.binds.cheatsheet; cfg = config.vim.binds.cheatsheet;
in { in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
vim.lazy.plugins = [ vim.lazy.plugins.cheatsheet-nvim = {
{
package = "cheatsheet-nvim"; package = "cheatsheet-nvim";
setupModule = "cheatsheet"; setupModule = "cheatsheet";
setupOpts = {}; setupOpts = {};
cmd = ["Cheatsheet" "CheatsheetEdit"]; cmd = ["Cheatsheet" "CheatsheetEdit"];
before = optionalString config.vim.lazy.enable "require('lz.n').trigger_load('telescope')"; before = optionalString config.vim.lazy.enable "require('lz.n').trigger_load('telescope')";
} };
];
}; };
} }

6
modules/plugins/utility/diffview/config.nix
View file

@ -10,14 +10,12 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
vim = { vim = {
startPlugins = ["plenary-nvim"]; startPlugins = ["plenary-nvim"];
lazy.plugins = [ lazy.plugins.diffview-nvim = {
{
package = "diffview-nvim"; package = "diffview-nvim";
cmd = ["DiffviewClose" "DiffviewFileHistory" "DiffviewFocusFiles" "DiffviewLog" "DiffviewOpen" "DiffviewRefresh" "DiffviewToggleFiles"]; cmd = ["DiffviewClose" "DiffviewFileHistory" "DiffviewFocusFiles" "DiffviewLog" "DiffviewOpen" "DiffviewRefresh" "DiffviewToggleFiles"];
setupModule = "diffview"; setupModule = "diffview";
inherit (cfg) setupOpts; inherit (cfg) setupOpts;
} };
];
}; };
}; };
} }

6
modules/plugins/utility/icon-picker/config.nix
View file

@ -10,8 +10,7 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
vim.startPlugins = ["dressing-nvim"]; vim.startPlugins = ["dressing-nvim"];
vim.lazy.plugins = [ vim.lazy.plugins.icon-picker-nvim = {
{
package = "icon-picker-nvim"; package = "icon-picker-nvim";
setupModule = "icon-picker"; setupModule = "icon-picker";
setupOpts = { setupOpts = {
@ -19,7 +18,6 @@ in {
}; };
cmd = ["IconPickerInsert" "IconPickerNormal" "IconPickerYank"]; cmd = ["IconPickerInsert" "IconPickerNormal" "IconPickerYank"];
} };
];
}; };
} }

6
modules/plugins/utility/motion/leap/config.nix
View file

@ -11,8 +11,7 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
vim = { vim = {
startPlugins = ["vim-repeat"]; startPlugins = ["vim-repeat"];
lazy.plugins = [ lazy.plugins.leap-nvim = {
{
package = "leap-nvim"; package = "leap-nvim";
keys = [ keys = [
(mkLznBinding ["n" "o" "x"] cfg.mappings.leapForwardTo "<Plug>(leap-forward-to)" "Leap forward to") (mkLznBinding ["n" "o" "x"] cfg.mappings.leapForwardTo "<Plug>(leap-forward-to)" "Leap forward to")
@ -54,8 +53,7 @@ in {
}, },
} }
''; '';
} };
];
}; };
}; };
} }

6
modules/plugins/utility/surround/config.nix
View file

@ -30,8 +30,7 @@ in {
startPlugins = ["nvim-surround"]; startPlugins = ["nvim-surround"];
pluginRC.surround = entryAnywhere "require('nvim-surround').setup(${toLuaObject cfg.setupOpts})"; pluginRC.surround = entryAnywhere "require('nvim-surround').setup(${toLuaObject cfg.setupOpts})";
lazy.plugins = [ lazy.plugins.nvim-surround = {
{
package = "nvim-surround"; package = "nvim-surround";
setupModule = "nvim-surround"; setupModule = "nvim-surround";
inherit (cfg) setupOpts; inherit (cfg) setupOpts;
@ -48,8 +47,7 @@ in {
change change
change_line change_line
]); ]);
} };
];
utility.surround.setupOpts.keymaps = mkIf cfg.useVendoredKeybindings vendoredKeybinds; utility.surround.setupOpts.keymaps = mkIf cfg.useVendoredKeybindings vendoredKeybinds;
}; };

6
modules/plugins/utility/telescope/config.nix
View file

@ -20,8 +20,7 @@ in {
vim = { vim = {
startPlugins = ["plenary-nvim"]; startPlugins = ["plenary-nvim"];
lazy.plugins = [ lazy.plugins.telescope = {
{
package = "telescope"; package = "telescope";
setupModule = "telescope"; setupModule = "telescope";
inherit (cfg) setupOpts; inherit (cfg) setupOpts;
@ -69,8 +68,7 @@ in {
(mkSetLznBinding mappings.findProjects "<cmd Telescope projects<CR>") (mkSetLznBinding mappings.findProjects "<cmd Telescope projects<CR>")
] ]
); );
} };
];
binds.whichKey.register = pushDownDefault { binds.whichKey.register = pushDownDefault {
"<leader>f" = "+Telescope"; "<leader>f" = "+Telescope";

6
modules/plugins/visuals/fidget/config.nix
View file

@ -8,13 +8,11 @@
cfg = config.vim.visuals.fidget-nvim; cfg = config.vim.visuals.fidget-nvim;
in { in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
vim.lazy.plugins = [ vim.lazy.plugins.fidget-nvim = {
{
package = "fidget-nvim"; package = "fidget-nvim";
setupModule = "fidget"; setupModule = "fidget";
event = "LspAttach"; event = "LspAttach";
inherit (cfg) setupOpts; inherit (cfg) setupOpts;
} };
];
}; };
} }