diff --git a/config/dunst/dunstrc b/config/dunst/dunstrc deleted file mode 100755 index 2fb4d19..0000000 --- a/config/dunst/dunstrc +++ /dev/null @@ -1,370 +0,0 @@ -[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 = mouse - - width = (250, 350) - height = 250 - origin = top-center - offset = 10x10 - - notification_limit = 9 - - progress_bar_corner_radius = 4 - - # 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]. [x11 only] - # This option will only work if a compositing window manager is - # present (e.g. xcompmgr, compiz, etc.). - #transparency = 100 - - # Draw a line of "separator_height" pixel height between two - # notifications. - # Set to 0 to disable. - separator_height = 2 - - # Padding between text and separator. - padding = 8 - - # Horizontal padding. - horizontal_padding = 8 - - # 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 = "#17474D" - - # 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 = auto - - # 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 = Fira Code Medium 13 - - # 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\n%b" - - # Alignment of message text. - # Possible values are "left", "center" and "right". - 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 larger icons down to this size, set to 0 to disable - max_icon_size = 32 - - # Paths to default icons. - #icon_path = /usr/share/icons/candy-icons/apps/scalable:/usr/share/icons/candy-icons/devices/scalable/ - - ### 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/firefox -new-tab - - # 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 - - # 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 = 12 - - ### 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 action of 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. - mouse_left_click = do_action - mouse_middle_click = close_all - mouse_right_click = 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 - - -[urgency_low] - # IMPORTANT: colors have to be defined in quotation marks. - # Otherwise the "#" and following would be interpreted as a comment. - background = "#00000095" - foreground = "#fafafa" - frame_color = "#17474D" - timeout = 2 - # Icon for notifications with low urgency, uncomment to enable - icon = $HOME/.config/dunst/images/bell.png - -[urgency_normal] - background = "#00000095" - foreground = "#fafafa" - frame_color = "#17474D" - timeout = 5 - # Icon for notifications with normal urgency, uncomment to enable - icon = $HOME/.config/dunst/images/bell.png - -[urgency_critical] - background = "#00000095" - foreground = "#fafafa" - frame_color = "#17474D" - timeout = 0 - # Icon for notifications with critical urgency, uncomment to enable - icon = $HOME/.config/dunst/images/bell.png - -# 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 -# 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/hypr/configs/Settings.conf b/config/hypr/configs/Settings.conf index 7b0c060..2ad370a 100644 --- a/config/hypr/configs/Settings.conf +++ b/config/hypr/configs/Settings.conf @@ -1,7 +1,6 @@ ## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## ## refer to Hyprland wiki for more info https://wiki.hyprland.org/Configuring/Variables - # Sourcing colors generated by pywal source = $HOME/.cache/wal/colors-hyprland # blurls = waybar diff --git a/config/hypr/scripts/AirplaneMode.sh b/config/hypr/scripts/AirplaneMode.sh index 6e2eecf..e0337dc 100755 --- a/config/hypr/scripts/AirplaneMode.sh +++ b/config/hypr/scripts/AirplaneMode.sh @@ -1,12 +1,12 @@ #!/bin/bash -dunst_notif="$HOME/.config/dunst/images/bell.png" +notif="$HOME/.config/swaync/images/bell.png" wifi="$(nmcli r wifi | awk 'FNR = 2 {print $1}')" if [ "$wifi" == "enabled" ]; then rfkill block all & - notify-send -e -u normal -i "$dunst_notif" -t 1000 'airplane mode: active' + notify-send -u low -i "$notif" 'airplane mode: active' else rfkill unblock all & - notify-send -e -u normal -i "$dunst_notif" -t 1000 'airplane mode: inactive' + notify-send -u low -i "$notif" 'airplane mode: inactive' fi diff --git a/config/hypr/scripts/Brightness.sh b/config/hypr/scripts/Brightness.sh index 1c68ec5..14c03da 100755 --- a/config/hypr/scripts/Brightness.sh +++ b/config/hypr/scripts/Brightness.sh @@ -1,6 +1,6 @@ #!/bin/bash -iDIR="$HOME/.config/dunst/icons" +iDIR="$HOME/.config/swaync/icons" notification_timeout=1000 # Get brightness diff --git a/config/hypr/scripts/BrightnessKbd.sh b/config/hypr/scripts/BrightnessKbd.sh index 3ea9e49..3bdcebc 100755 --- a/config/hypr/scripts/BrightnessKbd.sh +++ b/config/hypr/scripts/BrightnessKbd.sh @@ -1,6 +1,6 @@ #!/bin/bash -iDIR="$HOME/.config/dunst/icons" +iDIR="$HOME/.config/swaync/icons" # Get keyboard brightness get_kbd_backlight() { diff --git a/config/hypr/scripts/ChangeBlur.sh b/config/hypr/scripts/ChangeBlur.sh index 76e5ed8..95789f5 100755 --- a/config/hypr/scripts/ChangeBlur.sh +++ b/config/hypr/scripts/ChangeBlur.sh @@ -1,15 +1,15 @@ #!/bin/bash -dunst_notif="$HOME/.config/dunst/images/bell.png" +notif="$HOME/.config/swaync/images/bell.png" STATE=$(hyprctl -j getoption decoration:blur:passes | jq ".int") if [ "${STATE}" == "2" ]; then hyprctl keyword decoration:blur:size 2 hyprctl keyword decoration:blur:passes 1 - notify-send -e -u low -i "$dunst_notif" "Less blur" + notify-send -e -u low -i "$notif" "Less blur" else hyprctl keyword decoration:blur:size 5 hyprctl keyword decoration:blur:passes 2 - notify-send -e -u low -i "$dunst_notif" "Normal blur" + notify-send -e -u low -i "$notif" "Normal blur" fi diff --git a/config/hypr/scripts/ChangeLayout.sh b/config/hypr/scripts/ChangeLayout.sh index 69ded6c..93bc2fe 100755 --- a/config/hypr/scripts/ChangeLayout.sh +++ b/config/hypr/scripts/ChangeLayout.sh @@ -1,6 +1,6 @@ #!/bin/bash -dunst_notif="$HOME/.config/dunst/images/bell.png" +notif="$HOME/.config/swaync/images/bell.png" LAYOUT=$(hyprctl -j getoption general:layout | jq '.str' | sed 's/"//g') @@ -12,7 +12,7 @@ case $LAYOUT in hyprctl keyword bind SUPER,J,cyclenext hyprctl keyword bind SUPER,K,cyclenext,prev hyprctl keyword bind SUPER,O,togglesplit - notify-send -e -u low -i "$dunst_notif" "Dwindle Layout" + notify-send -e -u low -i "$notif" "Dwindle Layout" ;; "dwindle") hyprctl keyword general:layout master @@ -21,7 +21,7 @@ case $LAYOUT in hyprctl keyword unbind SUPER,O hyprctl keyword bind SUPER,J,layoutmsg,cyclenext hyprctl keyword bind SUPER,K,layoutmsg,cycleprev - notify-send -e -u low -i "$dunst_notif" "Master Layout" + notify-send -e -u low -i "$notif" "Master Layout" ;; *) ;; diff --git a/config/hypr/scripts/DarkLight.sh b/config/hypr/scripts/DarkLight.sh index 612540b..a2b7af7 100755 --- a/config/hypr/scripts/DarkLight.sh +++ b/config/hypr/scripts/DarkLight.sh @@ -5,9 +5,8 @@ wallpaper_base_path="$HOME/Pictures/wallpapers/Dynamic-Wallpapers" dark_wallpapers="$wallpaper_base_path/Dark" light_wallpapers="$wallpaper_base_path/Light" hypr_config_path="$HOME/.config/hypr" -dunst_config="$HOME/.config/dunst" SCRIPTSDIR="$HOME/.config/hypr/scripts" -dunst_notif="$HOME/.config/dunst/images/bell.png" +notif="$HOME/.config/swaync/images/bell.png" dark_rofi_pywal="$HOME/.cache/wal/colors-rofi-dark.rasi" light_rofi_pywal="$HOME/.cache/wal/colors-rofi-light.rasi" @@ -38,7 +37,7 @@ update_theme_mode() { # Function to notify user notify_user() { - dunstify -u low -i "$dunst_notif" "Switching to $1 mode" + notify-send -u low -i "$notif" "Switching to $1 mode" } # Function to set Waybar style @@ -61,14 +60,6 @@ set_waybar_style() { set_waybar_style "$next_mode" notify_user "$next_mode" -# Change background for dunst -if [ "$next_mode" = "Dark" ]; then - sed -i '/background = /s/.*/ background = "#00000095"/' "${dunst_config}/dunstrc" - sed -i '/foreground = /s/.*/ foreground = "#fafafa"/' "${dunst_config}/dunstrc" -else - sed -i '/background = /s/.*/ background = "#ffffff99"/' "${dunst_config}/dunstrc" - sed -i '/foreground = /s/.*/ foreground = "#00000095"/' "${dunst_config}/dunstrc" -fi # Set Dynamic Wallpaper for Dark or Light Mode if [ "$next_mode" = "Dark" ]; then @@ -186,8 +177,8 @@ sleep 1 ${SCRIPTSDIR}/Refresh.sh # Display notifications for theme and icon changes -dunstify -u normal -i "$dunst_notif" "Themes are set to $selected_theme" -dunstify -u normal -i "$dunst_notif" "Icon themes set to $selected_icon" +notify-send -u normal -i "$notif" "Themes are set to $selected_theme" +notify-send -u normal -i "$notif" "Icon themes set to $selected_icon" exit 0 diff --git a/config/hypr/scripts/GameMode.sh b/config/hypr/scripts/GameMode.sh index 678d282..d53ec7d 100755 --- a/config/hypr/scripts/GameMode.sh +++ b/config/hypr/scripts/GameMode.sh @@ -1,6 +1,6 @@ #!/bin/bash -dunst_notif="$HOME/.config/dunst/images/bell.png" +notif="$HOME/.config/swaync/images/bell.png" SCRIPTSDIR="$HOME/.config/hypr/scripts" @@ -15,7 +15,7 @@ if [ "$HYPRGAMEMODE" = 1 ] ; then keyword general:border_size 1;\ keyword decoration:rounding 0" swww kill - notify-send -e -u low -i "$dunst_notif" "gamemode enabled. All animations off" + notify-send -e -u low -i "$notif" "gamemode enabled. All animations off" exit else swww init && swww img "$HOME/.config/rofi/.current_wallpaper" @@ -23,7 +23,7 @@ else ${SCRIPTSDIR}/PywalSwww.sh sleep 0.5 ${SCRIPTSDIR}/Refresh.sh - notify-send -e -u normal -i "$dunst_notif" "gamemode disabled. All animations normal" + notify-send -e -u normal -i "$notif" "gamemode disabled. All animations normal" exit fi hyprctl reload diff --git a/config/hypr/scripts/MediaCtrl.sh b/config/hypr/scripts/MediaCtrl.sh index f961152..9d97044 100755 --- a/config/hypr/scripts/MediaCtrl.sh +++ b/config/hypr/scripts/MediaCtrl.sh @@ -1,6 +1,6 @@ #!/bin/bash -music_icon="$HOME/.config/dunst/icons/music.png" +music_icon="$HOME/.config/swaync/icons/music.png" # Play the next track play_next() { @@ -23,18 +23,18 @@ toggle_play_pause() { # Stop playback stop_playback() { playerctl stop - dunstify -r 123 -i "$music_icon" "Playback Stopped" + notify-send -e -u low -i "$music_icon" "Playback Stopped" } -# Display Dunst notification with song information +# Display notification with song information show_music_notification() { status=$(playerctl status) if [[ "$status" == "Playing" ]]; then song_title=$(playerctl metadata title) song_artist=$(playerctl metadata artist) - dunstify -r 123 -i "$music_icon" "Now Playing:" "$song_title\nby $song_artist" + notify-send -e -u low -i "$music_icon" "Now Playing:" "$song_title\nby $song_artist" elif [[ "$status" == "Paused" ]]; then - dunstify -r 123 -i "$music_icon" "Playback Paused" + notify-send -e -u low -i "$music_icon" "Playback Paused" fi } diff --git a/config/hypr/scripts/PywalDunst.sh b/config/hypr/scripts/PywalDunst.sh deleted file mode 100755 index 1c9398f..0000000 --- a/config/hypr/scripts/PywalDunst.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -# -lf/nf/cf color -# Defines the foreground color for low, normal and critical notifications respectively. -# -# -lb/nb/cb color -# Defines the background color for low, normal and critical notifications respectively. -# -# -lfr/nfr/cfr color -# Defines the frame color for low, normal and critical notifications respectively. - -[ -f "$HOME/.cache/wal/colors.sh" ] && . "$HOME/.cache/wal/colors.sh" - -pkill dunst - -DUNST_FILE=~/.config/dunst/dunstrc - -# update dunst based on pywal colors. -#sed -i '/background = /s/.*/ background = "$color0"/' $DUNST_FILE -#sed -i '/foreground = /s/.*/ foreground = "'$color7'"/' $DUNST_FILE -sed -i '/frame_color = /s/.*/ frame_color = "'$color2'"/' $DUNST_FILE - -sleep 0.3 -dunst -config ~/.config/dunst/dunstrc > /dev/null 2>&1 & \ No newline at end of file diff --git a/config/hypr/scripts/RefreshNoWaybar.sh b/config/hypr/scripts/RefreshNoWaybar.sh index 0b74f01..dc99b62 100755 --- a/config/hypr/scripts/RefreshNoWaybar.sh +++ b/config/hypr/scripts/RefreshNoWaybar.sh @@ -17,9 +17,6 @@ done # Pywal refresh ${SCRIPTSDIR}/PywalSwww.sh & -sleep 0.5 -# Relaunch dunst with pywal-borders -#${SCRIPTSDIR}/PywalDunst.sh & # Relaunching rainbow borders sleep 1 diff --git a/config/hypr/scripts/RofiBeats.sh b/config/hypr/scripts/RofiBeats.sh index c8e8e43..405451f 100755 --- a/config/hypr/scripts/RofiBeats.sh +++ b/config/hypr/scripts/RofiBeats.sh @@ -1,7 +1,7 @@ #!/bin/bash # Directory for icons -iDIR="$HOME/.config/dunst/icons" +iDIR="$HOME/.config/swaync/icons" # Note: You can add more options below with the following format: # ["TITLE"]="link" diff --git a/config/hypr/scripts/ScreenShot.sh b/config/hypr/scripts/ScreenShot.sh index 44ba2bd..1d5eeac 100755 --- a/config/hypr/scripts/ScreenShot.sh +++ b/config/hypr/scripts/ScreenShot.sh @@ -1,7 +1,7 @@ #!/bin/bash -iDIR="$HOME/.config/dunst/icons" -notify_cmd_shot="dunstify -h string:x-canonical-private-synchronous:shot-notify -u low -i ${iDIR}/picture.png" +iDIR="$HOME/.config/swaync/icons" +notify_cmd_shot="notify-send -h string:x-canonical-private-synchronous:shot-notify -u low -i ${iDIR}/picture.png" time=$(date "+%d-%b_%H-%M-%S") dir="$(xdg-user-dir)/Pictures/Screenshots" @@ -15,16 +15,16 @@ active_window_path="${dir}/${active_window_file}" notify_view() { if [[ "$1" == "active" ]]; then if [[ -e "${active_window_path}" ]]; then - ${notify_cmd_shot} "Screenshot of '${active_window_class}' is saved." + ${notify_cmd_shot} "Screenshot of '${active_window_class}' Saved." else - ${notify_cmd_shot} "Screenshot of '${active_window_class}' is deleted or not available." + ${notify_cmd_shot} "Screenshot of '${active_window_class}' not Saved" fi else local check_file="$dir/$file" if [[ -e "$check_file" ]]; then ${notify_cmd_shot} "Screenshot Saved." else - ${notify_cmd_shot} "Screenshot Deleted." + ${notify_cmd_shot} "Screenshot NOT Saved." fi fi } @@ -34,7 +34,7 @@ notify_view() { # countdown countdown() { for sec in $(seq $1 -1 1); do - dunstify -h string:x-canonical-private-synchronous:shot-notify -t 1000 -i "$iDIR"/timer.png "Taking shot in : $sec" + notify-send -h string:x-canonical-private-synchronous:shot-notify -t 1000 -i "$iDIR"/timer.png "Taking shot in : $sec" sleep 1 done } diff --git a/config/hypr/scripts/SwitchKeyboardLayout.sh b/config/hypr/scripts/SwitchKeyboardLayout.sh index 9d1ee84..4746918 100755 --- a/config/hypr/scripts/SwitchKeyboardLayout.sh +++ b/config/hypr/scripts/SwitchKeyboardLayout.sh @@ -2,7 +2,7 @@ layout_f="$HOME/.cache/kb_layout" settings_file="$HOME/.config/hypr/configs/Settings.conf" -dunst_notif="$HOME/.config/dunst/images/bell.png" +notif="$HOME/.config/swaync/images/bell.png" # Check if ~/.cache/kb_layout exists and create it with a default layout from Settings.conf if not found if [ ! -f "$layout_f" ]; then @@ -40,4 +40,4 @@ hyprctl keyword input:kb_layout "$new_layout" echo "$new_layout" > "$layout_f" # Notification for the new keyboard layout -dunstify -u low -i "$dunst_notif" "Keyboard layout set to $new_layout" \ No newline at end of file +notify-send -u low -i "$notif" "Keyboard layout set to $new_layout" \ No newline at end of file diff --git a/config/hypr/scripts/TouchPad.sh b/config/hypr/scripts/TouchPad.sh index 8f633ee..7b9a180 100755 --- a/config/hypr/scripts/TouchPad.sh +++ b/config/hypr/scripts/TouchPad.sh @@ -1,6 +1,6 @@ #!/bin/bash -dunst_notif="$HOME/.config/dunst/images/bell.png" +notif="$HOME/.config/swaync/images/bell.png" # NOTE: find the right device using hyprctl devices HYPRLAND_DEVICE="asue1209:00-04f3:319f-touchpad" @@ -14,7 +14,7 @@ export STATUS_FILE="$XDG_RUNTIME_DIR/touchpad.status" enable_touchpad() { printf "true" > "$STATUS_FILE" - dunstify -u low -i "$dunst_notif" "Enabling Touchpad" + notify-send -u low -i "$notif" "Enabling Touchpad" hyprctl keyword "device:$HYPRLAND_DEVICE:enabled" true } @@ -22,7 +22,7 @@ enable_touchpad() { disable_touchpad() { printf "false" > "$STATUS_FILE" - dunstify -u low -i "$dunst_notif" "Disabling Touchpad" + notify-send -u low -i "$notif" "Disabling Touchpad" hyprctl keyword "device:$HYPRLAND_DEVICE:enabled" false } diff --git a/config/hypr/scripts/Volume.sh b/config/hypr/scripts/Volume.sh index 9aaf8a8..f68491c 100755 --- a/config/hypr/scripts/Volume.sh +++ b/config/hypr/scripts/Volume.sh @@ -1,6 +1,6 @@ #!/bin/bash -iDIR="$HOME/.config/dunst/icons" +iDIR="$HOME/.config/swaync/icons" # Get Volume get_volume() { diff --git a/config/swaync/config.json b/config/swaync/config.json index 591757b..7d187fa 100644 --- a/config/swaync/config.json +++ b/config/swaync/config.json @@ -1,38 +1,45 @@ { - "$schema": "/etc/xdg/swaync/configSchema.json", - "positionX": "right", - "positionY": "top", - "control-center-margin-top": 10, - "control-center-margin-bottom": 10, - "control-center-margin-right": 10, - "control-center-margin-left": 10, + "$schema": "/etc/xdg/swaync/configSchema.json", + "positionX": "center", + "positionY": "top", + "layer": "overlay", + "control-center-layer": "top", + "layer-shell": true, + "cssPriority": "application", + "control-center-margin-top": 0, + "control-center-margin-bottom": 0, + "control-center-margin-right": 0, + "control-center-margin-left": 0, + "notification-2fa-action": true, + "notification-inline-replies": false, "notification-icon-size": 24, - "notification-body-image-height": 60, - "notification-body-image-width": 300, + "notification-body-image-height": 100, + "notification-body-image-width": 200, "timeout": 6, "timeout-low": 3, "timeout-critical": 0, "fit-to-screen": false, - "control-center-width": 400, + "control-center-width": 350, "control-center-height": 800, - "notification-window-width": 300, + "notification-window-width": 400, "keyboard-shortcuts": true, - "image-visibility": "when-available", + "image-visibility": "when available", "transition-time": 200, "hide-on-clear": false, "hide-on-action": true, "script-fail-notify": true, "widgets": [ - "title", + "dnd", "buttons-grid", - "dnd", - "volume", - "backlight", + /* "mpris", */ + /* "volume", */ + /* "backlight",*/ + "title", "notifications" ], "widget-config": { "title": { - "text": "Control Center", + "text": "Notifications", "clear-all-button": true, "button-text": "Clear" }, @@ -41,11 +48,11 @@ }, "label": { "max-lines": 1, - "text": "Control Center" + "text": "Notification" }, "mpris": { - "image-size": 60, - "image-radius": 7 + "image-size": 20, + "image-radius": 0 }, "volume": { "label": "󰕾" diff --git a/config/dunst/icons/backup.png b/config/swaync/icons/backup.png similarity index 100% rename from config/dunst/icons/backup.png rename to config/swaync/icons/backup.png diff --git a/config/dunst/icons/battery-quarter-solid.svg b/config/swaync/icons/battery-quarter-solid.svg similarity index 100% rename from config/dunst/icons/battery-quarter-solid.svg rename to config/swaync/icons/battery-quarter-solid.svg diff --git a/config/dunst/icons/battery-status.png b/config/swaync/icons/battery-status.png similarity index 100% rename from config/dunst/icons/battery-status.png rename to config/swaync/icons/battery-status.png diff --git a/config/dunst/icons/brightness-100.png b/config/swaync/icons/brightness-100.png similarity index 100% rename from config/dunst/icons/brightness-100.png rename to config/swaync/icons/brightness-100.png diff --git a/config/dunst/icons/brightness-20.png b/config/swaync/icons/brightness-20.png similarity index 100% rename from config/dunst/icons/brightness-20.png rename to config/swaync/icons/brightness-20.png diff --git a/config/dunst/icons/brightness-40.png b/config/swaync/icons/brightness-40.png similarity index 100% rename from config/dunst/icons/brightness-40.png rename to config/swaync/icons/brightness-40.png diff --git a/config/dunst/icons/brightness-60.png b/config/swaync/icons/brightness-60.png similarity index 100% rename from config/dunst/icons/brightness-60.png rename to config/swaync/icons/brightness-60.png diff --git a/config/dunst/icons/brightness-80.png b/config/swaync/icons/brightness-80.png similarity index 100% rename from config/dunst/icons/brightness-80.png rename to config/swaync/icons/brightness-80.png diff --git a/config/dunst/icons/dropper.png b/config/swaync/icons/dropper.png similarity index 100% rename from config/dunst/icons/dropper.png rename to config/swaync/icons/dropper.png diff --git a/config/dunst/icons/microphone-mute.png b/config/swaync/icons/microphone-mute.png similarity index 100% rename from config/dunst/icons/microphone-mute.png rename to config/swaync/icons/microphone-mute.png diff --git a/config/dunst/icons/microphone.png b/config/swaync/icons/microphone.png similarity index 100% rename from config/dunst/icons/microphone.png rename to config/swaync/icons/microphone.png diff --git a/config/dunst/icons/music.png b/config/swaync/icons/music.png similarity index 100% rename from config/dunst/icons/music.png rename to config/swaync/icons/music.png diff --git a/config/dunst/icons/palette.png b/config/swaync/icons/palette.png similarity index 100% rename from config/dunst/icons/palette.png rename to config/swaync/icons/palette.png diff --git a/config/dunst/icons/picture.png b/config/swaync/icons/picture.png similarity index 100% rename from config/dunst/icons/picture.png rename to config/swaync/icons/picture.png diff --git a/config/dunst/icons/timer.png b/config/swaync/icons/timer.png similarity index 100% rename from config/dunst/icons/timer.png rename to config/swaync/icons/timer.png diff --git a/config/dunst/icons/uptime.png b/config/swaync/icons/uptime.png similarity index 100% rename from config/dunst/icons/uptime.png rename to config/swaync/icons/uptime.png diff --git a/config/dunst/icons/volume-high.png b/config/swaync/icons/volume-high.png similarity index 100% rename from config/dunst/icons/volume-high.png rename to config/swaync/icons/volume-high.png diff --git a/config/dunst/icons/volume-low.png b/config/swaync/icons/volume-low.png similarity index 100% rename from config/dunst/icons/volume-low.png rename to config/swaync/icons/volume-low.png diff --git a/config/dunst/icons/volume-mid.png b/config/swaync/icons/volume-mid.png similarity index 100% rename from config/dunst/icons/volume-mid.png rename to config/swaync/icons/volume-mid.png diff --git a/config/dunst/icons/volume-mute.png b/config/swaync/icons/volume-mute.png similarity index 100% rename from config/dunst/icons/volume-mute.png rename to config/swaync/icons/volume-mute.png diff --git a/config/dunst/icons/vpn.png b/config/swaync/icons/vpn.png similarity index 100% rename from config/dunst/icons/vpn.png rename to config/swaync/icons/vpn.png diff --git a/config/dunst/images/bell.png b/config/swaync/images/bell.png similarity index 100% rename from config/dunst/images/bell.png rename to config/swaync/images/bell.png diff --git a/config/swaync/style.css b/config/swaync/style.css index e65c2db..59aea3c 100644 --- a/config/swaync/style.css +++ b/config/swaync/style.css @@ -1,26 +1,22 @@ @import '../../.cache/wal/colors-waybar.css'; -@define-color cc-bg rgba(26, 27, 38, 1); @define-color noti-border-color @color2; @define-color noti-bg @background; -@define-color noti-bg-darker rgb(43, 43, 57); +@define-color noti-bg-darker rgba(43, 43, 57, 0.6); @define-color noti-bg-hover @color2; -@define-color noti-bg-focus rgba(27, 27, 27, 0.6); -@define-color noti-close-bg rgba(255, 255, 255, 0.1); -@define-color noti-close-bg-hover rgba(255, 255, 255, 0.15); -@define-color text-color @foreground; -@define-color text-color-disabled rgb(150, 150, 150); -@define-color bg-selected rgb(0, 128, 255); +@define-color text-color @color7; +@define-color text-color-disabled rgba(150, 150, 150, 0.8); * { - font-family: JetBrainsMono NFP; - font-weight: bold; + font-family: FiraCode; + font-weight: Bolder; } .control-center .notification-row:focus, .control-center .notification-row:hover { - opacity: 1; - background: @noti-bg + opacity: 0.5; + background: @noti-bg; + border-radius: 10px } .notification-row { @@ -36,25 +32,25 @@ } .notification-content { - background: @cc-bg; - padding: 2px; - border-radius: 5px; + background: @noti-bg; + padding: 6px; + border-radius: 10px; border: 2px solid @noti-border-color; - margin: 0; + margin: 0px; } .notification-default-action { margin: 0; padding: 0; - border-radius: 5px; + border-radius: 10px; } .close-button { background: #f7768e; - color: @cc-bg; + color: @noti-bg; text-shadow: none; padding: 0; - border-radius: 5px; + border-radius: 10px; margin-top: 5px; margin-right: 5px; } @@ -70,18 +66,18 @@ .notification-action { border: 2px solid @noti-border-color; border-top: none; - border-radius: 8px; + border-radius: 10px; } .notification-default-action:hover, .notification-action:hover { - color: @foreground; + color: @text-color; background: #7aa2f7 } .notification-default-action { - border-radius: 5px; + border-radius: 10px; margin: 0px; } @@ -109,7 +105,7 @@ color: @text-color; caret-color: @text-color; border: 1px solid @noti-border-color; - border-radius: 8px + border-radius: 10px } .inline-reply-button { @@ -117,7 +113,7 @@ margin-left: 4px; background: @noti-bg; border: 1px solid @noti-border-color; - border-radius: 5px; + border-radius: 10px; color: @text-color } @@ -134,14 +130,14 @@ .body-image { margin-top: 6px; background-color: #fff; - border-radius: 5px + border-radius: 10px } .summary { font-size: 1rem; font-weight: 700; background: transparent; - color: rgba(158, 206, 106, 1); + color: rgba(158, 206, 106, 0.9); text-shadow: none } @@ -163,7 +159,7 @@ } .control-center { - background: @cc-bg; + background: @noti-bg; border: 2px solid @noti-border-color; border-radius: 10px; } @@ -185,20 +181,20 @@ } .widget-title { - color: #7aa2f7; + color: @noti-border-color; background: @noti-bg-darker; - padding: 0px 5px 0px 10px; + padding: 3px 6px; margin: 10px 10px 5px 10px; font-size: 1rem; - border-radius: 5px; + border-radius: 10px; } .widget-title>button { font-size: 0.75rem; color: @text-color; border-radius: 10px; - background: transparent; - border: 0.5px solid @noti-border-color; + background: transparent; + border: 0.5px solid @noti-border-color; } .widget-title>button:hover { @@ -208,17 +204,17 @@ .widget-dnd { background: @noti-bg-darker; - padding: 3px 6px; + padding: 3px 5px 3px 5px; margin: 5px 10px 10px 10px; - border-radius: 5px; + border-radius: 10px; font-size: 1rem; - color: #7aa2f7; + color: @noti-border-color; } .widget-dnd>switch { - border-radius: 5px; + border-radius: 10px; /* border: 1px solid #7aa2f7; */ - background: #7aa2f7; + background: @noti-border-color; } .widget-dnd>switch:checked { @@ -227,17 +223,17 @@ } .widget-dnd>switch slider { - background: @cc-bg; - border-radius: 5px + background: @noti-bg; + border-radius: 10px } .widget-dnd>switch:checked slider { - background: @cc-bg; - border-radius: 5px + background: @noti-bg; + border-radius: 10px } .widget-label { - margin: 10px 10px 5px 10px; + margin: 0px; } .widget-label>label { @@ -248,13 +244,13 @@ .widget-mpris { color: @text-color; background: @noti-bg-darker; - padding: 5px 10px; + padding: 2px 6px; margin: 5px 10px 5px 10px; - border-radius: 5px; + border-radius: 10px; } .widget-mpris > box > button { - border-radius: 5px; + border-radius: 10px; } .widget-mpris-player { @@ -273,16 +269,16 @@ .widget-buttons-grid { font-size: x-large; - padding: 4px; - margin: 5px 10px 10px 10px; - border-radius: 5px; + padding: 2px; + margin: 0px; + border-radius: 10px; background: @noti-bg-darker; } .widget-buttons-grid>flowbox>flowboxchild>button { - margin: 3px; - background: @cc-bg; - border-radius: 5px; + margin: 1px; + background: @noti-bg; + border-radius: 10px; color: @text-color } @@ -303,9 +299,9 @@ .widget-volume { background: @noti-bg-darker; - padding: 5px; + padding: 2px; margin: 10px 10px 5px 10px; - border-radius: 5px; + border-radius: 10px; font-size: x-large; color: @text-color; } @@ -319,14 +315,14 @@ background-color: @noti-bg; padding: 4px 8px 8px; margin: 0 8px 8px; - border-radius: 5px; + border-radius: 10px; } .widget-backlight { background: @noti-bg-darker; padding: 5px; margin: 10px 10px 5px 10px; - border-radius: 5px; + border-radius: 10px; font-size: x-large; color: @text-color } diff --git a/config/waybar/configs/[BOT & Left] SouthWest b/config/waybar/configs/[BOT & Left] SouthWest index 27bec45..14377d5 100644 --- a/config/waybar/configs/[BOT & Left] SouthWest +++ b/config/waybar/configs/[BOT & Left] SouthWest @@ -67,7 +67,8 @@ ], "modules-right": [ - "mpris", + "mpris", + "custom/swaync", "tray", "custom/light_dark", ], diff --git a/config/waybar/configs/[BOT & Right] SouthEast b/config/waybar/configs/[BOT & Right] SouthEast index 68629cb..7d684c8 100644 --- a/config/waybar/configs/[BOT & Right] SouthEast +++ b/config/waybar/configs/[BOT & Right] SouthEast @@ -67,7 +67,8 @@ ], "modules-right": [ - "mpris", + "mpris", + "custom/swaync", "tray", "custom/light_dark", ], diff --git a/config/waybar/configs/[BOT] Camellia b/config/waybar/configs/[BOT] Camellia index 0e2305a..e135258 100644 --- a/config/waybar/configs/[BOT] Camellia +++ b/config/waybar/configs/[BOT] Camellia @@ -24,6 +24,7 @@ "hyprland/workspaces#cam", "custom/separator#line", "mpris", + "custom/swaync", "tray#cam", "wlr/taskbar"], diff --git a/config/waybar/configs/[BOT] Chrysanthemum b/config/waybar/configs/[BOT] Chrysanthemum index 68bff67..e4f1fba 100644 --- a/config/waybar/configs/[BOT] Chrysanthemum +++ b/config/waybar/configs/[BOT] Chrysanthemum @@ -17,7 +17,7 @@ "margin-left": 5, "margin-right": 5, -"modules-left": ["clock#gar", "mpris", "tray"], +"modules-left": ["clock#gar", "mpris", "custom/swaync", "tray"], "modules-center": ["hyprland/workspaces"], diff --git a/config/waybar/configs/[BOT] Default b/config/waybar/configs/[BOT] Default index 36798ab..eece916 100644 --- a/config/waybar/configs/[BOT] Default +++ b/config/waybar/configs/[BOT] Default @@ -45,6 +45,7 @@ "modules-right": [ "network#speed", "custom/separator#dot-line", + "custom/swaync", "tray", "mpris", "custom/separator#dot-line", diff --git a/config/waybar/configs/[BOT] Gardenia b/config/waybar/configs/[BOT] Gardenia index ce46042..5d07152 100644 --- a/config/waybar/configs/[BOT] Gardenia +++ b/config/waybar/configs/[BOT] Gardenia @@ -20,7 +20,7 @@ "margin-bottom": 5, "width": 768, -"modules-left": ["clock#gar", "mpris", "tray"], +"modules-left": ["clock#gar", "mpris", "custom/swaync", "tray"], "modules-center": ["hyprland/workspaces#kanji"], diff --git a/config/waybar/configs/[BOT] Peony b/config/waybar/configs/[BOT] Peony index 7f049c1..dcdf4aa 100644 --- a/config/waybar/configs/[BOT] Peony +++ b/config/waybar/configs/[BOT] Peony @@ -32,7 +32,8 @@ "custom/separator#blank", "temperature", "custom/separator#blank", - "network#peony"], + "network#peony", + "custom/swaync"], //M O D U L E S // diff --git a/config/waybar/configs/[BOT] Sleek b/config/waybar/configs/[BOT] Sleek index 10175e8..10b62db 100644 --- a/config/waybar/configs/[BOT] Sleek +++ b/config/waybar/configs/[BOT] Sleek @@ -24,10 +24,10 @@ "modules-right": [ "tray", + "custom/swaync", "pulseaudio", "clock", - "custom/power" - + "custom/power" ], diff --git a/config/waybar/configs/[Left] WestWing b/config/waybar/configs/[Left] WestWing index 1458b43..a3381e8 100644 --- a/config/waybar/configs/[Left] WestWing +++ b/config/waybar/configs/[Left] WestWing @@ -27,7 +27,7 @@ "modules-right": [ "mpris", "tray", - //"network", + "custom/swaync", "backlight#vertical", "pulseaudio#microphone_vertical", "pulseaudio#vertical", diff --git a/config/waybar/configs/[Right] EastWing b/config/waybar/configs/[Right] EastWing index 4fc258c..5ce7be2 100644 --- a/config/waybar/configs/[Right] EastWing +++ b/config/waybar/configs/[Right] EastWing @@ -27,7 +27,7 @@ "modules-right": [ "mpris", "tray", - //"network", + "custom/swaync", "backlight#vertical", "pulseaudio#microphone_vertical", "pulseaudio#vertical", diff --git a/config/waybar/configs/[TOP & BOT] SummitSplit b/config/waybar/configs/[TOP & BOT] SummitSplit index 9564fe6..62cb449 100644 --- a/config/waybar/configs/[TOP & BOT] SummitSplit +++ b/config/waybar/configs/[TOP & BOT] SummitSplit @@ -68,6 +68,7 @@ "modules-right": [ "hyprland/window", "tray", + "custom/swaync", "mpris", "keyboard-state", "pulseaudio", diff --git a/config/waybar/configs/[TOP & Left] NorthWest b/config/waybar/configs/[TOP & Left] NorthWest index 6fc8464..81f2306 100644 --- a/config/waybar/configs/[TOP & Left] NorthWest +++ b/config/waybar/configs/[TOP & Left] NorthWest @@ -18,25 +18,25 @@ "margin-right": 8, "modules-left": [ - "custom/menu", + "custom/menu", "custom/separator#blank_2", "group/motherboard", ], "modules-center": [ - //"hyprland/window", - "hyprland/workspaces#pacman", + //"hyprland/window", + "hyprland/workspaces#pacman", ], "modules-right": [ - "network", - "bluetooth", + "network", + "bluetooth", "custom/weather", "custom/separator#blank_2", "group/audio", "custom/separator#blank_2", - "keyboard-state", - "custom/power", + "keyboard-state", + "custom/power", ], }, @@ -64,6 +64,7 @@ "modules-right": [ "mpris", + "custom/swaync", "tray", "custom/light_dark", ], diff --git a/config/waybar/configs/[TOP & Right] NorthEast b/config/waybar/configs/[TOP & Right] NorthEast index 84ab71e..21bcb2c 100644 --- a/config/waybar/configs/[TOP & Right] NorthEast +++ b/config/waybar/configs/[TOP & Right] NorthEast @@ -65,6 +65,7 @@ "modules-right": [ "mpris", + "custom/swaync", "tray", "custom/light_dark", ], diff --git a/config/waybar/configs/[TOP] Camellia b/config/waybar/configs/[TOP] Camellia index beeb80b..53e2fce 100644 --- a/config/waybar/configs/[TOP] Camellia +++ b/config/waybar/configs/[TOP] Camellia @@ -23,7 +23,8 @@ "modules-left": [ "hyprland/workspaces#cam", "custom/separator#line", - "mpris", + "mpris", + "custom/swaync", "tray#cam", "wlr/taskbar" ], diff --git a/config/waybar/configs/[TOP] Chrysanthemum b/config/waybar/configs/[TOP] Chrysanthemum index b869184..b231047 100644 --- a/config/waybar/configs/[TOP] Chrysanthemum +++ b/config/waybar/configs/[TOP] Chrysanthemum @@ -18,7 +18,7 @@ "margin-right": 5, "margin-top": 0, -"modules-left": ["clock#gar", "mpris", "tray"], +"modules-left": ["clock#gar", "mpris", "tray", "custom/swaync"], "modules-center": ["hyprland/workspaces"], diff --git a/config/waybar/configs/[TOP] Gardenia b/config/waybar/configs/[TOP] Gardenia index 293c985..44c2de4 100644 --- a/config/waybar/configs/[TOP] Gardenia +++ b/config/waybar/configs/[TOP] Gardenia @@ -19,7 +19,7 @@ //"margin-bottom": 5, "width": 768, -"modules-left": ["clock#gar", "mpris", "tray"], +"modules-left": ["clock#gar", "mpris", "tray", "custom/swaync"], "modules-center": ["hyprland/workspaces#kanji"], diff --git a/config/waybar/configs/[TOP] Minimal - Long b/config/waybar/configs/[TOP] Minimal - Long index 8bc41ea..52e16fd 100644 --- a/config/waybar/configs/[TOP] Minimal - Long +++ b/config/waybar/configs/[TOP] Minimal - Long @@ -22,6 +22,7 @@ "hyprland/workspaces#pacman", "custom/separator#blank_2", "mpris", + "custom/swaync", "tray", ], "modules-center": [ diff --git a/config/waybar/configs/[TOP] Minimal - Short b/config/waybar/configs/[TOP] Minimal - Short index 2282d93..99616d8 100644 --- a/config/waybar/configs/[TOP] Minimal - Short +++ b/config/waybar/configs/[TOP] Minimal - Short @@ -21,6 +21,7 @@ "modules-right": [ "custom/menu", "tray", + "custom/swaync", "mpris", "network", "bluetooth", diff --git a/config/waybar/configs/[TOP] Peony b/config/waybar/configs/[TOP] Peony index 83ec43f..c01ab10 100644 --- a/config/waybar/configs/[TOP] Peony +++ b/config/waybar/configs/[TOP] Peony @@ -19,7 +19,7 @@ //"margin-bottom": 5, "width": 1444, -"modules-left": ["hyprland/workspaces#roman", "mpris", "tray#peony"], +"modules-left": ["hyprland/workspaces#roman", "mpris", "custom/swaync", "tray#peony"], "modules-center": ["clock#peony"], diff --git a/config/waybar/configs/[TOP] Sleek b/config/waybar/configs/[TOP] Sleek index 5f3b39c..dbd8a7e 100644 --- a/config/waybar/configs/[TOP] Sleek +++ b/config/waybar/configs/[TOP] Sleek @@ -13,7 +13,8 @@ "modules-left": [ "custom/menu", "custom/separator#blank_2", - "mpris", + "clock", + "custom/separator#blank_2", "hyprland/window" ], @@ -22,11 +23,15 @@ ], "modules-right": [ + "custom/swaync", + "custom/separator#blank", "tray", + "custom/separator#blank", + "mpris", + "custom/separator#blank", "pulseaudio", - "clock", - "custom/power" - + "custom/separator#blank", + "custom/power", ], diff --git a/config/waybar/modules b/config/waybar/modules index 6dac507..cd2ea35 100644 --- a/config/waybar/modules +++ b/config/waybar/modules @@ -546,7 +546,7 @@ }, "custom/swaync": { - "tooltip": false, + "tooltip":true, "format": "{icon} {}", "format-icons": { "notification": "",