nixvim: support standalone config as read-only option #795
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jasper-clarke
force-pushed
the
nixvim-standalone
branch
from
1d9848f to
d2190bc
Compare
Comment on lines
+86
to
+87
| config = lib.mkIf (config.stylix.enable && cfg.enable) { | ||
| stylix.targets.nixvim.config = lib.mkMerge [ |
There was a problem hiding this comment.
This option def shouldn't need to be conditional.
Rather, only the programs definition below should be conditional.
For comparison, my impl looks like:
config = {
programs = lib.mkIf (config.stylix.enable && cfg.enable) (
lib.optionalAttrs (options.programs ? nixvim) {
nixvim = config.lib.stylix.nixvim.config;
}
);
lib.stylix.nixvim.config = lib.mkMerge [| @@ -22,6 +22,26 @@ in | |||
| main = lib.mkEnableOption "background transparency for the main NeoVim window"; | |||
| signColumn = lib.mkEnableOption "background transparency for the NeoVim sign column"; | |||
| }; | |||
| config = lib.mkOption { | |||
There was a problem hiding this comment.
In #415, the consensus seemed to be that we should assign the nixvim config to config.lib.stylix.nixvim.config.
Doing that is incompatible with declaring an option, though. So it would be more difficult to document.
modules/nixvim/nixvim.nix
Outdated
Comment on lines
30
to
34
| The stylix configuration, generated for nixvim. | ||
| If nixvim is installed via nixos, darwin, or home-manager then this will be **automatically** | ||
| assigned to `programs.nixvim`. If you're using a "standalone" build of nixvim, then that's | ||
| not possible. Instead, you should pass this config to the `nixvimExtend` function. | ||
| For example: |
There was a problem hiding this comment.
Suggested change
| The stylix configuration, generated for nixvim. | |
| If nixvim is installed via nixos, darwin, or home-manager then this will be **automatically** | |
| assigned to `programs.nixvim`. If you're using a "standalone" build of nixvim, then that's | |
| not possible. Instead, you should pass this config to the `nixvimExtend` function. | |
| For example: | |
| The stylix configuration, generated for nixvim. | |
| If nixvim is installed via nixos, darwin, or home-manager then this will be **automatically** | |
| assigned to `programs.nixvim`. If you're using a "standalone" build of nixvim, then that's | |
| not possible. Instead, you should pass this config to the `nixvimExtend` function. | |
| For example: |
Markdown requires blank lines to signify paragraph breaks.
| ]; | ||
| } | ||
| ``` | ||
| See nixvim's docs on [extending a standalone configuration](https://nix-community.github.io/nixvim/platforms/standalone.html?highlight=extend#extending-an-existing-configuration). |
There was a problem hiding this comment.
Suggested change
| See nixvim's docs on [extending a standalone configuration](https://nix-community.github.io/nixvim/platforms/standalone.html?highlight=extend#extending-an-existing-configuration). | |
| See nixvim's docs on [extending a standalone configuration](https://nix-community.github.io/nixvim/platforms/standalone.html#extending-an-existing-configuration). |
Probably better without the highlight?
|
@MattSturgeon |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Updated Pull Request resolving #415