From 0bdc93e101308e6aa43438dcb0de67182a865622 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Wed, 27 Dec 2023 00:37:26 +0900 Subject: updated swaync --- config/hypr/scripts/RefreshNoWaybar.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/hypr/scripts/RefreshNoWaybar.sh') diff --git a/config/hypr/scripts/RefreshNoWaybar.sh b/config/hypr/scripts/RefreshNoWaybar.sh index c834a531..0b74f011 100755 --- a/config/hypr/scripts/RefreshNoWaybar.sh +++ b/config/hypr/scripts/RefreshNoWaybar.sh @@ -19,7 +19,7 @@ ${SCRIPTSDIR}/PywalSwww.sh & sleep 0.5 # Relaunch dunst with pywal-borders -${SCRIPTSDIR}/PywalDunst.sh & +#${SCRIPTSDIR}/PywalDunst.sh & # Relaunching rainbow borders sleep 1 -- cgit v1.2.3 From 1e2a3b25aa760885ee326433ef0ab176e39c73bc Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Wed, 27 Dec 2023 13:23:34 +0900 Subject: updated for swaync --- config/dunst/dunstrc | 370 -------------------------- config/dunst/icons/backup.png | Bin 19157 -> 0 bytes config/dunst/icons/battery-quarter-solid.svg | 1 - config/dunst/icons/battery-status.png | Bin 8682 -> 0 bytes config/dunst/icons/brightness-100.png | Bin 32959 -> 0 bytes config/dunst/icons/brightness-20.png | Bin 20950 -> 0 bytes config/dunst/icons/brightness-40.png | Bin 23444 -> 0 bytes config/dunst/icons/brightness-60.png | Bin 28411 -> 0 bytes config/dunst/icons/brightness-80.png | Bin 32409 -> 0 bytes config/dunst/icons/dropper.png | Bin 24962 -> 0 bytes config/dunst/icons/microphone-mute.png | Bin 27368 -> 0 bytes config/dunst/icons/microphone.png | Bin 24921 -> 0 bytes config/dunst/icons/music.png | Bin 26416 -> 0 bytes config/dunst/icons/palette.png | Bin 35168 -> 0 bytes config/dunst/icons/picture.png | Bin 30151 -> 0 bytes config/dunst/icons/timer.png | Bin 33607 -> 0 bytes config/dunst/icons/uptime.png | Bin 17642 -> 0 bytes config/dunst/icons/volume-high.png | Bin 27993 -> 0 bytes config/dunst/icons/volume-low.png | Bin 22565 -> 0 bytes config/dunst/icons/volume-mid.png | Bin 24989 -> 0 bytes config/dunst/icons/volume-mute.png | Bin 23907 -> 0 bytes config/dunst/icons/vpn.png | Bin 43432 -> 0 bytes config/dunst/images/bell.png | Bin 51752 -> 0 bytes config/hypr/configs/Settings.conf | 1 - config/hypr/scripts/AirplaneMode.sh | 6 +- config/hypr/scripts/Brightness.sh | 2 +- config/hypr/scripts/BrightnessKbd.sh | 2 +- config/hypr/scripts/ChangeBlur.sh | 6 +- config/hypr/scripts/ChangeLayout.sh | 6 +- config/hypr/scripts/DarkLight.sh | 17 +- config/hypr/scripts/GameMode.sh | 6 +- config/hypr/scripts/MediaCtrl.sh | 10 +- config/hypr/scripts/PywalDunst.sh | 24 -- config/hypr/scripts/RefreshNoWaybar.sh | 3 - config/hypr/scripts/RofiBeats.sh | 2 +- config/hypr/scripts/ScreenShot.sh | 12 +- config/hypr/scripts/SwitchKeyboardLayout.sh | 4 +- config/hypr/scripts/TouchPad.sh | 6 +- config/hypr/scripts/Volume.sh | 2 +- config/swaync/config.json | 47 ++-- config/swaync/icons/backup.png | Bin 0 -> 19157 bytes config/swaync/icons/battery-quarter-solid.svg | 1 + config/swaync/icons/battery-status.png | Bin 0 -> 8682 bytes config/swaync/icons/brightness-100.png | Bin 0 -> 32959 bytes config/swaync/icons/brightness-20.png | Bin 0 -> 20950 bytes config/swaync/icons/brightness-40.png | Bin 0 -> 23444 bytes config/swaync/icons/brightness-60.png | Bin 0 -> 28411 bytes config/swaync/icons/brightness-80.png | Bin 0 -> 32409 bytes config/swaync/icons/dropper.png | Bin 0 -> 24962 bytes config/swaync/icons/microphone-mute.png | Bin 0 -> 27368 bytes config/swaync/icons/microphone.png | Bin 0 -> 24921 bytes config/swaync/icons/music.png | Bin 0 -> 26416 bytes config/swaync/icons/palette.png | Bin 0 -> 35168 bytes config/swaync/icons/picture.png | Bin 0 -> 30151 bytes config/swaync/icons/timer.png | Bin 0 -> 33607 bytes config/swaync/icons/uptime.png | Bin 0 -> 17642 bytes config/swaync/icons/volume-high.png | Bin 0 -> 27993 bytes config/swaync/icons/volume-low.png | Bin 0 -> 22565 bytes config/swaync/icons/volume-mid.png | Bin 0 -> 24989 bytes config/swaync/icons/volume-mute.png | Bin 0 -> 23907 bytes config/swaync/icons/vpn.png | Bin 0 -> 43432 bytes config/swaync/images/bell.png | Bin 0 -> 51752 bytes config/swaync/style.css | 106 ++++---- config/waybar/configs/[BOT & Left] SouthWest | 3 +- config/waybar/configs/[BOT & Right] SouthEast | 3 +- config/waybar/configs/[BOT] Camellia | 1 + config/waybar/configs/[BOT] Chrysanthemum | 2 +- config/waybar/configs/[BOT] Default | 1 + config/waybar/configs/[BOT] Gardenia | 2 +- config/waybar/configs/[BOT] Peony | 3 +- config/waybar/configs/[BOT] Sleek | 4 +- config/waybar/configs/[Left] WestWing | 2 +- config/waybar/configs/[Right] EastWing | 2 +- config/waybar/configs/[TOP & BOT] SummitSplit | 1 + config/waybar/configs/[TOP & Left] NorthWest | 15 +- config/waybar/configs/[TOP & Right] NorthEast | 1 + config/waybar/configs/[TOP] Camellia | 3 +- config/waybar/configs/[TOP] Chrysanthemum | 2 +- config/waybar/configs/[TOP] Gardenia | 2 +- config/waybar/configs/[TOP] Minimal - Long | 1 + config/waybar/configs/[TOP] Minimal - Short | 1 + config/waybar/configs/[TOP] Peony | 2 +- config/waybar/configs/[TOP] Sleek | 13 +- config/waybar/modules | 2 +- 84 files changed, 156 insertions(+), 544 deletions(-) delete mode 100755 config/dunst/dunstrc delete mode 100644 config/dunst/icons/backup.png delete mode 100644 config/dunst/icons/battery-quarter-solid.svg delete mode 100644 config/dunst/icons/battery-status.png delete mode 100644 config/dunst/icons/brightness-100.png delete mode 100644 config/dunst/icons/brightness-20.png delete mode 100644 config/dunst/icons/brightness-40.png delete mode 100644 config/dunst/icons/brightness-60.png delete mode 100644 config/dunst/icons/brightness-80.png delete mode 100644 config/dunst/icons/dropper.png delete mode 100644 config/dunst/icons/microphone-mute.png delete mode 100644 config/dunst/icons/microphone.png delete mode 100644 config/dunst/icons/music.png delete mode 100644 config/dunst/icons/palette.png delete mode 100644 config/dunst/icons/picture.png delete mode 100644 config/dunst/icons/timer.png delete mode 100644 config/dunst/icons/uptime.png delete mode 100644 config/dunst/icons/volume-high.png delete mode 100644 config/dunst/icons/volume-low.png delete mode 100644 config/dunst/icons/volume-mid.png delete mode 100644 config/dunst/icons/volume-mute.png delete mode 100644 config/dunst/icons/vpn.png delete mode 100644 config/dunst/images/bell.png delete mode 100755 config/hypr/scripts/PywalDunst.sh create mode 100644 config/swaync/icons/backup.png create mode 100644 config/swaync/icons/battery-quarter-solid.svg create mode 100644 config/swaync/icons/battery-status.png create mode 100644 config/swaync/icons/brightness-100.png create mode 100644 config/swaync/icons/brightness-20.png create mode 100644 config/swaync/icons/brightness-40.png create mode 100644 config/swaync/icons/brightness-60.png create mode 100644 config/swaync/icons/brightness-80.png create mode 100644 config/swaync/icons/dropper.png create mode 100644 config/swaync/icons/microphone-mute.png create mode 100644 config/swaync/icons/microphone.png create mode 100644 config/swaync/icons/music.png create mode 100644 config/swaync/icons/palette.png create mode 100644 config/swaync/icons/picture.png create mode 100644 config/swaync/icons/timer.png create mode 100644 config/swaync/icons/uptime.png create mode 100644 config/swaync/icons/volume-high.png create mode 100644 config/swaync/icons/volume-low.png create mode 100644 config/swaync/icons/volume-mid.png create mode 100644 config/swaync/icons/volume-mute.png create mode 100644 config/swaync/icons/vpn.png create mode 100644 config/swaync/images/bell.png (limited to 'config/hypr/scripts/RefreshNoWaybar.sh') diff --git a/config/dunst/dunstrc b/config/dunst/dunstrc deleted file mode 100755 index 2fb4d191..00000000 --- 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/dunst/icons/backup.png b/config/dunst/icons/backup.png deleted file mode 100644 index a60a495e..00000000 Binary files a/config/dunst/icons/backup.png and /dev/null differ diff --git a/config/dunst/icons/battery-quarter-solid.svg b/config/dunst/icons/battery-quarter-solid.svg deleted file mode 100644 index 450ef3dc..00000000 --- a/config/dunst/icons/battery-quarter-solid.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/config/dunst/icons/battery-status.png b/config/dunst/icons/battery-status.png deleted file mode 100644 index 07bf8154..00000000 Binary files a/config/dunst/icons/battery-status.png and /dev/null differ diff --git a/config/dunst/icons/brightness-100.png b/config/dunst/icons/brightness-100.png deleted file mode 100644 index 1e28ac37..00000000 Binary files a/config/dunst/icons/brightness-100.png and /dev/null differ diff --git a/config/dunst/icons/brightness-20.png b/config/dunst/icons/brightness-20.png deleted file mode 100644 index aee9c523..00000000 Binary files a/config/dunst/icons/brightness-20.png and /dev/null differ diff --git a/config/dunst/icons/brightness-40.png b/config/dunst/icons/brightness-40.png deleted file mode 100644 index bbedd1c7..00000000 Binary files a/config/dunst/icons/brightness-40.png and /dev/null differ diff --git a/config/dunst/icons/brightness-60.png b/config/dunst/icons/brightness-60.png deleted file mode 100644 index 4cd838bd..00000000 Binary files a/config/dunst/icons/brightness-60.png and /dev/null differ diff --git a/config/dunst/icons/brightness-80.png b/config/dunst/icons/brightness-80.png deleted file mode 100644 index 6684bdb8..00000000 Binary files a/config/dunst/icons/brightness-80.png and /dev/null differ diff --git a/config/dunst/icons/dropper.png b/config/dunst/icons/dropper.png deleted file mode 100644 index 2e222a35..00000000 Binary files a/config/dunst/icons/dropper.png and /dev/null differ diff --git a/config/dunst/icons/microphone-mute.png b/config/dunst/icons/microphone-mute.png deleted file mode 100644 index 1780e330..00000000 Binary files a/config/dunst/icons/microphone-mute.png and /dev/null differ diff --git a/config/dunst/icons/microphone.png b/config/dunst/icons/microphone.png deleted file mode 100644 index d1b6d767..00000000 Binary files a/config/dunst/icons/microphone.png and /dev/null differ diff --git a/config/dunst/icons/music.png b/config/dunst/icons/music.png deleted file mode 100644 index 92bf4c65..00000000 Binary files a/config/dunst/icons/music.png and /dev/null differ diff --git a/config/dunst/icons/palette.png b/config/dunst/icons/palette.png deleted file mode 100644 index 3ba73d05..00000000 Binary files a/config/dunst/icons/palette.png and /dev/null differ diff --git a/config/dunst/icons/picture.png b/config/dunst/icons/picture.png deleted file mode 100644 index 4669bc30..00000000 Binary files a/config/dunst/icons/picture.png and /dev/null differ diff --git a/config/dunst/icons/timer.png b/config/dunst/icons/timer.png deleted file mode 100644 index 420d1f15..00000000 Binary files a/config/dunst/icons/timer.png and /dev/null differ diff --git a/config/dunst/icons/uptime.png b/config/dunst/icons/uptime.png deleted file mode 100644 index 9dd08de6..00000000 Binary files a/config/dunst/icons/uptime.png and /dev/null differ diff --git a/config/dunst/icons/volume-high.png b/config/dunst/icons/volume-high.png deleted file mode 100644 index 200f17b2..00000000 Binary files a/config/dunst/icons/volume-high.png and /dev/null differ diff --git a/config/dunst/icons/volume-low.png b/config/dunst/icons/volume-low.png deleted file mode 100644 index 17cfff78..00000000 Binary files a/config/dunst/icons/volume-low.png and /dev/null differ diff --git a/config/dunst/icons/volume-mid.png b/config/dunst/icons/volume-mid.png deleted file mode 100644 index 1a3ad3a3..00000000 Binary files a/config/dunst/icons/volume-mid.png and /dev/null differ diff --git a/config/dunst/icons/volume-mute.png b/config/dunst/icons/volume-mute.png deleted file mode 100644 index 0b9b0c3c..00000000 Binary files a/config/dunst/icons/volume-mute.png and /dev/null differ diff --git a/config/dunst/icons/vpn.png b/config/dunst/icons/vpn.png deleted file mode 100644 index e31acaaa..00000000 Binary files a/config/dunst/icons/vpn.png and /dev/null differ diff --git a/config/dunst/images/bell.png b/config/dunst/images/bell.png deleted file mode 100644 index d9fea964..00000000 Binary files a/config/dunst/images/bell.png and /dev/null differ diff --git a/config/hypr/configs/Settings.conf b/config/hypr/configs/Settings.conf index 7b0c0606..2ad370ad 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 6e2eecff..e0337dc7 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 1c68ec5e..14c03da5 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 3ea9e493..3bdcebcb 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 76e5ed80..95789f5c 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 69ded6c6..93bc2fe9 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 612540b8..a2b7af70 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 678d282e..d53ec7d3 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 f9611523..9d970443 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 1c9398f2..00000000 --- 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 0b74f011..dc99b623 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 c8e8e43e..405451f5 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 44ba2bd6..1d5eeacf 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 9d1ee844..47469181 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 8f633ee0..7b9a1806 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 9aaf8a8c..f68491cf 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 591757b7..7d187fa0 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/swaync/icons/backup.png b/config/swaync/icons/backup.png new file mode 100644 index 00000000..a60a495e Binary files /dev/null and b/config/swaync/icons/backup.png differ diff --git a/config/swaync/icons/battery-quarter-solid.svg b/config/swaync/icons/battery-quarter-solid.svg new file mode 100644 index 00000000..450ef3dc --- /dev/null +++ b/config/swaync/icons/battery-quarter-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/config/swaync/icons/battery-status.png b/config/swaync/icons/battery-status.png new file mode 100644 index 00000000..07bf8154 Binary files /dev/null and b/config/swaync/icons/battery-status.png differ diff --git a/config/swaync/icons/brightness-100.png b/config/swaync/icons/brightness-100.png new file mode 100644 index 00000000..1e28ac37 Binary files /dev/null and b/config/swaync/icons/brightness-100.png differ diff --git a/config/swaync/icons/brightness-20.png b/config/swaync/icons/brightness-20.png new file mode 100644 index 00000000..aee9c523 Binary files /dev/null and b/config/swaync/icons/brightness-20.png differ diff --git a/config/swaync/icons/brightness-40.png b/config/swaync/icons/brightness-40.png new file mode 100644 index 00000000..bbedd1c7 Binary files /dev/null and b/config/swaync/icons/brightness-40.png differ diff --git a/config/swaync/icons/brightness-60.png b/config/swaync/icons/brightness-60.png new file mode 100644 index 00000000..4cd838bd Binary files /dev/null and b/config/swaync/icons/brightness-60.png differ diff --git a/config/swaync/icons/brightness-80.png b/config/swaync/icons/brightness-80.png new file mode 100644 index 00000000..6684bdb8 Binary files /dev/null and b/config/swaync/icons/brightness-80.png differ diff --git a/config/swaync/icons/dropper.png b/config/swaync/icons/dropper.png new file mode 100644 index 00000000..2e222a35 Binary files /dev/null and b/config/swaync/icons/dropper.png differ diff --git a/config/swaync/icons/microphone-mute.png b/config/swaync/icons/microphone-mute.png new file mode 100644 index 00000000..1780e330 Binary files /dev/null and b/config/swaync/icons/microphone-mute.png differ diff --git a/config/swaync/icons/microphone.png b/config/swaync/icons/microphone.png new file mode 100644 index 00000000..d1b6d767 Binary files /dev/null and b/config/swaync/icons/microphone.png differ diff --git a/config/swaync/icons/music.png b/config/swaync/icons/music.png new file mode 100644 index 00000000..92bf4c65 Binary files /dev/null and b/config/swaync/icons/music.png differ diff --git a/config/swaync/icons/palette.png b/config/swaync/icons/palette.png new file mode 100644 index 00000000..3ba73d05 Binary files /dev/null and b/config/swaync/icons/palette.png differ diff --git a/config/swaync/icons/picture.png b/config/swaync/icons/picture.png new file mode 100644 index 00000000..4669bc30 Binary files /dev/null and b/config/swaync/icons/picture.png differ diff --git a/config/swaync/icons/timer.png b/config/swaync/icons/timer.png new file mode 100644 index 00000000..420d1f15 Binary files /dev/null and b/config/swaync/icons/timer.png differ diff --git a/config/swaync/icons/uptime.png b/config/swaync/icons/uptime.png new file mode 100644 index 00000000..9dd08de6 Binary files /dev/null and b/config/swaync/icons/uptime.png differ diff --git a/config/swaync/icons/volume-high.png b/config/swaync/icons/volume-high.png new file mode 100644 index 00000000..200f17b2 Binary files /dev/null and b/config/swaync/icons/volume-high.png differ diff --git a/config/swaync/icons/volume-low.png b/config/swaync/icons/volume-low.png new file mode 100644 index 00000000..17cfff78 Binary files /dev/null and b/config/swaync/icons/volume-low.png differ diff --git a/config/swaync/icons/volume-mid.png b/config/swaync/icons/volume-mid.png new file mode 100644 index 00000000..1a3ad3a3 Binary files /dev/null and b/config/swaync/icons/volume-mid.png differ diff --git a/config/swaync/icons/volume-mute.png b/config/swaync/icons/volume-mute.png new file mode 100644 index 00000000..0b9b0c3c Binary files /dev/null and b/config/swaync/icons/volume-mute.png differ diff --git a/config/swaync/icons/vpn.png b/config/swaync/icons/vpn.png new file mode 100644 index 00000000..e31acaaa Binary files /dev/null and b/config/swaync/icons/vpn.png differ diff --git a/config/swaync/images/bell.png b/config/swaync/images/bell.png new file mode 100644 index 00000000..d9fea964 Binary files /dev/null and b/config/swaync/images/bell.png differ diff --git a/config/swaync/style.css b/config/swaync/style.css index e65c2dbe..59aea3c6 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 27bec456..14377d57 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 68629cbc..7d684c85 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 0e2305a9..e135258e 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 68bff674..e4f1fba8 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 36798abf..eece9165 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 ce460426..5d071521 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 7f049c18..dcdf4aa1 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 10175e8a..10b62db6 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 1458b43c..a3381e8c 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 4fc258cf..5ce7be2e 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 9564fe68..62cb449d 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 6fc84642..81f23066 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 84ab71ef..21bcb2c8 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 beeb80bd..53e2fcea 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 b8691847..b2310471 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 293c9852..44c2de42 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 8bc41eae..52e16fd0 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 2282d93c..99616d84 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 83ec43f5..c01ab104 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 5f3b39c3..dbd8a7e0 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 6dac507a..cd2ea357 100644 --- a/config/waybar/modules +++ b/config/waybar/modules @@ -546,7 +546,7 @@ }, "custom/swaync": { - "tooltip": false, + "tooltip":true, "format": "{icon} {}", "format-icons": { "notification": "", -- cgit v1.2.3 From f0771edf369d3ea51e3322acb9a5baa456f732b1 Mon Sep 17 00:00:00 2001 From: "Ja.KooLit" Date: Fri, 29 Dec 2023 00:41:08 +0900 Subject: Re-Structured Hypr Folder in preparation for Updates Scripts --- config/hypr/UserConfigs/ENVariables.conf | 40 +++++++ config/hypr/UserConfigs/LaptopDisplay.conf | 4 + config/hypr/UserConfigs/Laptops.conf | 47 ++++++++ config/hypr/UserConfigs/Monitors.conf | 52 ++++++++ config/hypr/UserConfigs/Startup_Apps.conf | 56 +++++++++ config/hypr/UserConfigs/UserKeybinds.conf | 29 +++++ config/hypr/UserConfigs/UserSettings.conf | 145 +++++++++++++++++++++++ config/hypr/UserConfigs/WindowRules.conf | 72 +++++++++++ config/hypr/UserScripts/RainbowBorders.sh | 10 ++ config/hypr/UserScripts/Weather.py | 122 +++++++++++++++++++ config/hypr/UserScripts/Weather.sh | 80 +++++++++++++ config/hypr/UserScripts/ZshChangeTheme.sh | 38 ++++++ config/hypr/configs/ENVariables.conf | 40 ------- config/hypr/configs/Execs.conf | 55 --------- config/hypr/configs/Keybinds.conf | 26 +--- config/hypr/configs/LaptopDisplay.conf | 4 - config/hypr/configs/Laptops.conf | 45 ------- config/hypr/configs/Monitors.conf | 52 -------- config/hypr/configs/Settings.conf | 138 +-------------------- config/hypr/configs/WindowRules.conf | 72 ----------- config/hypr/hyprland.conf | 18 ++- config/hypr/scripts/QuickEdit.sh | 33 ++++-- config/hypr/scripts/RainbowBorders.sh | 10 -- config/hypr/scripts/Refresh.sh | 20 +++- config/hypr/scripts/RefreshNoWaybar.sh | 21 +++- config/hypr/scripts/Weather.py | 122 ------------------- config/hypr/scripts/Weather.sh | 80 ------------- config/hypr/scripts/ZshChangeTheme.sh | 38 ------ config/rofi/config-compact.rasi | 2 +- config/rofi/resolution/1080p/config-compact.rasi | 2 +- config/rofi/resolution/1440p/config-compact.rasi | 2 +- copy.sh | 27 +++-- 32 files changed, 782 insertions(+), 720 deletions(-) create mode 100644 config/hypr/UserConfigs/ENVariables.conf create mode 100644 config/hypr/UserConfigs/LaptopDisplay.conf create mode 100644 config/hypr/UserConfigs/Laptops.conf create mode 100644 config/hypr/UserConfigs/Monitors.conf create mode 100644 config/hypr/UserConfigs/Startup_Apps.conf create mode 100644 config/hypr/UserConfigs/UserKeybinds.conf create mode 100644 config/hypr/UserConfigs/UserSettings.conf create mode 100644 config/hypr/UserConfigs/WindowRules.conf create mode 100755 config/hypr/UserScripts/RainbowBorders.sh create mode 100755 config/hypr/UserScripts/Weather.py create mode 100755 config/hypr/UserScripts/Weather.sh create mode 100755 config/hypr/UserScripts/ZshChangeTheme.sh delete mode 100644 config/hypr/configs/ENVariables.conf delete mode 100644 config/hypr/configs/Execs.conf delete mode 100644 config/hypr/configs/LaptopDisplay.conf delete mode 100644 config/hypr/configs/Laptops.conf delete mode 100644 config/hypr/configs/Monitors.conf delete mode 100644 config/hypr/configs/WindowRules.conf delete mode 100755 config/hypr/scripts/RainbowBorders.sh delete mode 100755 config/hypr/scripts/Weather.py delete mode 100755 config/hypr/scripts/Weather.sh delete mode 100755 config/hypr/scripts/ZshChangeTheme.sh (limited to 'config/hypr/scripts/RefreshNoWaybar.sh') diff --git a/config/hypr/UserConfigs/ENVariables.conf b/config/hypr/UserConfigs/ENVariables.conf new file mode 100644 index 00000000..031acae3 --- /dev/null +++ b/config/hypr/UserConfigs/ENVariables.conf @@ -0,0 +1,40 @@ +## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## + +#environment-variables +env = CLUTTER_BACKEND,wayland +env = GDK_BACKEND,wayland,x11 +env = QT_AUTO_SCREEN_SCALE_FACTOR,1 +env = QT_QPA_PLATFORM,wayland;xcb +env = QT_QPA_PLATFORMTHEME,qt5ct +env = QT_SCALE_FACTOR,1 +env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1 +env = XDG_CURRENT_DESKTOP,Hyprland +env = XDG_SESSION_DESKTOP,Hyprland +env = XDG_SESSION_TYPE,wayland + +# vulkan +#env = WLR_RENDERER,vulkan + +# firefox +env = MOZ_ENABLE_WAYLAND,1 + +# NVIDIA +# This is from Hyprland Wiki. As a start, WLR_NO_HARDWARE_CURSORS 1 will be activated if nvidia gpu detected +env = WLR_NO_HARDWARE_CURSORS,1 +env = LIBVA_DRIVER_NAME,nvidia +env = __GLX_VENDOR_LIBRARY_NAME,nvidia +#env = GBM_BACKEND,nvidia-drm + +#env = __NV_PRIME_RENDER_OFFLOAD,1 +#env = __VK_LAYER_NV_optimus,NVIDIA_only +#env = WLR_DRM_NO_ATOMIC,1 +#env = NVD_BACKEND,direct + +# FOR VM and POSSIBLY NVIDIA +#env = WLR_RENDERER_ALLOW_SOFTWARE,1 + +# nvidia firefox (for hardware acceleration on FF)? +# check this post https://github.com/elFarto/nvidia-vaapi-driver#configuration +#env = MOZ_DISABLE_RDD_SANDBOX,1 +#env = NVD_BACKEND,direct +#env = EGL_PLATFORM,wayland \ No newline at end of file diff --git a/config/hypr/UserConfigs/LaptopDisplay.conf b/config/hypr/UserConfigs/LaptopDisplay.conf new file mode 100644 index 00000000..d50c9119 --- /dev/null +++ b/config/hypr/UserConfigs/LaptopDisplay.conf @@ -0,0 +1,4 @@ +## NOTE, THIS FILE IS BEING USED by disabling Laptop display monitor behaviour when closing lid. +## See notes on Laptops.conf + +#monitor = eDP-1, preferred, auto, 1 diff --git a/config/hypr/UserConfigs/Laptops.conf b/config/hypr/UserConfigs/Laptops.conf new file mode 100644 index 00000000..0a12d7fa --- /dev/null +++ b/config/hypr/UserConfigs/Laptops.conf @@ -0,0 +1,47 @@ +## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## + +# See https://wiki.hyprland.org/Configuring/Keywords/ for more variable settings +# These configs are mostly for laptops. This is addemdum to Keybinds.conf + +$configs = $HOME/.config/hypr/configs +$UserConfigs = $HOME/.config/hypr/UserConfigs +$mainMod = SUPER +$scriptsDir = $HOME/.config/hypr/scripts + +bind = , xf86KbdBrightnessDown, exec, $scriptsDir/BrightnessKbd.sh --dec #Keyboard brightness Down +bind = , xf86KbdBrightnessUp, exec, $scriptsDir/BrightnessKbd.sh --inc #Keyboard brightness up +bind = , xf86Launch1, exec, rog-control-center # ASUS Armory crate button +bind = , xf86Launch3, exec, asusctl led-mode -n #FN+F4 Switch keyboard RGB profile +bind = , xf86Launch4, exec, asusctl profile -n #FN+F5 change of fan profiles (Quite, Balance, Performance) +bind = , xf86MonBrightnessDown, exec, $scriptsDir/Brightness.sh --dec +bind = , xf86MonBrightnessUp, exec, $scriptsDir/Brightness.sh --inc +bind = , xf86TouchpadToggle, exec, $scriptsDir/TouchPad.sh #disable touchpad + +# Screenshot keybindings for Asus G15 (no PrinSrc button) +bind = $mainMod, F6, exec, $scriptsDir/ScreenShot.sh --now # Fullscreen +bind = $mainMod SHIFT, F6, exec, $scriptsDir/ScreenShot.sh --area +bind = $mainMod CTRL, F6, exec, $scriptsDir/ScreenShot.sh --in5 # Screenshot in 5 secs +bind = $mainMod ALT, F6, exec, $scriptsDir/ScreenShot.sh --in10 # Screenshot in 10 secs + +# Below are useful when you are connecting your laptop in external display +# Suggest you edit below for your laptop display +# From WIKI This is to disable laptop monitor when lid is closed. +# consult https://wiki.hyprland.org/hyprland-wiki/pages/Configuring/Binds/#switches +#bindl = , switch:off:Lid Switch,exec,hyprctl keyword monitor "eDP-1, preferred, auto, 1" +#bindl = , switch:on:Lid Switch,exec,hyprctl keyword monitor "eDP-1, disable" + +############################################################################# +### WARNING! Using this method has some caveats!! USE THIS PART WITH SOME CAUTION! +# CONS of doing this, is that you need to set up your wallpaper (SUPER W) and choose wallpaper. +# CAVEATS! Sometimes the Main Laptop Monitor DOES NOT have display that it needs to re-connect your external monitor +# One work around is to ensure that before shutting down laptop, MAKE SURE your laptop lid is OPEN!! +# Make sure to comment (put # on the both the bindl = , switch ......) above +# NOTE: Display for laptop are being generated into LaptopDisplay.conf +# This part is to be use if you do not want your main laptop monitor to wake up during say wallpaper change etc + +#bindl = , switch:off:Lid Switch,exec,echo "monitor = eDP-1, preferred, auto, 1" > $UserConfigs/LaptopDisplay.conf +#bindl = , switch:on:Lid Switch,exec,echo "monitor = eDP-1, disable" > $UserConfigs/LaptopDisplay.conf + +# for laptop-lid action (to erase the last entry) +#exec-once = echo "eDP-1, preferred, auto, 1" > $HOME/.config/hypr/UserConfigs/LaptopDisplay.conf +############################################################################## diff --git a/config/hypr/UserConfigs/Monitors.conf b/config/hypr/UserConfigs/Monitors.conf new file mode 100644 index 00000000..ac87862a --- /dev/null +++ b/config/hypr/UserConfigs/Monitors.conf @@ -0,0 +1,52 @@ +## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## + +# Monitor Configuration +# See Hyprland wiki for more details +# https://wiki.hyprland.org/Configuring/Monitors/ +# Configure your Display resolution, offset, scale and Monitors here, use `hyprctl monitors` to get the info. + +#Could help when scaling and not pixelating +xwayland { + force_zero_scaling = true +} + +# Monitors +monitor=,preferred,auto,1 + +# NOTE: for laptop, kindly check notes in Laptops.conf regarding display +# Created this inorder for the monitor display to not wake up if not intended. +# See here: https://github.com/hyprwm/Hyprland/issues/4090 + +#monitor = eDP-1, preferred, auto, 1 +#monitor = eDP-1, 2560x1440@165, 0x0, 1 #own screen +#monitor = DP-2, preferred, auto, 1 +#monitor = DP-1, preferred, auto, 1 +#monitor = HDMI-A-1, preferred,auto,1 + +# QEMU-KVM or any virtual box +#monitor = Virtual-1, 1920x1080@60,auto,1 + +# Hi Refresh Rate +#monitor=,highrr,auto,1 + +# High Resolution +#monitor=,highres,auto,1 + +# to disable a monitor +#monitor=name,disable + +# Mirror +#monitor=DP-3,1920x1080@60,0x0,1,mirror,DP-2 +#monitor=,preferred,auto,1,mirror,eDP-1 + + +# Example : +#monitor=eDP-1,2560x1440@165,0x0,1 +#workspace=HDMI-A-1,1 +#monitor=HDMI-A-1,2560x1440@144,0x0,1,mirror,eDP-1 +#workspace=HDMI-A-2,2 + +#monitor=eDP-1,transform,0 +#monitor=eDP-1,addreserved,10,10,10,49 +#workspace=eDP-1,1 + diff --git a/config/hypr/UserConfigs/Startup_Apps.conf b/config/hypr/UserConfigs/Startup_Apps.conf new file mode 100644 index 00000000..6593268f --- /dev/null +++ b/config/hypr/UserConfigs/Startup_Apps.conf @@ -0,0 +1,56 @@ +## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## +#Commands & Apps to be executed at launch + +$scriptsDir = $HOME/.config/hypr/scripts +$UserscriptsDir = $HOME/.config/hypr/UserScripts +$lock = $scriptsDir/LockScreen.sh +$SwwwRandom = $scriptsDir/WallpaperRandom.sh +$WallpaperPath = $HOME/Pictures/wallpapers + +# Initial boot script to start Pywal and Set wallpaper. This line and corresponding script can be safely deleted once logged in +exec-once = $HOME/.config/hypr/initial-boot.sh + +# wallpaper stuff / More wallpaper options below +exec-once = swww query || swww init +exec-once = $SwwwRandom $WallpaperPath # random wallpaper switcher every 30 minutes + +# Startup +exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP +exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP + +# Polkit (Polkit Gnome / KDE) +exec-once = $scriptsDir/Polkit.sh + +# starup apps +exec-once = waybar & +exec-once = nm-applet --indicator & +exec-once = swaync & +#exec-once = blueman-applet & +#exec-once = rog-control-center & + + +#clipboard manager +exec-once = wl-paste --type text --watch cliphist store +exec-once = wl-paste --type image --watch cliphist store + +# Rainbow borders +exec-once = $UserscriptsDir/RainbowBorders.sh + +# sway-idle with lock only +exec-once = swayidle -w timeout 900 '$lock' +# sway-idle with lock and sleep +#exec-once = swayidle -w timeout 900 '$lock' timeout 1200 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep '$lock' +# sway idle without lock +#exec-once = swayidle -w timeout 900 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' + +## Here are list of features available but disabled by default +#exec-once = swww query || swww init && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png # persistent wallpaper + +#gnome polkit for nixos +#exec-once = $scriptsDir/Polkit-NixOS.sh + +# xdg-desktop-portal-hyprland (should be auto starting. However, you can force to start) +#exec-once = $scriptsDir/PortalHyprland.sh + +# wlsunset - for automatic gamma adjustment. Default is 1900 to 0700 (7pm to 7am). Edit Sunset.sh accordingly +# exec-once = $scriptsDir/Sunset.sh \ No newline at end of file diff --git a/config/hypr/UserConfigs/UserKeybinds.conf b/config/hypr/UserConfigs/UserKeybinds.conf new file mode 100644 index 00000000..f55f0d5e --- /dev/null +++ b/config/hypr/UserConfigs/UserKeybinds.conf @@ -0,0 +1,29 @@ +## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## +# This is where you put your own keybinds. Be Mindful to check as well ~/.config/hypr/configs/Keybinds.conf to avoid conflict +# if you think I should replace the Pre-defined Keybinds in ~/.config/hypr/configs/Keybinds.conf , submit an issue or let me know in DC and present me a valid reason as to why, such as conflicting with global shortcuts, etc etc + +# See https://wiki.hyprland.org/Configuring/Keywords/ for more settings and variables +# See also Laptops.conf for laptops keybinds + +$mainMod = SUPER +$files = thunar +$term = kitty +$scriptsDir = $HOME/.config/hypr/scripts +$UserScripts = $HOME/.config/hypr/UserScripts + +# rofi App launcher +bindr = $mainMod, $mainMod_L, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run,window +bind = $mainMod, D, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run,window + +bind = $mainMod, Return, exec, $term # Launch terminal +bind = $mainMod, T, exec, $files + +# User Added Keybinds +bind = $mainMod SHIFT, O, exec, $UserScripts/ZshChangeTheme.sh # Change oh-my-zsh theme + +# For passthrough keyboard into a VM +# bind = $mainMod ALT, P, submap, passthru +#submap = passthru +# to unbind +#bind = $mainMod ALT, P, submap, reset +#submap = reset diff --git a/config/hypr/UserConfigs/UserSettings.conf b/config/hypr/UserConfigs/UserSettings.conf new file mode 100644 index 00000000..338658a4 --- /dev/null +++ b/config/hypr/UserConfigs/UserSettings.conf @@ -0,0 +1,145 @@ +## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## +# User Settings +# This is where you put your own settings as this will not be touched during update + +## 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 +# blurls = rofi + +dwindle { + pseudotile = yes + preserve_split = yes + special_scale_factor = 0.8 +} + +master { + new_is_master=1 + new_on_top=1 + mfact = 0.5 +} + +general { + sensitivity=1.00 + apply_sens_to_raw=1 + gaps_in = 4 + gaps_out = 8 + border_size = 2 + resize_on_border = true + + col.active_border = $color0 $color2 $color4 $color6 $color8 90deg + col.inactive_border = $backgroundCol + + layout = master +} + +group { + col.border_active = $color15 + + groupbar { + col.active = $color0 + } +} + +decoration { + rounding = 8 + + active_opacity = 1.0 + inactive_opacity = 0.9 + fullscreen_opacity = 1.0 + + dim_inactive = true + dim_strength = 0.1 + + drop_shadow=true + shadow_range=6 + shadow_render_power = 1 + col.shadow = $color2 + col.shadow_inactive = 0x50000000 + + blur { + enabled = true + size = 5 + passes = 2 + ignore_opacity = true + new_optimizations = true + } +} + +animations { + enabled = yes + + bezier = myBezier, 0.05, 0.9, 0.1, 1.05 + bezier = linear, 0.0, 0.0, 1.0, 1.0 + bezier = wind, 0.05, 0.9, 0.1, 1.05 + bezier = winIn, 0.1, 1.1, 0.1, 1.1 + bezier = winOut, 0.3, -0.3, 0, 1 + bezier = slow, 0, 0.85, 0.3, 1 + bezier = overshot, 0.7, 0.6, 0.1, 1.1 + bezier = bounce, 1.1, 1.6, 0.1, 0.85 + bezier = sligshot, 1, -1, 0.15, 1.25 + bezier = nice, 0, 6.9, 0.5, -4.20 + + animation = windowsIn, 1, 5, slow, popin + animation = windowsOut, 1, 5, winOut, popin + animation = windowsMove, 1, 5, wind, slide + animation = border, 1, 10, linear + animation = borderangle, 1, 180, linear, loop + animation = fade, 1, 5, overshot + animation = workspaces, 1, 5, wind + animation = windows, 1, 5, bounce, popin +} + +input { + kb_layout=us + kb_variant= + kb_model= + kb_options=grp:alt_shift_toggle + kb_rules= + repeat_rate=50 + repeat_delay=300 + numlock_by_default=1 + left_handed=0 + follow_mouse=1 + float_switch_override_focus=0 + + touchpad { + disable_while_typing=1 + natural_scroll=0 + clickfinger_behavior=0 + middle_button_emulation=1 + tap-to-click=1 + drag_lock=0 + } +} + +gestures { + workspace_swipe=1 + workspace_swipe_fingers=3 + workspace_swipe_distance=400 + workspace_swipe_invert=1 + workspace_swipe_min_speed_to_force=30 + workspace_swipe_cancel_ratio=0.5 + workspace_swipe_create_new=1 + workspace_swipe_forever=1 +} + +misc { + disable_hyprland_logo = true + disable_splash_rendering = true + mouse_move_enables_dpms = true + #vrr = 0 + enable_swallow = true + no_direct_scanout = true #for fullscreen games + focus_on_activate = false + swallow_regex = ^(kitty)$ + #disable_autoreload = true +} + +binds { + workspace_back_and_forth=1 + allow_workspace_cycles=1 + pass_mouse_when_bound=0 +} diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf new file mode 100644 index 00000000..a3a77cfb --- /dev/null +++ b/config/hypr/UserConfigs/WindowRules.conf @@ -0,0 +1,72 @@ +## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## +# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more + +windowrule = float, org.kde.polkit-kde-authentication-agent-1 +windowrule = float, nm-connection-editor|blueman-manager +windowrule = float, pavucontrol +windowrule = float, nwg-look|qt5ct|mpv +windowrule = float, onedriver|onedriver-launcher +windowrule = float, eog +windowrule = float, zoom +windowrule = float, rofi +windowrule = float, gnome-system-monitor +windowrule = float, yad + +#windowrule = noblur,gamescope +#windowrule = fullscreen,gamescope +#windowrule = workspace 6 silent,^(gamescope)$ + +windowrule = center,^(pavucontrol) + +# windowrule v2 +windowrulev2 = workspace 1, class:^(thunderbird)$ +windowrulev2 = workspace 2, class:^(firefox)$ +windowrulev2 = workspace 2, class:^(Firefox-esr)$ +windowrulev2 = workspace 2, class:^(Microsoft-edge-beta)$ +windowrulev2 = workspace 3, class:^([Tt]hunar)$ +windowrulev2 = workspace 4, class:^(com.obsproject.Studio)$ +windowrulev2 = workspace 5 silent, class:^([Ss]team)$,title:^([Ss]team)$ +windowrulev2 = workspace 5 silent, class:^(lutris)$ +windowrulev2 = workspace 6, class:^(virt-manager)$ +windowrulev2 = workspace 7 silent, class:^(discord)$ +windowrulev2 = workspace 7 silent, class:^(WebCord)$ +windowrulev2 = workspace 9 silent, class:^([Aa]udacious)$ + +#opacity (transparent) #enable as desired +windowrulev2 = opacity 0.9 0.6, class:^([Rr]ofi)$ +windowrulev2 = opacity 0.9 0.7, class:^(Brave-browser)$ +windowrulev2 = opacity 0.9 0.7, class:^(Brave-browser-dev)$ +windowrulev2 = opacity 0.9 0.7, class:^(firefox)$ +windowrulev2 = opacity 0.9 0.7, class:^(Firefox-esr)$ +windowrulev2 = opacity 0.9 0.8, class:^([Tt]hunar)$ +windowrulev2 = opacity 0.8 0.6, class:^(pcmanfm-qt)$ +windowrulev2 = opacity 0.9 0.7, class:^(gedit)$ +windowrulev2 = opacity 0.9 0.8, class:^(kitty)$ +windowrulev2 = opacity 0.9 0.7, class:^(mousepad)$ +windowrulev2 = opacity 0.9 0.7, class:^(codium-url-handler)$ +windowrulev2 = opacity 0.9 0.7, class:^(VSCodium)$ +windowrulev2 = opacity 0.9 0.7, class:^(yad)$ +windowrulev2 = opacity 0.9 0.7, class:^(com.obsproject.Studio)$ +windowrulev2 = opacity 0.9 0.7, class:^([Aa]udacious)$ + + +#layerrule = unset,class:^([Rr]ofi)$ +#layerrule = blur,class:^([Rr]ofi)$ +#layerrule = ignorezero, + +#windowrulev2 = bordercolor rgb(EE4B55) rgb(880808), fullscreen:1 +#windowrulev2 = bordercolor rgb(282737) rgb(1E1D2D), floating:1 +#windowrulev2 = opacity 0.8 0.8, pinned:1 + +# Picture-in-a-Picture (PIP) rules: Oddly, some need re-duplication. This is because the window for +# PIP changes after on first launch, and will not inherant the rules... +windowrulev2=opacity 0.95 0.75,title:^(Picture-in-Picture)$ # for opacity: [focus num] [bg num] +# Interestingly, the opacity rule above doesn't need the reduplication? +windowrulev2=pin,title:^(Picture-in-Picture)$ +#windowrulev2=pin,title:^(Firefox)$ +windowrulev2=float, title:^(Picture-in-Picture)$ +#windowrulev2=float, title:^(Firefox)$ +windowrulev2=size 25% 25%,title:^(Picture-in-Picture)$ +#windowrulev2=size 25% 25%,title:^(Firefox)$ +windowrulev2=move 72% 7%,title:^(Picture-in-Picture)$ +#windowrulev2=move 72% 7%,title:^(Firefox)$ \ No newline at end of file diff --git a/config/hypr/UserScripts/RainbowBorders.sh b/config/hypr/UserScripts/RainbowBorders.sh new file mode 100755 index 00000000..1f5e6cdb --- /dev/null +++ b/config/hypr/UserScripts/RainbowBorders.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +function random_hex() { + random_hex=("0xff$(openssl rand -hex 3)") + echo $random_hex +} + +hyprctl keyword general:col.active_border $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) 270deg + +hyprctl keyword general:col.inactive_border $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) 270deg \ No newline at end of file diff --git a/config/hypr/UserScripts/Weather.py b/config/hypr/UserScripts/Weather.py new file mode 100755 index 00000000..154c1589 --- /dev/null +++ b/config/hypr/UserScripts/Weather.py @@ -0,0 +1,122 @@ +#!/usr/bin/env python3 +# From https://raw.githubusercontent.com/rxyhn/dotfiles/main/home/rxyhn/modules/desktop/waybar/scripts/waybar-wttr.py + +## ensure to insert city inside "" +city = "" +import json +import requests +from datetime import datetime + +WEATHER_CODES = { + '113': '', + '116': '󰖕', + '119': '', + '122': '', + '143': '', + '176': '', + '179': '', + '182': '', + '185': '', + '200': '⛈️', + '227': '🌨️', + '230': '🌨️', + '248': '☁️ ', + '260': '☁️', + '263': '🌧️', + '266': '🌧️', + '281': '🌧️', + '284': '🌧️', + '293': '🌧️', + '296': '🌧️', + '299': '🌧️', + '302': '🌧️', + '305': '🌧️', + '308': '🌧️', + '311': '🌧️', + '314': '🌧️', + '317': '🌧️', + '320': '🌨️', + '323': '🌨️', + '326': '🌨️', + '329': '❄️', + '332': '❄️', + '335': '❄️', + '338': '❄️', + '350': '🌧️', + '353': '🌧️', + '356': '🌧️', + '359': '🌧️', + '362': '🌧️', + '365': '🌧️', + '368': '🌧️', + '371': '❄️', + '374': '🌨️', + '377': '🌨️', + '386': '🌨️', + '389': '🌨️', + '392': '🌧️', + '395': '❄️' +} + +data = {} + + +weather = requests.get(f"https://wttr.in/{city}?format=j1").json() + + +def format_time(time): + return time.replace("00", "").zfill(2) + + +def format_temp(temp): + return (hour['FeelsLikeC']+"°").ljust(3) + + +def format_chances(hour): + chances = { + "chanceoffog": "Fog", + "chanceoffrost": "Frost", + "chanceofovercast": "Overcast", + "chanceofrain": "Rain", + "chanceofsnow": "Snow", + "chanceofsunshine": "Sunshine", + "chanceofthunder": "Thunder", + "chanceofwindy": "Wind" + } + + conditions = [] + for event in chances.keys(): + if int(hour[event]) > 0: + conditions.append(chances[event]+" "+hour[event]+"%") + return ", ".join(conditions) + +tempint = int(weather['current_condition'][0]['FeelsLikeC']) +extrachar = '' +if tempint > 0 and tempint < 10: + extrachar = '+' + + +data['text'] = ' '+WEATHER_CODES[weather['current_condition'][0]['weatherCode']] + \ + " "+extrachar+weather['current_condition'][0]['FeelsLikeC']+"°" + +data['tooltip'] = f"{weather['current_condition'][0]['weatherDesc'][0]['value']} {weather['current_condition'][0]['temp_C']}°\n" +data['tooltip'] += f"Feels like: {weather['current_condition'][0]['FeelsLikeC']}°\n" +data['tooltip'] += f"Wind: {weather['current_condition'][0]['windspeedKmph']}Km/h\n" +data['tooltip'] += f"Humidity: {weather['current_condition'][0]['humidity']}%\n" +for i, day in enumerate(weather['weather']): + data['tooltip'] += f"\n" + if i == 0: + data['tooltip'] += "Today, " + if i == 1: + data['tooltip'] += "Tomorrow, " + data['tooltip'] += f"{day['date']}\n" + data['tooltip'] += f"⬆️{day['maxtempC']}° ⬇️{day['mintempC']}° " + data['tooltip'] += f"🌅{day['astronomy'][0]['sunrise']} 🌇{day['astronomy'][0]['sunset']}\n" + for hour in day['hourly']: + if i == 0: + if int(format_time(hour['time'])) < datetime.now().hour-2: + continue + data['tooltip'] += f"{format_time(hour['time'])} {WEATHER_CODES[hour['weatherCode']]} {format_temp(hour['FeelsLikeC'])} {hour['weatherDesc'][0]['value']}, {format_chances(hour)}\n" + + +print(json.dumps(data)) diff --git a/config/hypr/UserScripts/Weather.sh b/config/hypr/UserScripts/Weather.sh new file mode 100755 index 00000000..40048710 --- /dev/null +++ b/config/hypr/UserScripts/Weather.sh @@ -0,0 +1,80 @@ +#!/bin/bash + +city= +cachedir=~/.cache/rbn +cachefile=${0##*/}-$1 + +if [ ! -d $cachedir ]; then + mkdir -p $cachedir +fi + +if [ ! -f $cachedir/$cachefile ]; then + touch $cachedir/$cachefile +fi + +# Save current IFS +SAVEIFS=$IFS +# Change IFS to new line. +IFS=$'\n' + +cacheage=$(($(date +%s) - $(stat -c '%Y' "$cachedir/$cachefile"))) +if [ $cacheage -gt 1740 ] || [ ! -s $cachedir/$cachefile ]; then + data=($(curl -s https://en.wttr.in/"$city"$1\?0qnT 2>&1)) + echo ${data[0]} | cut -f1 -d, > $cachedir/$cachefile + echo ${data[1]} | sed -E 's/^.{15}//' >> $cachedir/$cachefile + echo ${data[2]} | sed -E 's/^.{15}//' >> $cachedir/$cachefile +fi + +weather=($(cat $cachedir/$cachefile)) + +# Restore IFSClear +IFS=$SAVEIFS + +temperature=$(echo ${weather[2]} | sed -E 's/([[:digit:]]+)\.\./\1 to /g') + +#echo ${weather[1]##*,} + +# https://fontawesome.com/icons?s=solid&c=weather +case $(echo ${weather[1]##*,} | tr '[:upper:]' '[:lower:]') in +"clear" | "sunny") + condition="" + ;; +"partly cloudy") + condition="󰖕" + ;; +"cloudy") + condition="" + ;; +"overcast") + condition="" + ;; +"fog" | "freezing fog") + condition="" + ;; +"patchy rain possible" | "patchy light drizzle" | "light drizzle" | "patchy light rain" | "light rain" | "light rain shower" | "mist" | "rain") + condition="󰼳" + ;; +"moderate rain at times" | "moderate rain" | "heavy rain at times" | "heavy rain" | "moderate or heavy rain shower" | "torrential rain shower" | "rain shower") + condition="" + ;; +"patchy snow possible" | "patchy sleet possible" | "patchy freezing drizzle possible" | "freezing drizzle" | "heavy freezing drizzle" | "light freezing rain" | "moderate or heavy freezing rain" | "light sleet" | "ice pellets" | "light sleet showers" | "moderate or heavy sleet showers") + condition="󰼴" + ;; +"blowing snow" | "moderate or heavy sleet" | "patchy light snow" | "light snow" | "light snow showers") + condition="󰙿" + ;; +"blizzard" | "patchy moderate snow" | "moderate snow" | "patchy heavy snow" | "heavy snow" | "moderate or heavy snow with thunder" | "moderate or heavy snow showers") + condition="" + ;; +"thundery outbreaks possible" | "patchy light rain with thunder" | "moderate or heavy rain with thunder" | "patchy light snow with thunder") + condition="" + ;; +*) + condition="" + echo -e "{\"text\":\""$condition"\", \"alt\":\""${weather[0]}"\", \"tooltip\":\""${weather[0]}: $temperature ${weather[1]}"\"}" + ;; +esac + +#echo $temp $condition + +echo -e "{\"text\":\""$temperature $condition"\", \"alt\":\""${weather[0]}"\", \"tooltip\":\""${weather[0]}: $temperature ${weather[1]}"\"}" diff --git a/config/hypr/UserScripts/ZshChangeTheme.sh b/config/hypr/UserScripts/ZshChangeTheme.sh new file mode 100755 index 00000000..7057ed2e --- /dev/null +++ b/config/hypr/UserScripts/ZshChangeTheme.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +themes_dir="$HOME/.oh-my-zsh/themes" +file_extension=".zsh-theme" + +themes_array=($(find "$themes_dir" -type f -name "*$file_extension" -exec basename {} \; | sed -e "s/$file_extension//")) + +rofi_command="rofi -dmenu -config ~/.config/rofi/config-zsh-theme.rasi" + +menu() { + for theme in "${themes_array[@]}"; do + echo "$theme" + done +} + +main() { + choice=$(menu | ${rofi_command}) + + # if nothing selected, script wont change anything + if [ -z "$choice" ]; then + exit 0 + fi + + zsh_path="$HOME/.zshrc" + var_name="ZSH_THEME" + for i in "${themes_array[@]}"; do + if [[ "$i" == "$choice"* ]]; then + if [ -f "$zsh_path" ]; then + sed -i "s/^$var_name=.*/$var_name=\"$i\"/" "$zsh_path" + else + echo "File not found" + fi + break + fi + done +} + +main diff --git a/config/hypr/configs/ENVariables.conf b/config/hypr/configs/ENVariables.conf deleted file mode 100644 index 4437c641..00000000 --- a/config/hypr/configs/ENVariables.conf +++ /dev/null @@ -1,40 +0,0 @@ -## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## - -#environment-variables -env = CLUTTER_BACKEND,wayland -env = GDK_BACKEND,wayland,x11 -env = QT_AUTO_SCREEN_SCALE_FACTOR,1 -env = QT_QPA_PLATFORM,wayland;xcb -env = QT_QPA_PLATFORMTHEME,qt5ct -env = QT_SCALE_FACTOR,1 -env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1 -env = XDG_CURRENT_DESKTOP,Hyprland -env = XDG_SESSION_DESKTOP,Hyprland -env = XDG_SESSION_TYPE,wayland - -# vulkan -#env = WLR_RENDERER,vulkan - -# firefox -env = MOZ_ENABLE_WAYLAND,1 - -# NVIDIA -# This is from Hyprland Wiki. As a start, WLR_NO_HARDWARE_CURSORS 1 will be activated if nvidia gpu detected -#env = WLR_NO_HARDWARE_CURSORS,1 -#env = LIBVA_DRIVER_NAME,nvidia -#env = __GLX_VENDOR_LIBRARY_NAME,nvidia -#env = GBM_BACKEND,nvidia-drm - -#env = __NV_PRIME_RENDER_OFFLOAD,1 -#env = __VK_LAYER_NV_optimus,NVIDIA_only -#env = WLR_DRM_NO_ATOMIC,1 -#env = NVD_BACKEND,direct - -# FOR VM and POSSIBLY NVIDIA -#env = WLR_RENDERER_ALLOW_SOFTWARE,1 - -# nvidia firefox (for hardware acceleration on FF)? -# check this post https://github.com/elFarto/nvidia-vaapi-driver#configuration -#env = MOZ_DISABLE_RDD_SANDBOX,1 -#env = NVD_BACKEND,direct -#env = EGL_PLATFORM,wayland \ No newline at end of file diff --git a/config/hypr/configs/Execs.conf b/config/hypr/configs/Execs.conf deleted file mode 100644 index ef5b8ad5..00000000 --- a/config/hypr/configs/Execs.conf +++ /dev/null @@ -1,55 +0,0 @@ -## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## -#Commands & Apps to be executed at launch - -$scriptsDir = $HOME/.config/hypr/scripts -$lock = $scriptsDir/LockScreen.sh -$SwwwRandom = $scriptsDir/WallpaperRandom.sh -$WallpaperPath = $HOME/Pictures/wallpapers - -# Initial boot script to start Pywal and Set wallpaper. This line and corresponding script can be safely deleted once logged in -exec-once = $HOME/.config/hypr/initial-boot.sh - -# wallpaper stuff / More wallpaper options below -exec-once = swww query || swww init -exec-once = $SwwwRandom $WallpaperPath # random wallpaper switcher every 30 minutes - -# Startup -exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP -exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP - -# Polkit (Polkit Gnome / KDE) -exec-once = $scriptsDir/Polkit.sh - -# starup apps -exec-once = waybar & -exec-once = nm-applet --indicator & -exec-once = swaync & -#exec-once = blueman-applet & -#exec-once = rog-control-center & - - -#clipboard manager -exec-once = wl-paste --type text --watch cliphist store -exec-once = wl-paste --type image --watch cliphist store - -# Rainbow borders -exec-once = $scriptsDir/RainbowBorders.sh - -# sway-idle with lock only -exec-once = swayidle -w timeout 900 '$lock' -# sway-idle with lock and sleep -#exec-once = swayidle -w timeout 900 '$lock' timeout 1200 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep '$lock' -# sway idle without lock -#exec-once = swayidle -w timeout 900 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' - -## Here are list of features available but disabled by default -#exec-once = swww query || swww init && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png # persistent wallpaper - -#gnome polkit for nixos -#exec-once = $scriptsDir/Polkit-NixOS.sh - -# xdg-desktop-portal-hyprland (should be auto starting. However, you can force to start) -#exec-once = $scriptsDir/PortalHyprland.sh - -# wlsunset - for automatic gamma adjustment. Default is 1900 to 0700 (7pm to 7am). Edit Sunset.sh accordingly -# exec-once = $scriptsDir/Sunset.sh \ No newline at end of file diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf index c36c0804..84b78cff 100644 --- a/config/hypr/configs/Keybinds.conf +++ b/config/hypr/configs/Keybinds.conf @@ -1,25 +1,15 @@ ## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## +# Default Keybinds -# See https://wiki.hyprland.org/Configuring/Keywords/ for more settings and variables -# See also Laptops.conf for laptops keybinds $mainMod = SUPER -$files = thunar -$browser = firefox -$term = kitty $scriptsDir = $HOME/.config/hypr/scripts -# rofi App launcher -bindr = $mainMod, $mainMod_L, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run,window -bind = $mainMod, D, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run,window - -bind = $mainMod, Return, exec, $term # Launch terminal bind = CTRL ALT, Delete, exec, hyprctl dispatch exit 0 bind = $mainMod SHIFT, Q, closewindow, bind = $mainMod SHIFT, F, togglefloating, bind = $mainMod ALT, F, exec, hyprctl dispatch workspaceopt allfloat bind = $mainMod, F, fullscreen bind = $mainMod, Q, killactive, -bind = $mainMod, T, exec, $files bind = CTRL ALT, L, exec, $scriptsDir/LockScreen.sh bind = CTRL ALT, P, exec, $scriptsDir/Wlogout.sh @@ -36,10 +26,6 @@ bind = $mainMod, Space, exec, $scriptsDir/ChangeLayout.sh # Toggle Master or Dwi bind = $mainMod ALT, V, exec, $scriptsDir/ClipManager.sh # Clipboard Manager bind = $mainMod SHIFT, N, exec, swaync-client -t -sw # swayNC panel - -# MISC (Miscellaneous Keybinds) -bind = $mainMod SHIFT, O, exec, $scriptsDir/ZshChangeTheme.sh # Change oh-my-zsh theme - # Wallpaper related keybinds bind = $mainMod, W, exec, $scriptsDir/WallpaperSelect.sh # Select wallpaper to apply bind = CTRL ALT, W, exec, $scriptsDir/Wallpaper.sh # Random wallpapers @@ -61,7 +47,7 @@ bind = $mainMod SHIFT, M, exec, hyprctl dispatch splitratio -0.3 # group bind = $mainMod, G, togglegroup -bind = ALT, tab, changegroupactive # change focus to another window +bind = ALT, tab, changegroupactive #change focus to another window # Special Keys / Hot Keys bind = , xf86audioraisevolume, exec, $scriptsDir/Volume.sh --inc #volume up @@ -164,11 +150,3 @@ bind = $mainMod, comma, workspace, e-1 # Move/resize windows with mainMod + LMB/RMB and dragging bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:273, resizewindow - - -# For passthrough keyboard into a VM -# bind = $mainMod ALT, P, submap, passthru -#submap = passthru -# to unbind -#bind = $mainMod ALT, P, submap, reset -#submap = reset diff --git a/config/hypr/configs/LaptopDisplay.conf b/config/hypr/configs/LaptopDisplay.conf deleted file mode 100644 index d50c9119..00000000 --- a/config/hypr/configs/LaptopDisplay.conf +++ /dev/null @@ -1,4 +0,0 @@ -## NOTE, THIS FILE IS BEING USED by disabling Laptop display monitor behaviour when closing lid. -## See notes on Laptops.conf - -#monitor = eDP-1, preferred, auto, 1 diff --git a/config/hypr/configs/Laptops.conf b/config/hypr/configs/Laptops.conf deleted file mode 100644 index 17047320..00000000 --- a/config/hypr/configs/Laptops.conf +++ /dev/null @@ -1,45 +0,0 @@ -## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## - -# See https://wiki.hyprland.org/Configuring/Keywords/ for more variable settings -# These configs are mostly for laptops. This is addemdum to Keybinds.conf -$configs = $HOME/.config/hypr/configs -$mainMod = SUPER -$scriptsDir = $HOME/.config/hypr/scripts - -bind = , xf86KbdBrightnessDown, exec, $scriptsDir/BrightnessKbd.sh --dec #Keyboard brightness Down -bind = , xf86KbdBrightnessUp, exec, $scriptsDir/BrightnessKbd.sh --inc #Keyboard brightness up -bind = , xf86Launch1, exec, rog-control-center # ASUS Armory crate button -bind = , xf86Launch3, exec, asusctl led-mode -n #FN+F4 Switch keyboard RGB profile -bind = , xf86Launch4, exec, asusctl profile -n #FN+F5 change of fan profiles (Quite, Balance, Performance) -bind = , xf86MonBrightnessDown, exec, $scriptsDir/Brightness.sh --dec -bind = , xf86MonBrightnessUp, exec, $scriptsDir/Brightness.sh --inc -bind = , xf86TouchpadToggle, exec, $scriptsDir/TouchPad.sh #disable touchpad - -# Screenshot keybindings for Asus G15 (no PrinSrc button) -bind = $mainMod, F6, exec, $scriptsDir/ScreenShot.sh --now # Fullscreen -bind = $mainMod SHIFT, F6, exec, $scriptsDir/ScreenShot.sh --area -bind = $mainMod CTRL, F6, exec, $scriptsDir/ScreenShot.sh --in5 # Screenshot in 5 secs -bind = $mainMod ALT, F6, exec, $scriptsDir/ScreenShot.sh --in10 # Screenshot in 10 secs - -# Below are useful when you are connecting your laptop in external display -# Suggest you edit below for your laptop display -# From WIKI This is to disable laptop monitor when lid is closed. -# consult https://wiki.hyprland.org/hyprland-wiki/pages/Configuring/Binds/#switches -#bindl = , switch:off:Lid Switch,exec,hyprctl keyword monitor "eDP-1, preferred, auto, 1" -#bindl = , switch:on:Lid Switch,exec,hyprctl keyword monitor "eDP-1, disable" - -############################################################################# -### WARNING! Using this method has some caveats!! USE THIS PART WITH SOME CAUTION! -# CONS of doing this, is that you need to set up your wallpaper (SUPER W) and choose wallpaper. -# CAVEATS! Sometimes the Main Laptop Monitor DOES NOT have display that it needs to re-connect your external monitor -# One work around is to ensure that before shutting down laptop, MAKE SURE your laptop lid is OPEN!! -# Make sure to comment (put # on the both the bindl = , switch ......) above -# NOTE: Display for laptop are being generated into LaptopDisplay.conf -# This part is to be use if you do not want your main laptop monitor to wake up during say wallpaper change etc - -#bindl = , switch:off:Lid Switch,exec,echo "monitor = eDP-1, preferred, auto, 1" > $configs/LaptopDisplay.conf -#bindl = , switch:on:Lid Switch,exec,echo "monitor = eDP-1, disable" > $configs/LaptopDisplay.conf - -# for laptop-lid action (to erase the last entry) -#exec-once = echo "eDP-1, preferred, auto, 1" > $HOME/.config/hypr/configs/LaptopDisplay.conf -############################################################################## diff --git a/config/hypr/configs/Monitors.conf b/config/hypr/configs/Monitors.conf deleted file mode 100644 index ac87862a..00000000 --- a/config/hypr/configs/Monitors.conf +++ /dev/null @@ -1,52 +0,0 @@ -## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## - -# Monitor Configuration -# See Hyprland wiki for more details -# https://wiki.hyprland.org/Configuring/Monitors/ -# Configure your Display resolution, offset, scale and Monitors here, use `hyprctl monitors` to get the info. - -#Could help when scaling and not pixelating -xwayland { - force_zero_scaling = true -} - -# Monitors -monitor=,preferred,auto,1 - -# NOTE: for laptop, kindly check notes in Laptops.conf regarding display -# Created this inorder for the monitor display to not wake up if not intended. -# See here: https://github.com/hyprwm/Hyprland/issues/4090 - -#monitor = eDP-1, preferred, auto, 1 -#monitor = eDP-1, 2560x1440@165, 0x0, 1 #own screen -#monitor = DP-2, preferred, auto, 1 -#monitor = DP-1, preferred, auto, 1 -#monitor = HDMI-A-1, preferred,auto,1 - -# QEMU-KVM or any virtual box -#monitor = Virtual-1, 1920x1080@60,auto,1 - -# Hi Refresh Rate -#monitor=,highrr,auto,1 - -# High Resolution -#monitor=,highres,auto,1 - -# to disable a monitor -#monitor=name,disable - -# Mirror -#monitor=DP-3,1920x1080@60,0x0,1,mirror,DP-2 -#monitor=,preferred,auto,1,mirror,eDP-1 - - -# Example : -#monitor=eDP-1,2560x1440@165,0x0,1 -#workspace=HDMI-A-1,1 -#monitor=HDMI-A-1,2560x1440@144,0x0,1,mirror,eDP-1 -#workspace=HDMI-A-2,2 - -#monitor=eDP-1,transform,0 -#monitor=eDP-1,addreserved,10,10,10,49 -#workspace=eDP-1,1 - diff --git a/config/hypr/configs/Settings.conf b/config/hypr/configs/Settings.conf index 7db59116..e9901013 100644 --- a/config/hypr/configs/Settings.conf +++ b/config/hypr/configs/Settings.conf @@ -1,143 +1,7 @@ ## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## +# Default Settings. avoid changing this file as during update, this will be replaced ## 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 -# blurls = rofi -dwindle { - pseudotile = yes - preserve_split = yes - special_scale_factor = 0.8 -} -master { - new_is_master=1 - new_on_top=1 - mfact = 0.5 -} - -general { - sensitivity=1.00 - apply_sens_to_raw=1 - gaps_in = 4 - gaps_out = 8 - border_size = 2 - resize_on_border = true - - col.active_border = $color0 $color2 $color4 $color6 $color8 90deg - col.inactive_border = $backgroundCol - - layout = master -} - -group { - col.border_active = $color15 - - groupbar { - col.active = $color0 - } -} - -decoration { - rounding = 8 - - active_opacity = 1.0 - inactive_opacity = 0.9 - fullscreen_opacity = 1.0 - - dim_inactive = true - dim_strength = 0.1 - - drop_shadow=true - shadow_range=6 - shadow_render_power = 1 - col.shadow = $color2 - col.shadow_inactive = 0x50000000 - - blur { - enabled = true - size = 5 - passes = 2 - ignore_opacity = true - new_optimizations = true - } -} - -animations { - enabled = yes - - bezier = myBezier, 0.05, 0.9, 0.1, 1.05 - bezier = linear, 0.0, 0.0, 1.0, 1.0 - bezier = wind, 0.05, 0.9, 0.1, 1.05 - bezier = winIn, 0.1, 1.1, 0.1, 1.1 - bezier = winOut, 0.3, -0.3, 0, 1 - bezier = slow, 0, 0.85, 0.3, 1 - bezier = overshot, 0.7, 0.6, 0.1, 1.1 - bezier = bounce, 1.1, 1.6, 0.1, 0.85 - bezier = sligshot, 1, -1, 0.15, 1.25 - bezier = nice, 0, 6.9, 0.5, -4.20 - - animation = windowsIn, 1, 5, slow, popin - animation = windowsOut, 1, 5, winOut, popin - animation = windowsMove, 1, 5, wind, slide - animation = border, 1, 10, linear - animation = borderangle, 1, 180, linear, loop - animation = fade, 1, 5, overshot - animation = workspaces, 1, 5, wind - animation = windows, 1, 5, bounce, popin -} - -input { - kb_layout=us - kb_variant= - kb_model= - kb_options=grp:alt_shift_toggle - kb_rules= - repeat_rate=50 - repeat_delay=300 - numlock_by_default=1 - left_handed=0 - follow_mouse=1 - float_switch_override_focus=0 - - touchpad { - disable_while_typing=1 - natural_scroll=0 - clickfinger_behavior=0 - middle_button_emulation=1 - tap-to-click=1 - drag_lock=0 - } -} - -gestures { - workspace_swipe=1 - workspace_swipe_fingers=3 - workspace_swipe_distance=400 - workspace_swipe_invert=1 - workspace_swipe_min_speed_to_force=30 - workspace_swipe_cancel_ratio=0.5 - workspace_swipe_create_new=1 - workspace_swipe_forever=1 -} - -misc { - disable_hyprland_logo = true - disable_splash_rendering = true - mouse_move_enables_dpms = true - #vrr = 0 - enable_swallow = true - no_direct_scanout = true #for fullscreen games - focus_on_activate = false - swallow_regex = ^(kitty)$ - #disable_autoreload = true -} - -binds { - workspace_back_and_forth=1 - allow_workspace_cycles=1 - pass_mouse_when_bound=0 -} diff --git a/config/hypr/configs/WindowRules.conf b/config/hypr/configs/WindowRules.conf deleted file mode 100644 index a3a77cfb..00000000 --- a/config/hypr/configs/WindowRules.conf +++ /dev/null @@ -1,72 +0,0 @@ -## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## -# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more - -windowrule = float, org.kde.polkit-kde-authentication-agent-1 -windowrule = float, nm-connection-editor|blueman-manager -windowrule = float, pavucontrol -windowrule = float, nwg-look|qt5ct|mpv -windowrule = float, onedriver|onedriver-launcher -windowrule = float, eog -windowrule = float, zoom -windowrule = float, rofi -windowrule = float, gnome-system-monitor -windowrule = float, yad - -#windowrule = noblur,gamescope -#windowrule = fullscreen,gamescope -#windowrule = workspace 6 silent,^(gamescope)$ - -windowrule = center,^(pavucontrol) - -# windowrule v2 -windowrulev2 = workspace 1, class:^(thunderbird)$ -windowrulev2 = workspace 2, class:^(firefox)$ -windowrulev2 = workspace 2, class:^(Firefox-esr)$ -windowrulev2 = workspace 2, class:^(Microsoft-edge-beta)$ -windowrulev2 = workspace 3, class:^([Tt]hunar)$ -windowrulev2 = workspace 4, class:^(com.obsproject.Studio)$ -windowrulev2 = workspace 5 silent, class:^([Ss]team)$,title:^([Ss]team)$ -windowrulev2 = workspace 5 silent, class:^(lutris)$ -windowrulev2 = workspace 6, class:^(virt-manager)$ -windowrulev2 = workspace 7 silent, class:^(discord)$ -windowrulev2 = workspace 7 silent, class:^(WebCord)$ -windowrulev2 = workspace 9 silent, class:^([Aa]udacious)$ - -#opacity (transparent) #enable as desired -windowrulev2 = opacity 0.9 0.6, class:^([Rr]ofi)$ -windowrulev2 = opacity 0.9 0.7, class:^(Brave-browser)$ -windowrulev2 = opacity 0.9 0.7, class:^(Brave-browser-dev)$ -windowrulev2 = opacity 0.9 0.7, class:^(firefox)$ -windowrulev2 = opacity 0.9 0.7, class:^(Firefox-esr)$ -windowrulev2 = opacity 0.9 0.8, class:^([Tt]hunar)$ -windowrulev2 = opacity 0.8 0.6, class:^(pcmanfm-qt)$ -windowrulev2 = opacity 0.9 0.7, class:^(gedit)$ -windowrulev2 = opacity 0.9 0.8, class:^(kitty)$ -windowrulev2 = opacity 0.9 0.7, class:^(mousepad)$ -windowrulev2 = opacity 0.9 0.7, class:^(codium-url-handler)$ -windowrulev2 = opacity 0.9 0.7, class:^(VSCodium)$ -windowrulev2 = opacity 0.9 0.7, class:^(yad)$ -windowrulev2 = opacity 0.9 0.7, class:^(com.obsproject.Studio)$ -windowrulev2 = opacity 0.9 0.7, class:^([Aa]udacious)$ - - -#layerrule = unset,class:^([Rr]ofi)$ -#layerrule = blur,class:^([Rr]ofi)$ -#layerrule = ignorezero, - -#windowrulev2 = bordercolor rgb(EE4B55) rgb(880808), fullscreen:1 -#windowrulev2 = bordercolor rgb(282737) rgb(1E1D2D), floating:1 -#windowrulev2 = opacity 0.8 0.8, pinned:1 - -# Picture-in-a-Picture (PIP) rules: Oddly, some need re-duplication. This is because the window for -# PIP changes after on first launch, and will not inherant the rules... -windowrulev2=opacity 0.95 0.75,title:^(Picture-in-Picture)$ # for opacity: [focus num] [bg num] -# Interestingly, the opacity rule above doesn't need the reduplication? -windowrulev2=pin,title:^(Picture-in-Picture)$ -#windowrulev2=pin,title:^(Firefox)$ -windowrulev2=float, title:^(Picture-in-Picture)$ -#windowrulev2=float, title:^(Firefox)$ -windowrulev2=size 25% 25%,title:^(Picture-in-Picture)$ -#windowrulev2=size 25% 25%,title:^(Firefox)$ -windowrulev2=move 72% 7%,title:^(Picture-in-Picture)$ -#windowrulev2=move 72% 7%,title:^(Firefox)$ \ No newline at end of file diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf index c09e6f75..4fd65aa4 100644 --- a/config/hypr/hyprland.conf +++ b/config/hypr/hyprland.conf @@ -1,17 +1,23 @@ # Sourcing external config files + +###### Default Configs $configs = $HOME/.config/hypr/configs -source=$configs/ENVariables.conf -source=$configs/Execs.conf source=$configs/Keybinds.conf -source=$configs/Laptops.conf -source=$configs/LaptopDisplay.conf -source=$configs/Monitors.conf -source=$configs/WindowRules.conf source=$configs/Settings.conf +#### User Configs +$UserConfigs = $HOME/.config/hypr/UserConfigs +source= $UserConfigs/Startup_Apps.conf +source= $UserConfigs/ENVariables.conf +source= $UserConfigs/UserKeybinds.conf +source= $UserConfigs/UserSettings.conf +source= $UserConfigs/Monitors.conf +source= $UserConfigs/Laptops.conf +source= $UserConfigs/LaptopDisplay.conf +source= $UserConfigs/WindowRules.conf diff --git a/config/hypr/scripts/QuickEdit.sh b/config/hypr/scripts/QuickEdit.sh index 7e9d67fc..9c7cdffc 100755 --- a/config/hypr/scripts/QuickEdit.sh +++ b/config/hypr/scripts/QuickEdit.sh @@ -1,40 +1,49 @@ #!/bin/bash -hyprDir="$HOME/.config/hypr/configs" +defaultDir="$HOME/.config/hypr/configs" +userDir="$HOME/.config/hypr/UserConfigs" menu(){ printf "1. view Env-variables\n" - printf "2. view Rules\n" - printf "3. view Execs (startup)\n" - printf "4. view KeyBinds\n" + printf "2. view Window-Rules\n" + printf "3. view Startup_Apps\n" + printf "4. view User-Keybinds\n" printf "5. view Monitors\n" printf "6. view Laptop-Keybinds\n" - printf "7. view Hyprland-Settings\n" + printf "7. view User-Settings\n" + printf "8. view Default-Settings\n" + printf "9. view Default-Keybinds\n" } main() { choice=$(menu | rofi -dmenu -config ~/.config/rofi/config-compact.rasi | cut -d. -f1) case $choice in 1) - kitty -e nano "$hyprDir/ENVariables.conf" + kitty -e nano "$userDir/ENVariables.conf" ;; 2) - kitty -e nano "$hyprDir/WindowRules.conf" + kitty -e nano "$userDir/WindowRules.conf" ;; 3) - kitty -e nano "$hyprDir/Execs.conf" + kitty -e nano "$userDir/Startup_Apps.conf" ;; 4) - kitty -e nano "$hyprDir/Keybinds.conf" + kitty -e nano "$userDir/UserKeybinds.conf" ;; 5) - kitty -e nano "$hyprDir/Monitors.conf" + kitty -e nano "$userDir/Monitors.conf" ;; 6) - kitty -e nano "$hyprDir/Laptops.conf" + kitty -e nano "$userDir/Laptops.conf" ;; 7) - kitty -e nano "$hyprDir/Settings.conf" + kitty -e nano "$userDir/UserSettings.conf" + ;; + 8) + kitty -e nano "$defaultDir/Settings.conf" + ;; + 9) + kitty -e nano "$defaultDir/Keybinds.conf" ;; *) ;; diff --git a/config/hypr/scripts/RainbowBorders.sh b/config/hypr/scripts/RainbowBorders.sh deleted file mode 100755 index 1f5e6cdb..00000000 --- a/config/hypr/scripts/RainbowBorders.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -function random_hex() { - random_hex=("0xff$(openssl rand -hex 3)") - echo $random_hex -} - -hyprctl keyword general:col.active_border $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) 270deg - -hyprctl keyword general:col.inactive_border $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) 270deg \ No newline at end of file diff --git a/config/hypr/scripts/Refresh.sh b/config/hypr/scripts/Refresh.sh index 52f7e642..b5e0f556 100755 --- a/config/hypr/scripts/Refresh.sh +++ b/config/hypr/scripts/Refresh.sh @@ -1,6 +1,16 @@ #!/usr/bin/env bash SCRIPTSDIR=$HOME/.config/hypr/scripts +UserSCRIPTSDIR=$HOME/.config/hypr/UserScripts + +# Define file_exists function +file_exists() { + if [ -e "$1" ]; then + return 0 # File exists + else + return 1 # File does not exist + fi +} # Kill already running processes _ps=(waybar rofi swaync) @@ -18,9 +28,13 @@ waybar & sleep 0.5 swaync > /dev/null 2>&1 & -# Relaunching rainbow borders +# Relaunching rainbow borders if the script exists sleep 1 -${SCRIPTSDIR}/RainbowBorders.sh & +if file_exists "${UserSCRIPTSDIR}/RainbowBorders.sh"; then + ${UserSCRIPTSDIR}/RainbowBorders.sh & +fi # for cava-pywal (note, need to manually restart cava once wallpaper changes) -ln -sf "$HOME/.cache/wal/cava-colors" "$HOME/.config/cava/config" || true \ No newline at end of file +ln -sf "$HOME/.cache/wal/cava-colors" "$HOME/.config/cava/config" || true + +exit 0 \ No newline at end of file diff --git a/config/hypr/scripts/RefreshNoWaybar.sh b/config/hypr/scripts/RefreshNoWaybar.sh index dc99b623..be06167c 100755 --- a/config/hypr/scripts/RefreshNoWaybar.sh +++ b/config/hypr/scripts/RefreshNoWaybar.sh @@ -5,6 +5,16 @@ # Modified inorder to refresh rofi background, Pywal SCRIPTSDIR=$HOME/.config/hypr/scripts +UserSCRIPTSDIR=$HOME/.config/hypr/UserScripts + +# Define file_exists function +file_exists() { + if [ -e "$1" ]; then + return 0 # File exists + else + return 1 # File does not exist + fi +} # Kill already running processes _ps=(rofi) @@ -17,10 +27,13 @@ done # Pywal refresh ${SCRIPTSDIR}/PywalSwww.sh & - -# Relaunching rainbow borders +# Relaunching rainbow borders if the script exists sleep 1 -${SCRIPTSDIR}/RainbowBorders.sh & +if file_exists "${UserSCRIPTSDIR}/RainbowBorders.sh"; then + ${UserSCRIPTSDIR}/RainbowBorders.sh & +fi # for cava-pywal (note, need to manually restart cava once wallpaper changes) -ln -sf "$HOME/.cache/wal/cava-colors" "$HOME/.config/cava/config" || true \ No newline at end of file +ln -sf "$HOME/.cache/wal/cava-colors" "$HOME/.config/cava/config" || true + +exit 0 \ No newline at end of file diff --git a/config/hypr/scripts/Weather.py b/config/hypr/scripts/Weather.py deleted file mode 100755 index 154c1589..00000000 --- a/config/hypr/scripts/Weather.py +++ /dev/null @@ -1,122 +0,0 @@ -#!/usr/bin/env python3 -# From https://raw.githubusercontent.com/rxyhn/dotfiles/main/home/rxyhn/modules/desktop/waybar/scripts/waybar-wttr.py - -## ensure to insert city inside "" -city = "" -import json -import requests -from datetime import datetime - -WEATHER_CODES = { - '113': '', - '116': '󰖕', - '119': '', - '122': '', - '143': '', - '176': '', - '179': '', - '182': '', - '185': '', - '200': '⛈️', - '227': '🌨️', - '230': '🌨️', - '248': '☁️ ', - '260': '☁️', - '263': '🌧️', - '266': '🌧️', - '281': '🌧️', - '284': '🌧️', - '293': '🌧️', - '296': '🌧️', - '299': '🌧️', - '302': '🌧️', - '305': '🌧️', - '308': '🌧️', - '311': '🌧️', - '314': '🌧️', - '317': '🌧️', - '320': '🌨️', - '323': '🌨️', - '326': '🌨️', - '329': '❄️', - '332': '❄️', - '335': '❄️', - '338': '❄️', - '350': '🌧️', - '353': '🌧️', - '356': '🌧️', - '359': '🌧️', - '362': '🌧️', - '365': '🌧️', - '368': '🌧️', - '371': '❄️', - '374': '🌨️', - '377': '🌨️', - '386': '🌨️', - '389': '🌨️', - '392': '🌧️', - '395': '❄️' -} - -data = {} - - -weather = requests.get(f"https://wttr.in/{city}?format=j1").json() - - -def format_time(time): - return time.replace("00", "").zfill(2) - - -def format_temp(temp): - return (hour['FeelsLikeC']+"°").ljust(3) - - -def format_chances(hour): - chances = { - "chanceoffog": "Fog", - "chanceoffrost": "Frost", - "chanceofovercast": "Overcast", - "chanceofrain": "Rain", - "chanceofsnow": "Snow", - "chanceofsunshine": "Sunshine", - "chanceofthunder": "Thunder", - "chanceofwindy": "Wind" - } - - conditions = [] - for event in chances.keys(): - if int(hour[event]) > 0: - conditions.append(chances[event]+" "+hour[event]+"%") - return ", ".join(conditions) - -tempint = int(weather['current_condition'][0]['FeelsLikeC']) -extrachar = '' -if tempint > 0 and tempint < 10: - extrachar = '+' - - -data['text'] = ' '+WEATHER_CODES[weather['current_condition'][0]['weatherCode']] + \ - " "+extrachar+weather['current_condition'][0]['FeelsLikeC']+"°" - -data['tooltip'] = f"{weather['current_condition'][0]['weatherDesc'][0]['value']} {weather['current_condition'][0]['temp_C']}°\n" -data['tooltip'] += f"Feels like: {weather['current_condition'][0]['FeelsLikeC']}°\n" -data['tooltip'] += f"Wind: {weather['current_condition'][0]['windspeedKmph']}Km/h\n" -data['tooltip'] += f"Humidity: {weather['current_condition'][0]['humidity']}%\n" -for i, day in enumerate(weather['weather']): - data['tooltip'] += f"\n" - if i == 0: - data['tooltip'] += "Today, " - if i == 1: - data['tooltip'] += "Tomorrow, " - data['tooltip'] += f"{day['date']}\n" - data['tooltip'] += f"⬆️{day['maxtempC']}° ⬇️{day['mintempC']}° " - data['tooltip'] += f"🌅{day['astronomy'][0]['sunrise']} 🌇{day['astronomy'][0]['sunset']}\n" - for hour in day['hourly']: - if i == 0: - if int(format_time(hour['time'])) < datetime.now().hour-2: - continue - data['tooltip'] += f"{format_time(hour['time'])} {WEATHER_CODES[hour['weatherCode']]} {format_temp(hour['FeelsLikeC'])} {hour['weatherDesc'][0]['value']}, {format_chances(hour)}\n" - - -print(json.dumps(data)) diff --git a/config/hypr/scripts/Weather.sh b/config/hypr/scripts/Weather.sh deleted file mode 100755 index 40048710..00000000 --- a/config/hypr/scripts/Weather.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash - -city= -cachedir=~/.cache/rbn -cachefile=${0##*/}-$1 - -if [ ! -d $cachedir ]; then - mkdir -p $cachedir -fi - -if [ ! -f $cachedir/$cachefile ]; then - touch $cachedir/$cachefile -fi - -# Save current IFS -SAVEIFS=$IFS -# Change IFS to new line. -IFS=$'\n' - -cacheage=$(($(date +%s) - $(stat -c '%Y' "$cachedir/$cachefile"))) -if [ $cacheage -gt 1740 ] || [ ! -s $cachedir/$cachefile ]; then - data=($(curl -s https://en.wttr.in/"$city"$1\?0qnT 2>&1)) - echo ${data[0]} | cut -f1 -d, > $cachedir/$cachefile - echo ${data[1]} | sed -E 's/^.{15}//' >> $cachedir/$cachefile - echo ${data[2]} | sed -E 's/^.{15}//' >> $cachedir/$cachefile -fi - -weather=($(cat $cachedir/$cachefile)) - -# Restore IFSClear -IFS=$SAVEIFS - -temperature=$(echo ${weather[2]} | sed -E 's/([[:digit:]]+)\.\./\1 to /g') - -#echo ${weather[1]##*,} - -# https://fontawesome.com/icons?s=solid&c=weather -case $(echo ${weather[1]##*,} | tr '[:upper:]' '[:lower:]') in -"clear" | "sunny") - condition="" - ;; -"partly cloudy") - condition="󰖕" - ;; -"cloudy") - condition="" - ;; -"overcast") - condition="" - ;; -"fog" | "freezing fog") - condition="" - ;; -"patchy rain possible" | "patchy light drizzle" | "light drizzle" | "patchy light rain" | "light rain" | "light rain shower" | "mist" | "rain") - condition="󰼳" - ;; -"moderate rain at times" | "moderate rain" | "heavy rain at times" | "heavy rain" | "moderate or heavy rain shower" | "torrential rain shower" | "rain shower") - condition="" - ;; -"patchy snow possible" | "patchy sleet possible" | "patchy freezing drizzle possible" | "freezing drizzle" | "heavy freezing drizzle" | "light freezing rain" | "moderate or heavy freezing rain" | "light sleet" | "ice pellets" | "light sleet showers" | "moderate or heavy sleet showers") - condition="󰼴" - ;; -"blowing snow" | "moderate or heavy sleet" | "patchy light snow" | "light snow" | "light snow showers") - condition="󰙿" - ;; -"blizzard" | "patchy moderate snow" | "moderate snow" | "patchy heavy snow" | "heavy snow" | "moderate or heavy snow with thunder" | "moderate or heavy snow showers") - condition="" - ;; -"thundery outbreaks possible" | "patchy light rain with thunder" | "moderate or heavy rain with thunder" | "patchy light snow with thunder") - condition="" - ;; -*) - condition="" - echo -e "{\"text\":\""$condition"\", \"alt\":\""${weather[0]}"\", \"tooltip\":\""${weather[0]}: $temperature ${weather[1]}"\"}" - ;; -esac - -#echo $temp $condition - -echo -e "{\"text\":\""$temperature $condition"\", \"alt\":\""${weather[0]}"\", \"tooltip\":\""${weather[0]}: $temperature ${weather[1]}"\"}" diff --git a/config/hypr/scripts/ZshChangeTheme.sh b/config/hypr/scripts/ZshChangeTheme.sh deleted file mode 100755 index 7057ed2e..00000000 --- a/config/hypr/scripts/ZshChangeTheme.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -themes_dir="$HOME/.oh-my-zsh/themes" -file_extension=".zsh-theme" - -themes_array=($(find "$themes_dir" -type f -name "*$file_extension" -exec basename {} \; | sed -e "s/$file_extension//")) - -rofi_command="rofi -dmenu -config ~/.config/rofi/config-zsh-theme.rasi" - -menu() { - for theme in "${themes_array[@]}"; do - echo "$theme" - done -} - -main() { - choice=$(menu | ${rofi_command}) - - # if nothing selected, script wont change anything - if [ -z "$choice" ]; then - exit 0 - fi - - zsh_path="$HOME/.zshrc" - var_name="ZSH_THEME" - for i in "${themes_array[@]}"; do - if [[ "$i" == "$choice"* ]]; then - if [ -f "$zsh_path" ]; then - sed -i "s/^$var_name=.*/$var_name=\"$i\"/" "$zsh_path" - else - echo "File not found" - fi - break - fi - done -} - -main diff --git a/config/rofi/config-compact.rasi b/config/rofi/config-compact.rasi index 308ff85b..b5b45592 100644 --- a/config/rofi/config-compact.rasi +++ b/config/rofi/config-compact.rasi @@ -115,7 +115,7 @@ listview { spacing: 4px; dynamic: true; cycle: true; - scrollbar: false; + scrollbar: true; layout: vertical; reverse: false; fixed-height: true; diff --git a/config/rofi/resolution/1080p/config-compact.rasi b/config/rofi/resolution/1080p/config-compact.rasi index 308ff85b..b5b45592 100644 --- a/config/rofi/resolution/1080p/config-compact.rasi +++ b/config/rofi/resolution/1080p/config-compact.rasi @@ -115,7 +115,7 @@ listview { spacing: 4px; dynamic: true; cycle: true; - scrollbar: false; + scrollbar: true; layout: vertical; reverse: false; fixed-height: true; diff --git a/config/rofi/resolution/1440p/config-compact.rasi b/config/rofi/resolution/1440p/config-compact.rasi index 0dd5fe5d..029fdbdf 100644 --- a/config/rofi/resolution/1440p/config-compact.rasi +++ b/config/rofi/resolution/1440p/config-compact.rasi @@ -115,7 +115,7 @@ listview { spacing: 4px; dynamic: true; cycle: true; - scrollbar: false; + scrollbar: true; layout: vertical; reverse: false; fixed-height: true; diff --git a/copy.sh b/copy.sh index 612b60e4..8b5f454d 100755 --- a/copy.sh +++ b/copy.sh @@ -4,6 +4,7 @@ clear wallpaper=$HOME/Pictures/wallpapers/Cute-Cat_ja.jpg +Waybar_Style="$HOME/.config/waybar/style/[Pywal] Chroma Fusion.css" # Check if running as root. If root, script will exit if [[ $EUID -eq 0 ]]; then @@ -36,17 +37,17 @@ xdg-user-dirs-update 2>&1 | tee -a "$LOG" || true # uncommenting WLR_NO_HARDWARE_CURSORS if nvidia is detected if lspci -k | grep -A 2 -E "(VGA|3D)" | grep -iq nvidia; then # NVIDIA GPU detected, uncomment line 23 in ENVariables.conf - sed -i '/env = WLR_NO_HARDWARE_CURSORS,1/s/^#//' config/hypr/configs/ENVariables.conf - sed -i '/env = LIBVA_DRIVER_NAME,nvidia/s/^#//' config/hypr/configs/ENVariables.conf - sed -i '/env = __GLX_VENDOR_LIBRARY_NAME,nvidia/s/^#//' config/hypr/configs/ENVariables.conf + sed -i '/env = WLR_NO_HARDWARE_CURSORS,1/s/^#//' config/hypr/UserConfigs/ENVariables.conf + sed -i '/env = LIBVA_DRIVER_NAME,nvidia/s/^#//' config/hypr/UserConfigs/ENVariables.conf + sed -i '/env = __GLX_VENDOR_LIBRARY_NAME,nvidia/s/^#//' config/hypr/UserConfigs/ENVariables.conf fi # uncommenting WLR_RENDERER_ALLOW_SOFTWARE,1 if running in a VM is detected if hostnamectl | grep -q 'Chassis: vm'; then echo "This script is running in a virtual machine." - sed -i '/env = WLR_NO_HARDWARE_CURSORS,1/s/^#//' config/hypr/configs/ENVariables.conf - sed -i '/env = WLR_RENDERER_ALLOW_SOFTWARE,1/s/^#//' config/hypr/configs/ENVariables.conf - sed -i '/monitor = Virtual-1, 1920x1080@60,auto,1/s/^#//' config/hypr/configs/Monitors.conf + sed -i '/env = WLR_NO_HARDWARE_CURSORS,1/s/^#//' config/hypr/UserConfigs/ENVariables.conf + sed -i '/env = WLR_RENDERER_ALLOW_SOFTWARE,1/s/^#//' config/hypr/UserConfigs/ENVariables.conf + sed -i '/monitor = Virtual-1, 1920x1080@60,auto,1/s/^#//' config/hypr/UserConfigs/Monitors.conf fi # Preparing hyprland.conf to check for current keyboard layout @@ -98,8 +99,8 @@ while true; do case $confirm in [yY]) # If the detected layout is correct, update the 'kb_layout=' line in the file - awk -v layout="$layout" '/kb_layout/ {$0 = " kb_layout=" layout} 1' config/hypr/configs/Settings.conf > temp.conf - mv temp.conf config/hypr/configs/Settings.conf + awk -v layout="$layout" '/kb_layout/ {$0 = " kb_layout=" layout} 1' config/hypr/UserConfigs/Settings.conf > temp.conf + mv temp.conf config/hypr/UserConfigs/Settings.conf break ;; [nN]) printf "\n%.0s" {1..2} @@ -111,8 +112,8 @@ while true; do printf "\n%.0s" {1..2} read -p "${CAT} - Please enter the correct keyboard layout: " new_layout # Update the 'kb_layout=' line with the correct layout in the file - awk -v new_layout="$new_layout" '/kb_layout/ {$0 = " kb_layout=" new_layout} 1' config/hypr/configs/Settings.conf > temp.conf - mv temp.conf config/hypr/configs/Settings.conf + awk -v new_layout="$new_layout" '/kb_layout/ {$0 = " kb_layout=" new_layout} 1' config/hypr/UserConfigs/Settings.conf > temp.conf + mv temp.conf config/hypr/UserConfigs/Settings.conf break ;; *) echo "Please enter either 'y' or 'n'." ;; @@ -166,7 +167,7 @@ get_backup_dirname() { echo "back-up_${timestamp}" } -for DIR in btop cava hypr kitty Kvantum qt5ct qt6ct rofi swappy swaylock wal waybar wlogout; do +for DIR in btop cava hypr kitty Kvantum qt5ct qt6ct rofi swappy swaync swaylock wal waybar wlogout; do DIRPATH=~/.config/"$DIR" if [ -d "$DIRPATH" ]; then echo -e "${NOTE} - Config for $DIR found, attempting to back up." @@ -198,7 +199,7 @@ cp -r wallpapers ~/Pictures/ && { echo "${OK}Copy completed!"; } || { echo "${ER # Set some files as executable chmod +x ~/.config/hypr/scripts/* 2>&1 | tee -a "$LOG" - +chmod +x ~/.config/hypr/UserScripts/* 2>&1 | tee -a "$LOG" # Set executable for initial-boot.sh chmod +x ~/.config/hypr/initial-boot.sh 2>&1 | tee -a "$LOG" @@ -252,7 +253,7 @@ else fi # symlinks for waybar style -ln -sf "$HOME/.config/waybar/style/[Pywal] Chroma Fusion.css" "$HOME/.config/waybar/style.css" && \ +ln -sf $Waybar_Style "$HOME/.config/waybar/style.css" && \ # initialize pywal to avoid config error on hyprland wal -i $wallpaper -s -t 2>&1 | tee -a "$LOG" -- cgit v1.2.3