NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-10-31 02:52:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

utility/preview: cleanup and optionalString

Browse source
This commit is contained in:
Donnerinoern 2024-02-13 15:45:47 +01:00
commit 2e07763149
7 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/utility/preview/default.nix
View file

@ -1,4 +1,4 @@
_: { {
imports = [ imports = [
./markdown-preview ./markdown-preview
./glow ./glow

2
modules/utility/preview/glow/config.nix
View file

@ -16,7 +16,7 @@ in {
vim.startPlugins = ["glow-nvim"]; vim.startPlugins = ["glow-nvim"];
vim.maps.normal = mkMerge [ vim.maps.normal = mkMerge [
(mkBinding cfg.glow.mappings.openPreview ":Glow<CR>" mappings.openPreview.description) (mkBinding cfg.mappings.openPreview ":Glow<CR>" mappings.openPreview.description)
]; ];
vim.luaConfigRC.glow = nvim.dag.entryAnywhere '' vim.luaConfigRC.glow = nvim.dag.entryAnywhere ''

2
modules/utility/preview/glow/default.nix
View file

@ -1,4 +1,4 @@
_: { {
imports = [ imports = [
./glow.nix ./glow.nix
./config.nix ./config.nix

2
modules/utility/preview/glow/glow.nix
View file

@ -3,7 +3,7 @@
in { in {
options.vim.utility.preview = { options.vim.utility.preview = {
glow = { glow = {
enable = mkEnableOption "enable markdown preview in neovim with glow"; enable = mkEnableOption "markdown preview in neovim with glow";
mappings = { mappings = {
openPreview = mkMappingOption "Open preview" "<leader>p"; openPreview = mkMappingOption "Open preview" "<leader>p";
}; };

6
modules/utility/preview/markdown-preview/config.nix
View file

@ -4,7 +4,7 @@
lib, lib,
... ...
}: let }: let
inherit (lib) nvim mkIf mkMerge concatMapStringsSep; inherit (lib) nvim mkIf concatMapStringsSep optionalString stringLength;
inherit (nvim.vim) mkVimBool; inherit (nvim.vim) mkVimBool;
cfg = config.vim.utility.preview.markdownPreview; cfg = config.vim.utility.preview.markdownPreview;
@ -19,8 +19,8 @@ in {
let g:mkdp_filetypes = [${concatMapStringsSep ", " (x: "'" + x + "'") cfg.filetypes}] let g:mkdp_filetypes = [${concatMapStringsSep ", " (x: "'" + x + "'") cfg.filetypes}]
let g:mkdp_command_for_global = ${mkVimBool cfg.alwaysAllowPreview} let g:mkdp_command_for_global = ${mkVimBool cfg.alwaysAllowPreview}
let g:mkdp_open_to_the_world = ${mkVimBool cfg.broadcastServer} let g:mkdp_open_to_the_world = ${mkVimBool cfg.broadcastServer}
let g:mkdp_open_ip = '${cfg.customIP}' ${optionalString (stringLength cfg.customIP > 0) "let g:mkdp_open_ip = '${cfg.customIP}'"}
let g:mkdp_port = '${cfg.customPort}' ${optionalString (stringLength cfg.customPort > 0) "let g:mkdp_port = '${cfg.customPort}'"}
''; '';
}; };
} }

2
modules/utility/preview/markdown-preview/default.nix
View file

@ -1,4 +1,4 @@
_: { {
imports = [ imports = [
./markdown-preview.nix ./markdown-preview.nix
./config.nix ./config.nix

2
modules/utility/preview/markdown-preview/markdown-preview.nix
View file

@ -3,7 +3,7 @@
in { in {
options.vim.utility.preview = { options.vim.utility.preview = {
markdownPreview = { markdownPreview = {
enable = mkEnableOption "enable Markdown preview in neovim with markdown-preview.nvim"; enable = mkEnableOption "Markdown preview in neovim with markdown-preview.nvim";
autoStart = mkOption { autoStart = mkOption {
type = types.bool; type = types.bool;