mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-21 08:35:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

lib/{neovim,vim}-plugin: remove redundant parens

Browse source
This commit is contained in:
Matt Sturgeon 2024-12-18 20:12:01 +00:00
parent 6019ce784c
commit f1addaaddf
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/neovim-plugin.nix
View file

@ -147,7 +147,7 @@
]; ];
} }
(lib.optionalAttrs (isColorscheme && (colorscheme != null)) { (lib.optionalAttrs (isColorscheme && colorscheme != null) {
colorscheme = lib.mkDefault colorscheme; colorscheme = lib.mkDefault colorscheme;
}) })
@ -159,7 +159,7 @@
)) ))
] ]
# Lua configuration code generation # Lua configuration code generation
++ (lib.optionals hasLuaConfig [ ++ lib.optionals hasLuaConfig [
# Add the plugin setup code `require('foo').setup(...)` to the lua configuration # Add the plugin setup code `require('foo').setup(...)` to the lua configuration
(lib.optionalAttrs callSetup (lib.setAttrByPath loc { luaConfig.content = setupCode; })) (lib.optionalAttrs callSetup (lib.setAttrByPath loc { luaConfig.content = setupCode; }))
@ -197,7 +197,7 @@
]; ];
}; };
}) })
]) ]
) )
); );
}; };
@ -209,9 +209,9 @@
in in
imports imports
++ [ module ] ++ [ module ]
++ (lib.optional deprecateExtraOptions ( ++ lib.optional deprecateExtraOptions (
lib.mkRenamedOptionModule (loc ++ [ "extraOptions" ]) settingsPath lib.mkRenamedOptionModule (loc ++ [ "extraOptions" ]) settingsPath
)) )
++ (lib.nixvim.mkSettingsRenamedOptionModules loc settingsPath optionsRenamedToSettings); ++ lib.nixvim.mkSettingsRenamedOptionModules loc settingsPath optionsRenamedToSettings;
}; };
} }

10
lib/vim-plugin.nix
View file

@ -61,7 +61,7 @@ rec {
name name
]; ];
createSettingsOption = (lib.isString globalPrefix) && (globalPrefix != ""); createSettingsOption = lib.isString globalPrefix && globalPrefix != "";
settingsOption = lib.optionalAttrs createSettingsOption { settingsOption = lib.optionalAttrs createSettingsOption {
settings = mkSettingsOption { settings = mkSettingsOption {
@ -133,7 +133,7 @@ rec {
]; ];
globals = lib.nixvim.applyPrefixToAttrs globalPrefix (cfg.settings or { }); globals = lib.nixvim.applyPrefixToAttrs globalPrefix (cfg.settings or { });
} }
(lib.optionalAttrs (isColorscheme && (colorscheme != null)) { (lib.optionalAttrs (isColorscheme && colorscheme != null) {
colorscheme = lib.mkDefault colorscheme; colorscheme = lib.mkDefault colorscheme;
}) })
(lib.optionalAttrs (args ? extraConfig) ( (lib.optionalAttrs (args ? extraConfig) (
@ -152,9 +152,9 @@ rec {
in in
imports imports
++ [ module ] ++ [ module ]
++ (lib.optional (deprecateExtraConfig && createSettingsOption) ( ++ lib.optional (deprecateExtraConfig && createSettingsOption) (
lib.mkRenamedOptionModule (loc ++ [ "extraConfig" ]) settingsPath lib.mkRenamedOptionModule (loc ++ [ "extraConfig" ]) settingsPath
)) )
++ (lib.nixvim.mkSettingsRenamedOptionModules loc settingsPath optionsRenamedToSettings); ++ lib.nixvim.mkSettingsRenamedOptionModules loc settingsPath optionsRenamedToSettings;
}; };
} }