diff --git a/flake.nix b/flake.nix index ac6957c2..2bc7ae8c 100644 --- a/flake.nix +++ b/flake.nix @@ -42,7 +42,7 @@ }; legacyPackages = rec { makeNixvimWithModule = import ./wrappers/standalone.nix pkgs modules; - makeNixvim = configuration: makeNixvimWithModule { + makeNixvim = configuration: makeNixvimWithModule { module = { config = configuration; }; diff --git a/plugins/bufferlines/bufferline.nix b/plugins/bufferlines/bufferline.nix index 730ba830..c7a7f645 100644 --- a/plugins/bufferlines/bufferline.nix +++ b/plugins/bufferlines/bufferline.nix @@ -58,7 +58,7 @@ in }; indicatorIcon = mkOption { type = types.nullOr types.str; - description = "The Icon shown as a indicator for buffer. Changing it is NOT recommended, + description = "The Icon shown as a indicator for buffer. Changing it is NOT recommended, this is intended to be an escape hatch for people who cannot bear it for whatever reason."; default = null; }; diff --git a/plugins/nvim-lsp/basic-servers.nix b/plugins/nvim-lsp/basic-servers.nix index 1f92dc7c..0208bbdc 100644 --- a/plugins/nvim-lsp/basic-servers.nix +++ b/plugins/nvim-lsp/basic-servers.nix @@ -28,7 +28,7 @@ let type = types.nullOr (types.listOf types.str); default = null; description = '' - An array of paths (absolute or relative to each workspace folder) that should be + An array of paths (absolute or relative to each workspace folder) that should be excluded from analysis. ''; }; @@ -36,7 +36,7 @@ let type = types.nullOr types.bool; default = null; description = '' - When set to false, prevents registration (or unregisters) the SDK formatter. When set + When set to false, prevents registration (or unregisters) the SDK formatter. When set to true or not supplied, will register/reregister the SDK formatter ''; }; @@ -44,7 +44,7 @@ let type = types.nullOr types.int; default = null; description = '' - The number of characters the formatter should wrap code at. If unspecified, code will + The number of characters the formatter should wrap code at. If unspecified, code will be wrapped at 80 characters. ''; }; @@ -59,7 +59,7 @@ let type = types.nullOr types.bool; default = true; description = '' - Whether to generate diagnostics for TODO comments. If unspecified, diagnostics will not + Whether to generate diagnostics for TODO comments. If unspecified, diagnostics will not be generated. ''; }; @@ -103,7 +103,7 @@ let type = types.nullOr types.bool; default = null; description = '' - Whether to include symbols from dependencies and Dart/Flutter SDKs in Workspace Symbol + Whether to include symbols from dependencies and Dart/Flutter SDKs in Workspace Symbol results. If not set, defaults to true. ''; }; diff --git a/plugins/nvim-lsp/lspsaga.nix b/plugins/nvim-lsp/lspsaga.nix index 055a4b30..d741dbc2 100644 --- a/plugins/nvim-lsp/lspsaga.nix +++ b/plugins/nvim-lsp/lspsaga.nix @@ -201,8 +201,9 @@ in in notEmpty keys; }; in mkIf cfg.enable { + extraPlugins = [ cfg.package ]; - + extraConfigLua = '' local saga = require 'lspsaga' diff --git a/plugins/snippets/luasnip/default.nix b/plugins/snippets/luasnip/default.nix index ad720437..c8485d0a 100644 --- a/plugins/snippets/luasnip/default.nix +++ b/plugins/snippets/luasnip/default.nix @@ -24,7 +24,7 @@ in } ] # generates: - # + # # require("luasnip.loaders.from_vscode").lazy_load({}) # require("luasnip.loaders.from_vscode").lazy_load({['paths'] = {'/nix/store/.../path/to/snippets'}}) # diff --git a/plugins/telescope/default.nix b/plugins/telescope/default.nix index 45c65f49..c914d499 100644 --- a/plugins/telescope/default.nix +++ b/plugins/telescope/default.nix @@ -68,7 +68,7 @@ in let $BAT_THEME = '${cfg.highlightTheme}' ''; - extraConfigLua = let + extraConfigLua = let options = { extensions = cfg.extensionConfig; defaults = cfg.defaults; diff --git a/plugins/telescope/frecency.nix b/plugins/telescope/frecency.nix index 58e93d1c..eecbfc06 100644 --- a/plugins/telescope/frecency.nix +++ b/plugins/telescope/frecency.nix @@ -1,6 +1,6 @@ { pkgs, config, lib, ... }: with lib; -let +let cfg = config.plugins.telescope.extensions.frecency; in { diff --git a/plugins/telescope/fzf-native.nix b/plugins/telescope/fzf-native.nix index 0686f8b2..525651dc 100644 --- a/plugins/telescope/fzf-native.nix +++ b/plugins/telescope/fzf-native.nix @@ -1,6 +1,6 @@ { pkgs, config, lib, ... }: with lib; -let +let cfg = config.plugins.telescope.extensions.fzf-native; in { @@ -34,7 +34,7 @@ in }; }; - config = let + config = let configuration = { fuzzy = cfg.fuzzy; override_generic_sorter = cfg.overrideGenericSorter; diff --git a/plugins/utils/magma-nvim.nix b/plugins/utils/magma-nvim.nix index 67fa1358..190a3c5f 100644 --- a/plugins/utils/magma-nvim.nix +++ b/plugins/utils/magma-nvim.nix @@ -73,21 +73,21 @@ in { package = mkOption { type = types.nullOr types.package; default = null; - example = + example = "package = pkgs.fetchFromGitHub { owner = \"WhiteBlackGoose\"; repo = \"magma-nvim-goose\"; rev = version; sha256 = \"sha256-IaslJK1F2BxTvZzKGH9OKOl2RICi4d4rSgjliAIAqK4=\";} "; - + }; }; }; config = mkIf cfg.enable { - extraPlugins = [ ( - if cfg.package != null then plugins.magma-nvim.override {src = cfg.package;} else plugins.magma-nvim + extraPlugins = [ ( + if cfg.package != null then plugins.magma-nvim.override {src = cfg.package;} else plugins.magma-nvim )];