From c91aef9325f44ea59c02b5e09d6ce486f839c55a Mon Sep 17 00:00:00 2001 From: Sravan Balaji Date: Fri, 26 Feb 2021 21:23:23 -0500 Subject: [PATCH] Switch from Deadd to Dunst Notifications - Add Dunst parameters to Xresources - Remove Deadd config folder - Add dunstrc with configurations - Add launch_dunst.sh to override some config parameters from Xresources - Add dwm keybindings for Dunst - Replace polybar deadd module with dunst commands and variable names --- .Xresources | 20 +- .config/deadd/deadd-notification-toggle.sh | 17 - .config/deadd/deadd.conf | 161 -------- .config/deadd/deadd.css | 57 --- .config/deadd/open-notification-center.sh | 3 - .config/dunst/dunstrc | 439 +++++++++++++++++++++ .config/dunst/launch_dunst.sh | 18 + .config/dwm | 2 +- .config/polybar | 2 +- 9 files changed, 478 insertions(+), 241 deletions(-) delete mode 100755 .config/deadd/deadd-notification-toggle.sh delete mode 100644 .config/deadd/deadd.conf delete mode 100644 .config/deadd/deadd.css delete mode 100755 .config/deadd/open-notification-center.sh create mode 100644 .config/dunst/dunstrc create mode 100644 .config/dunst/launch_dunst.sh diff --git a/.Xresources b/.Xresources index 9e2cfbe..bc76d6b 100644 --- a/.Xresources +++ b/.Xresources @@ -62,7 +62,7 @@ *.color15: WHITE1 *.color16: ORANGE -! DWM Parameters +! DWM dwm.normbgcolor: BACKGROUND dwm.normbordercolor: BLACK2 dwm.normfgcolor: FOREGROUND @@ -82,5 +82,23 @@ polybar.tray-maxsize: TRAY_MAXSIZE polybar.tray-scale: TRAY_SCALE polybar.maxlen: MAXLEN +! Dunst +dunst.geometry-x: OUTER_GAPS +dunst.geometry-y: BAR_HEIGHT +dunst.sep-height: BORDER_SIZE +dunst.padding: OUTER_GAPS +dunst.horiz-padding: OUTER_GAPS +dunst.max-icon-size: DPI +dunst.frame-width: BORDER_SIZE +dunst.low-background: BACKGROUND +dunst.low-foreground: FOREGROUND +dunst.low-frame: PURPLE1 +dunst.normal-background: BACKGROUND +dunst.normal-foreground: FOREGROUND +dunst.normal-frame: PURPLE1 +dunst.critical-background: RED1 +dunst.critical-foreground: FOREGROUND +dunst.critical-frame: PURPLE1 + ! Display Scaling *.dpi: DPI diff --git a/.config/deadd/deadd-notification-toggle.sh b/.config/deadd/deadd-notification-toggle.sh deleted file mode 100755 index 7065394..0000000 --- a/.config/deadd/deadd-notification-toggle.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -STATUS_FILE=~/.config/deadd/status - -if [[ ! -f $STATUS_FILE ]]; then - echo 1 >$STATUS_FILE -fi - -status=$(cat $STATUS_FILE) - -if [[ $status == 1 ]]; then - # Set status to off - echo 0 >$STATUS_FILE -elif [[ $status == 0 ]]; then - # Set status to on - echo 1 >$STATUS_FILE -fi diff --git a/.config/deadd/deadd.conf b/.config/deadd/deadd.conf deleted file mode 100644 index 1f97b45..0000000 --- a/.config/deadd/deadd.conf +++ /dev/null @@ -1,161 +0,0 @@ -[notification-center] - -# Margin at the top of the notification center in pixels. This can be -# used to avoid overlap between the notification center and bars such -# as polybar or i3blocks. -marginTop = 0 - -# Margin at the bottom of the notification center in pixels. -marginBottom = 0 - -# Margin to the right of the notification center in pixels. -marginRight = 0 - -# Width of the notification center in pixels. -width = 500 - -# Monitor on which the notification center will be printed. -monitor = 0 - -# If true, the notification center will open on the screen, on which the -# mouse is -followMouse = true - -# (Optional) Command to run at startup. This can be used to setup -# button states. -# startupCommand = "deadd-notification-center-startup" - -# If newFirst is set to true, newest notifications appear on the top -# of the notification center. Else, notifications stack, from top to -# bottom. -newFirst = true - -# If true, the transient field in notifications will be ignored and -# the notification will be persisted in the notification center anyways -ignoreTransient = false - -# If true, markup (, , , ) will be displayed properly -useMarkup = true - -# If true, html entities (& for &, % for %, etc) will be parsed -# properly. This is useful for chromium-based apps, which tend to send -# these in notifications. -parseHtmlEntities = true - -# If set to true, the parameter noClosedMsg can be set on -# notifications. If noClosedMsg is set to true on a notification, -# DBUS NotificationClosed messages will not be send for this -# notification. -configSendNotiClosedDbusMessage = false - -# If set to true: If no icon is passed by the app_icon parameter -# and no application "desktop-entry"-hint is present, the notification -# center will try to guess the icon from the application name (if present). -# Default is true. -guessIconFromAppname = true - -# Truncates notification bodies with '...' at the specified number of -# lines. If -1 is specified, the body text will not be truncated. -# Applies only to notifications within the notification center. -shortenBody = -1 - -# See section "Notification based scripting" for an explanation -#match = "title=Abc;body=abc":"app=notify-send" -#modify = "transient=false" -#run = "":"killall notify-send" - -[notification-center-notification-popup] - -# Default timeout used for notifications in milli-seconds. This can -# be overwritten with the "-t" option (or "--expire-time") of the -# notify-send command. -notiDefaultTimeout = 10000 - -# Margin above notifications (in pixels). This can be used to avoid -# overlap between notifications and a bar such as polybar or i3blocks. -distanceTop = 50 - -# Margin on the right of the notification (in pixels). -distanceRight = 50 - -# Vertical distance between 2 notifications (in pixels). -distanceBetween = 20 - -# Width of the notifications. -width = 400 - -# Monitor on which the notification will be printed. -monitor = 0 - -# If true, the notifications will open on the screen, on which the -# mouse is -followMouse = true - -# The display size of the application icons in the notification -# pop-ups and in the notification center -iconSize = 25 - -# The maximal display size of images that are part of notifications -# for notification pop-ups and in the notification center -maxImageSize = 100 - -# The margin around the top, bottom, left, and right of notification -# images. Applies to popup notifications and in-center notifications. -imageMarginTop = 10 -imageMarginBottom = 10 -imageMarginLeft = 10 -imageMarginRight = 10 - -# Truncates notification bodies with '...' at the specified number of -# lines. If -1 is specified, the body text will not be truncated. -# Applies only to popup notifications -shortenBody = 5 - -# The mouse button for closing a popup. -# mouse1 (Left button) -# mouse2 (Wheel button click / Middle button) -# mouse3 (Right button) -# mouse4 (Wheel up) -# mouse5 (Wheel down) -dismissButton = mouse1 - -# The mouse button for opening a popup with the default action. -# mouse1 (Left button) -# mouse2 (Wheel button click / Middle button) -# mouse3 (Right button) -# mouse4 (Wheel up) -# mouse5 (Wheel down) -defaultActionButton = mouse3 - -[buttons] -### This section describes the configurable buttons within the -### notification center and NOT the buttons that appear in the -### notifications - -# Note: If you want your buttons in the notification center to be -# squares you should verify that the following equality holds: -# [notification-center]::width -# == [buttons]::buttonsPerRow * [buttons]::buttonHeight -# + ([buttons]::buttonsPerRow + 1) * [buttons]::buttonMargin - -# Numbers of buttons that can be drawn on a row of the notification -# center. -buttonsPerRow = 5 - -# Height of buttons in the notification center (in pixels). -buttonHeight = 60 - -# Horizontal and vertical margin between each button in the -# notification center (in pixels). -buttonMargin = 2 - -# Labels written on the buttons in the notification center. Labels -# should be written between quotes and separated by a colon. For -# example: -# labels = "VPN":"Bluetooth":"Wifi":"Screensaver" - -# Each label is represented as a clickable button in the notification -# center. The commands variable below define the commands that should -# be launched when the user clicks on the associated button. There -# should be the same number of entries in `commands` and in `labels` -# commands = "sudo vpnToggle":"bluetoothToggle":"wifiToggle":"screensaverToggle" diff --git a/.config/deadd/deadd.css b/.config/deadd/deadd.css deleted file mode 100644 index 3b21454..0000000 --- a/.config/deadd/deadd.css +++ /dev/null @@ -1,57 +0,0 @@ -/* Notifications - * - Appname: label.deadd-noti-center.notification.appname - * - Textbody: label.deadd-noti-center.notification.body - * - Notification title: label.deadd-noti-center.notification.title - * - Image of a notification: image.deadd-noti-center.notification.image - * - Appicon: image.deadd-noti-center.notification.icon - */ - -/* Notifications in the notification center - * - Appname: label.deadd-noti-center.in-center.appname - * - Textbody: label.deadd-noti-center.in-center.body - * - Notification title: label.deadd-noti-center.in-center.title - * - Notification time: label.deadd-noti-center.in-center.time - * - Image of a notification: image.deadd-noti-center.in-center.image - * - Appicon: image.deadd-noti-center.in-center.icon - * - Close button on notification: button.deadd-noti-center.in-center.button-close - */ - -/* Notification-center - * - The big time at the top: label.deadd-noti-center.noti-center.time - * - The date text: label.deadd-noti-center.noti-center.date - * - “Delete all” Button: label.deadd-noti-center.noti-center.delete-all - */ - -/* Examples - * image.deadd-noti-center.notification.icon, - * label.deadd-noti-center.notification.appname, - * image.deadd-noti-center.in-center.icon, - * label.deadd-noti-center.in-center.appname { - * opacity: 0 - * } - * .deadd-noti-center { - * font-family: monospace; - * } - */ - -/* :root { - --color-foreground: #f8f8f2; - --color-background: #282a36; - --color-black1: #000000; - --color-black2: #4d4d4d; - --color-white1: #e6e6e6; - --color-white2: #bfbfbf; - --color-red1: #ff5555; - --color-red2: #ff6e67; - --color-green1: #50fa7b; - --color-green2: #5af78e; - --color-yellow1: #f1fa8c; - --color-yellow2: #f4f99d; - --color-purple1: #bd93f9; - --color-purple2: #caa9fa; - --color-pink1: #ff79c6; - --color-pink2: #ff92d0; - --color-cyan1: #8be9fd; - --color-cyan2: #9aedfe; - --color-orange: #ffb86c; -} */ diff --git a/.config/deadd/open-notification-center.sh b/.config/deadd/open-notification-center.sh deleted file mode 100755 index 400c416..0000000 --- a/.config/deadd/open-notification-center.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -# Toggle between hidden and shown state of the notification center -kill -s USR1 $(pidof deadd-notification-center) diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc new file mode 100644 index 0000000..3efc5a9 --- /dev/null +++ b/.config/dunst/dunstrc @@ -0,0 +1,439 @@ +[global] + ### Display ### + + # Which monitor should the notifications be displayed on. + monitor = 0 + + # Display notification on focused monitor. Possible modes are: + # mouse: follow mouse pointer + # keyboard: follow window with keyboard focus + # none: don't follow anything + # + # "keyboard" needs a window manager that exports the + # _NET_ACTIVE_WINDOW property. + # This should be the case for almost all modern window managers. + # + # If this option is set to mouse or keyboard, the monitor option + # will be ignored. + follow = keyboard + + # The geometry of the window: + # [{width}]x{height}[+/-{x}+/-{y}] + # The geometry of the message window. + # The height is measured in number of notifications everything else + # in pixels. If the width is omitted but the height is given + # ("-geometry x2"), the message window expands over the whole screen + # (dmenu-like). If width is 0, the window expands to the longest + # message displayed. A positive x is measured from the left, a + # negative from the right side of the screen. Y is measured from + # the top and down respectively. + # The width can be negative. In this case the actual width is the + # screen width minus the width defined in within the geometry option. + geometry = "0x0-10+40" + + # Show how many messages are currently hidden (because of geometry). + indicate_hidden = yes + + # Shrink window if it's smaller than the width. Will be ignored if + # width is 0. + shrink = no + + # The transparency of the window. Range: [0; 100]. + # This option will only work if a compositing window manager is + # present (e.g. xcompmgr, compiz, etc.). + transparency = 15 + + # The height of the entire notification. If the height is smaller + # than the font height and padding combined, it will be raised + # to the font height and padding. + notification_height = 0 + + # Draw a line of "separator_height" pixel height between two + # notifications. + # Set to 0 to disable. + separator_height = 1 + + # Padding between text and separator. + padding = 8 + + # Horizontal padding. + horizontal_padding = 10 + + # Defines width in pixels of frame around the notification window. + # Set to 0 to disable. + frame_width = 2 + + # Defines color of the frame around the notification window. + frame_color = "#aaaaaa" + + # Define a color for the separator. + # possible values are: + # * auto: dunst tries to find a color fitting to the background; + # * foreground: use the same color as the foreground; + # * frame: use the same color as the frame; + # * anything else will be interpreted as a X color. + separator_color = frame + + # Sort messages by urgency. + sort = yes + + # Don't remove messages, if the user is idle (no mouse or keyboard input) + # for longer than idle_threshold seconds. + # Set to 0 to disable. + # A client can set the 'transient' hint to bypass this. See the rules + # section for how to disable this if necessary + idle_threshold = 120 + + ### Text ### + + font = Monospace 10 + + # The spacing between lines. If the height is smaller than the + # font height, it will get raised to the font height. + line_height = 0 + + # Possible values are: + # full: Allow a small subset of html markup in notifications: + # bold + # italic + # strikethrough + # underline + # + # For a complete reference see + # . + # + # strip: This setting is provided for compatibility with some broken + # clients that send markup even though it's not enabled on the + # server. Dunst will try to strip the markup but the parsing is + # simplistic so using this option outside of matching rules for + # specific applications *IS GREATLY DISCOURAGED*. + # + # no: Disable markup parsing, incoming notifications will be treated as + # plain text. Dunst will not advertise that it has the body-markup + # capability if this is set as a global setting. + # + # It's important to note that markup inside the format option will be parsed + # regardless of what this is set to. + markup = full + + # The format of the message. Possible variables are: + # %a appname + # %s summary + # %b body + # %i iconname (including its path) + # %I iconname (without its path) + # %p progress value if set ([ 0%] to [100%]) or nothing + # %n progress value if set without any extra characters + # %% Literal % + # Markup is allowed + format = "%s %p\n%b" + + # Alignment of message text. + # Possible values are "left", "center" and "right". + alignment = left + + # Vertical alignment of message text and icon. + # Possible values are "top", "center" and "bottom". + vertical_alignment = center + + # Show age of message if message is older than show_age_threshold + # seconds. + # Set to -1 to disable. + show_age_threshold = 60 + + # Split notifications into multiple lines if they don't fit into + # geometry. + word_wrap = yes + + # When word_wrap is set to no, specify where to make an ellipsis in long lines. + # Possible values are "start", "middle" and "end". + ellipsize = middle + + # Ignore newlines '\n' in notifications. + ignore_newline = no + + # Stack together notifications with the same content + stack_duplicates = true + + # Hide the count of stacked notifications with the same content + hide_duplicate_count = false + + # Display indicators for URLs (U) and actions (A). + show_indicators = yes + + ### Icons ### + + # Align icons left/right/off + icon_position = left + + # Scale small icons up to this size, set to 0 to disable. Helpful + # for e.g. small files or high-dpi screens. In case of conflict, + # max_icon_size takes precedence over this. + min_icon_size = 0 + + # Scale larger icons down to this size, set to 0 to disable + max_icon_size = 96 + + # Paths to default icons. + icon_path = /usr/share/icons/Papirus-Dark/16x16/status/:/usr/share/icons/Papirus-Dark/16x16/devices/:/usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/ + + ### History ### + + # Should a notification popped up from history be sticky or timeout + # as if it would normally do. + sticky_history = yes + + # Maximum amount of notifications kept in history + history_length = 20 + + ### Misc/Advanced ### + + # dmenu path. + dmenu = /usr/bin/rofi -dmenu -p dunst: + + # Browser for opening urls in context menu. + browser = /usr/bin/vivaldi-stable + + # Always run rule-defined scripts, even if the notification is suppressed + always_run_script = true + + # Define the title of the windows spawned by dunst + title = Dunst + + # Define the class of the windows spawned by dunst + class = Dunst + + # Print a notification on startup. + # This is mainly for error detection, since dbus (re-)starts dunst + # automatically after a crash. + startup_notification = true + + # Manage dunst's desire for talking + # Can be one of the following values: + # crit: Critical features. Dunst aborts + # warn: Only non-fatal warnings + # mesg: Important Messages + # info: all unimportant stuff + # debug: all less than unimportant stuff + verbosity = mesg + + # Define the corner radius of the notification window + # in pixel size. If the radius is 0, you have no rounded + # corners. + # The radius will be automatically lowered if it exceeds half of the + # notification height to avoid clipping text and/or icons. + corner_radius = 10 + + # Ignore the dbus closeNotification message. + # Useful to enforce the timeout set by dunst configuration. Without this + # parameter, an application may close the notification sent before the + # user defined timeout. + ignore_dbusclose = false + + ### Legacy + + # Use the Xinerama extension instead of RandR for multi-monitor support. + # This setting is provided for compatibility with older nVidia drivers that + # do not support RandR and using it on systems that support RandR is highly + # discouraged. + # + # By enabling this setting dunst will not be able to detect when a monitor + # is connected or disconnected which might break follow mode if the screen + # layout changes. + force_xinerama = false + + ### mouse + + # Defines list of actions for each mouse event + # Possible values are: + # * none: Don't do anything. + # * do_action: If the notification has exactly one action, or one is marked as default, + # invoke it. If there are multiple and no default, open the context menu. + # * close_current: Close current notification. + # * close_all: Close all notifications. + # These values can be strung together for each mouse event, and + # will be executed in sequence. + mouse_left_click = close_current + mouse_middle_click = close_all + mouse_right_click = do_action, close_current + +# Experimental features that may or may not work correctly. Do not expect them +# to have a consistent behaviour across releases. +[experimental] + # Calculate the dpi to use on a per-monitor basis. + # If this setting is enabled the Xft.dpi value will be ignored and instead + # dunst will attempt to calculate an appropriate dpi value for each monitor + # using the resolution and physical size. This might be useful in setups + # where there are multiple screens with very different dpi values. + per_monitor_dpi = false + +[shortcuts] + + # Shortcuts are specified as [modifier+][modifier+]...key + # Available modifiers are "ctrl", "mod1" (the alt-key), "mod2", + # "mod3" and "mod4" (windows-key). + # Xev might be helpful to find names for keys. + + # Close notification. + # close = ctrl+space + + # Close all notifications. + # close_all = ctrl+shift+space + + # Redisplay last message(s). + # On the US keyboard layout "grave" is normally above TAB and left + # of "1". Make sure this key actually exists on your keyboard layout, + # e.g. check output of 'xmodmap -pke' + # history = ctrl+grave + + # Context menu. + # context = ctrl+shift+period + +[urgency_low] + # IMPORTANT: colors have to be defined in quotation marks. + # Otherwise the "#" and following would be interpreted as a comment. + # background = "#222222" + # foreground = "#888888" + frame_color = "#bd93f9" + background = "#282a36" + foreground = "#f8f8f2" + timeout = 10 + # Icon for notifications with low urgency, uncomment to enable + #icon = /path/to/icon + +[urgency_normal] + # background = "#285577" + # foreground = "#ffffff" + frame_color = "#bd93f9" + background = "#282a36" + foreground = "#f8f8f2" + timeout = 10 + # Icon for notifications with normal urgency, uncomment to enable + #icon = /path/to/icon + +[urgency_critical] + # background = "#900000" + # foreground = "#ffffff" + frame_color = "#282a36" + background = "#ff5555" + foreground = "#f8f8f2" + timeout = 0 + # Icon for notifications with critical urgency, uncomment to enable + #icon = /path/to/icon + +# Every section that isn't one of the above is interpreted as a rules to +# override settings for certain messages. +# +# Messages can be matched by +# appname (discouraged, see desktop_entry) +# body +# category +# desktop_entry +# icon +# match_transient +# msg_urgency +# stack_tag +# summary +# +# and you can override the +# background +# foreground +# format +# frame_color +# fullscreen +# new_icon +# set_stack_tag +# set_transient +# timeout +# urgency +# +# Shell-like globbing will get expanded. +# +# Instead of the appname filter, it's recommended to use the desktop_entry filter. +# GLib based applications export their desktop-entry name. In comparison to the appname, +# the desktop-entry won't get localized. +# +# SCRIPTING +# You can specify a script that gets run when the rule matches by +# setting the "script" option. +# The script will be called as follows: +# script appname summary body icon urgency +# where urgency can be "LOW", "NORMAL" or "CRITICAL". +# +# NOTE: if you don't want a notification to be displayed, set the format +# to "". +# NOTE: It might be helpful to run dunst -print in a terminal in order +# to find fitting options for rules. + +# Disable the transient hint so that idle_threshold cannot be bypassed from the +# client +#[transient_disable] +# match_transient = yes +# set_transient = no +# +# Make the handling of transient notifications more strict by making them not +# be placed in history. +#[transient_history_ignore] +# match_transient = yes +# history_ignore = yes + +# fullscreen values +# show: show the notifications, regardless if there is a fullscreen window opened +# delay: displays the new notification, if there is no fullscreen window active +# If the notification is already drawn, it won't get undrawn. +# pushback: same as delay, but when switching into fullscreen, the notification will get +# withdrawn from screen again and will get delayed like a new notification +#[fullscreen_delay_everything] +# fullscreen = delay +#[fullscreen_show_critical] +# msg_urgency = critical +# fullscreen = show + +#[espeak] +# summary = "*" +# script = dunst_espeak.sh + +#[script-test] +# summary = "*script*" +# script = dunst_test.sh + +#[ignore] +# # This notification will not be displayed +# summary = "foobar" +# format = "" + +#[history-ignore] +# # This notification will not be saved in history +# summary = "foobar" +# history_ignore = yes + +#[skip-display] +# # This notification will not be displayed, but will be included in the history +# summary = "foobar" +# skip_display = yes + +#[signed_on] +# appname = Pidgin +# summary = "*signed on*" +# urgency = low +# +#[signed_off] +# appname = Pidgin +# summary = *signed off* +# urgency = low +# +#[says] +# appname = Pidgin +# summary = *says* +# urgency = critical +# +#[twitter] +# appname = Pidgin +# summary = *twitter.com* +# urgency = normal +# +#[stack-volumes] +# appname = "some_volume_notifiers" +# set_stack_tag = "volume" +# +# vim: ft=cfg diff --git a/.config/dunst/launch_dunst.sh b/.config/dunst/launch_dunst.sh new file mode 100644 index 0000000..86f2d74 --- /dev/null +++ b/.config/dunst/launch_dunst.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +/usr/bin/dunst -config ~/.config/dunst/dunstrc \ + -geometry "0x0-$(xgetres dunst.geometry-x)+$(xgetres dunst.geometry-y)" \ + -separator_height "$(xgetres dunst.sep-height)" \ + -padding "$(xgetres dunst.padding)" \ + -horizontal_padding "$(xgetres dunst.horiz-padding)" \ + -max_icon_size "$(xgetres dunst.max-icon-size)" \ + -frame_width "$(xgetres dunst.frame-width)" \ + -lb "$(xgetres dunst.low-background)" \ + -lf "$(xgetres dunst.low-foreground)" \ + -lfr "$(xgetres dunst.low-frame)" \ + -nb "$(xgetres dunst.normal-background)" \ + -nf "$(xgetres dunst.normal-foreground)" \ + -nfr "$(xgetres dunst.normal-frame)" \ + -cb "$(xgetres dunst.critical-background)" \ + -cf "$(xgetres dunst.critical-foreground)" \ + -cfr "$(xgetres dunst.critical-frame)" diff --git a/.config/dwm b/.config/dwm index 99b45ee..8e4f659 160000 --- a/.config/dwm +++ b/.config/dwm @@ -1 +1 @@ -Subproject commit 99b45ee0d43b78b5f1c1dcb3f3a737320aff15d0 +Subproject commit 8e4f659772b7b4e99abe2efb30ad1192fd8da4de diff --git a/.config/polybar b/.config/polybar index d51e0c5..889ea5c 160000 --- a/.config/polybar +++ b/.config/polybar @@ -1 +1 @@ -Subproject commit d51e0c5528742248f636a160793d52e73e5bb59f +Subproject commit 889ea5c7c773e8a53c8f3d8f647500a1cab9a5bd