Merge 4b3575a6d4 into 1166e8aa1d

Co-authored-by: raf <raf@notashelf.dev>

modules/plugins/languages/julia.nix

@@ -77,6 +77,8 @@ in {
 
       lsp = {
         enable = mkOption {
+          type = bool;
+          default = config.vim.languages.enableLSP;
           description = ''
             Whether to enable Julia LSP support.
 
@@ -86,22 +88,21 @@ in {
 
             If you want to avoid that, you have to change
             [](#opt-vim.languages.julia.lsp.package) to use the Julia binary
-            in PATH (set it to `null`), and add the `LanguageServer` package to
+            in {env}`PATH` (set it to `null`), and add the `LanguageServer` package to
             Julia in your devshells.
             :::
           '';
-          type = bool;
-          default = config.vim.languages.enableLSP;
         };
+
         server = mkOption {
-          description = "Julia LSP server to use";
           type = enum (attrNames servers);
           default = defaultServer;
+          description = "Julia LSP server to use";
         };
 
         package = mkOption {
           description = ''
-            Julia LSP server package, null to use the Julia binary in PATH, or
+            Julia LSP server package, `null` to use the Julia binary in {env}`PATH`, or
             the command to run as a list of strings.
           '';
           type = nullOr (either package (listOf str));

modules/plugins/utility/preview/markdown-preview/config.nix

@@ -4,9 +4,8 @@
   lib,
   ...
 }: let
-  inherit (lib.strings) stringLength concatMapStringsSep;
+  inherit (lib.strings) concatMapStringsSep;
   inherit (lib.modules) mkIf;
-
   cfg = config.vim.utility.preview.markdownPreview;
 in {
   config = mkIf cfg.enable {
@@ -19,8 +18,8 @@ in {
       mkdp_filetypes = [(concatMapStringsSep ", " (x: "'" + x + "'") cfg.filetypes)];
       mkdp_command_for_global = cfg.alwaysAllowPreview;
       mkdp_open_to_the_world = cfg.broadcastServer;
-      mkdp_open_ip = mkIf (stringLength cfg.customIP > 0) cfg.customIP;
-      mkdp_port = mkIf (stringLength cfg.customPort > 0) cfg.customPort;
+      mkdp_open_ip = cfg.customIP;
+      mkdp_port = cfg.customPort;
     };
   };
 }