NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-10-03 07:23:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1161 from alfarelcynthesis/less-import

Browse source 
treewide: don't import modules manually
This commit is contained in:
Ching Pei Yang 2025-09-27 11:40:42 +02:00 • committed by GitHub
commit 06bc21e75c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 27 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/plugins/lsp/config.nix
View file

@ -1,7 +1,7 @@
{
config,
lib,
pkgs,
options,
...
}: let
inherit (lib.generators) mkLuaInline;
@ -14,12 +14,11 @@
cfg = config.vim.lsp;
usingNvimCmp = config.vim.autocomplete.nvim-cmp.enable;
usingBlinkCmp = config.vim.autocomplete.blink-cmp.enable;
self = import ./module.nix {inherit config lib pkgs;};
conformCfg = config.vim.formatter.conform-nvim;
conformFormatOnSave = conformCfg.enable && conformCfg.setupOpts.format_on_save != null;
augroup = "nvf_lsp";
mappingDefinitions = self.options.vim.lsp.mappings;
mappingDefinitions = options.vim.lsp.mappings;
mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
mkBinding = binding: action:
if binding.value != null

4
modules/plugins/lsp/nvim-docs-view/config.nix
View file

@ -1,6 +1,7 @@
{
config,
lib,
options,
...
}: let
inherit (lib.modules) mkIf mkMerge;
@ -9,9 +10,8 @@
inherit (lib.nvim.lua) toLuaObject;
cfg = config.vim.lsp.nvim-docs-view;
self = import ./nvim-docs-view.nix {inherit lib;};
mappingDefinitions = self.options.vim.lsp.nvim-docs-view.mappings;
mappingDefinitions = options.vim.lsp.nvim-docs-view.mappings;
mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
in {
config = mkIf cfg.enable {

4
modules/plugins/lsp/otter/config.nix
View file

@ -1,6 +1,7 @@
{
config,
lib,
options,
...
}: let
inherit (lib.modules) mkIf mkMerge;
@ -10,8 +11,7 @@
cfg = config.vim.lsp;
self = import ./otter.nix {inherit lib;};
mappingDefinitions = self.options.vim.lsp.otter-nvim.mappings;
mappingDefinitions = options.vim.lsp.otter-nvim.mappings;
mappings = addDescriptionsToMappings cfg.otter-nvim.mappings mappingDefinitions;
in {
config = mkIf (cfg.enable && cfg.otter-nvim.enable) {