diff --git a/modules/plugins/ui/notifications/nvim-notify/config.nix b/modules/plugins/ui/notifications/nvim-notify/config.nix index 50972176..0ee23017 100644 --- a/modules/plugins/ui/notifications/nvim-notify/config.nix +++ b/modules/plugins/ui/notifications/nvim-notify/config.nix @@ -14,9 +14,17 @@ in { startPlugins = ["nvim-notify"]; pluginRC.nvim-notify = entryAnywhere '' - local notify = require("notify") - notify.setup(${toLuaObject cfg.setupOpts}) - vim.notify = notify + require('notify').setup(${toLuaObject cfg.setupOpts}) + + -- required to fix offset_encoding errors + local notify = vim.notify + vim.notify = function(msg, ...) + if msg:match("warning: multiple different client offset_encodings") then + return + end + + notify(msg, ...) + end ''; }; }; diff --git a/modules/plugins/ui/notifications/nvim-notify/nvim-notify.nix b/modules/plugins/ui/notifications/nvim-notify/nvim-notify.nix index b09100da..f30d19cd 100644 --- a/modules/plugins/ui/notifications/nvim-notify/nvim-notify.nix +++ b/modules/plugins/ui/notifications/nvim-notify/nvim-notify.nix @@ -28,7 +28,7 @@ in { }; stages = mkOption { - type = enum ["fade_in_slide_out" "fade" "slide" "static"]; + type = enum ["fade_in_slide_out" "fade_in" "slide_out" "none"]; default = "fade_in_slide_out"; description = "The stages of the notification"; }; @@ -41,7 +41,7 @@ in { background_colour = mkOption { type = str; - default = "NotifyBackground"; + default = "#000000"; description = "The background colour of the notification"; }; diff --git a/modules/plugins/utility/preview/markdown-preview/config.nix b/modules/plugins/utility/preview/markdown-preview/config.nix index 50fec81a..8349d3fc 100644 --- a/modules/plugins/utility/preview/markdown-preview/config.nix +++ b/modules/plugins/utility/preview/markdown-preview/config.nix @@ -4,8 +4,8 @@ lib, ... }: let + inherit (lib.strings) concatMapStringsSep; inherit (lib.modules) mkIf; - cfg = config.vim.utility.preview.markdownPreview; in { config = mkIf cfg.enable { @@ -15,7 +15,7 @@ in { mkdp_auto_start = cfg.autoStart; mkdp_auto_close = cfg.autoClose; mkdp_refresh_slow = cfg.lazyRefresh; - mkdp_filetypes = cfg.filetypes; + mkdp_filetypes = [(concatMapStringsSep ", " (x: "'" + x + "'") cfg.filetypes)]; mkdp_command_for_global = cfg.alwaysAllowPreview; mkdp_open_to_the_world = cfg.broadcastServer; mkdp_open_ip = cfg.customIP;