From 3cdfb07e6bb2be9993a1de038fd57c3bd6252305 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Mon, 27 Nov 2023 22:35:36 +0900 Subject: [PATCH 1/6] Rename waybar styles and edited Lined --- .../style/{Colored (Lined).css => Chroma Tally.css} | 11 +++++++---- .../style/{Colorful.css => Rainbow Spectrum.css} | 2 +- .../style/{Colored.css => Translucent Chromatic.css} | 0 3 files changed, 8 insertions(+), 5 deletions(-) rename config/waybar/style/{Colored (Lined).css => Chroma Tally.css} (96%) rename config/waybar/style/{Colorful.css => Rainbow Spectrum.css} (99%) rename config/waybar/style/{Colored.css => Translucent Chromatic.css} (100%) diff --git a/config/waybar/style/Colored (Lined).css b/config/waybar/style/Chroma Tally.css similarity index 96% rename from config/waybar/style/Colored (Lined).css rename to config/waybar/style/Chroma Tally.css index 3b8ca12..21d313f 100644 --- a/config/waybar/style/Colored (Lined).css +++ b/config/waybar/style/Chroma Tally.css @@ -1,6 +1,8 @@ /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ /* Colored Line */ +@import '../../.cache/wal/colors-waybar.css'; + * { font-family: "JetBrainsMono Nerd Font"; font-weight: bold; @@ -12,8 +14,11 @@ padding: 1px; } window#waybar { - background:rgba (0, 0, 0, 0.5); - border-radius: 20px 20px 20px 20px; + background: rgba (0, 0, 0, 0.5); + border-radius: 20px 20px 20px 20px; + border-bottom: 4px; + border-style: solid; + border-color: @color2; } #workspaces button { @@ -97,8 +102,6 @@ window#waybar { #custom-weather.snowyIcyNight, #custom-weather.sunnyDay { padding: 1px 4px; - border-bottom: 1px; - border-style: solid; } /* ----------------------------------------------------------------------------- diff --git a/config/waybar/style/Colorful.css b/config/waybar/style/Rainbow Spectrum.css similarity index 99% rename from config/waybar/style/Colorful.css rename to config/waybar/style/Rainbow Spectrum.css index cfdcb04..3a6df80 100644 --- a/config/waybar/style/Colorful.css +++ b/config/waybar/style/Rainbow Spectrum.css @@ -6,7 +6,7 @@ font-family: "JetBrainsMono Nerd Font"; font-weight: bold; min-height: 0; /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */ -font-size: 98%; +font-size: 96%; font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; padding: 1px; } diff --git a/config/waybar/style/Colored.css b/config/waybar/style/Translucent Chromatic.css similarity index 100% rename from config/waybar/style/Colored.css rename to config/waybar/style/Translucent Chromatic.css From abdc29f5f38edb33443c1173924df94986032e46 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Mon, 27 Nov 2023 22:37:02 +0900 Subject: [PATCH 2/6] updated waybar style --- config/waybar/style/Chroma Tally.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/waybar/style/Chroma Tally.css b/config/waybar/style/Chroma Tally.css index 21d313f..44825ee 100644 --- a/config/waybar/style/Chroma Tally.css +++ b/config/waybar/style/Chroma Tally.css @@ -16,7 +16,7 @@ padding: 1px; window#waybar { background: rgba (0, 0, 0, 0.5); border-radius: 20px 20px 20px 20px; - border-bottom: 4px; + border-bottom: 3px; border-style: solid; border-color: @color2; } From 6adf09409e23931689be999c91a2cdeb96c571f6 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Tue, 28 Nov 2023 01:38:38 +0900 Subject: [PATCH 3/6] updates --- config/dunst/dunstrc | 422 ++++++++++++++++++++++++++- config/dunst/styles/dunstrc-dark | 422 --------------------------- config/dunst/styles/dunstrc-light | 422 --------------------------- config/hypr/scripts/DarkLight.sh | 11 +- config/hypr/scripts/PywalDunst.sh | 23 ++ config/hypr/scripts/Refresh.sh | 6 +- config/waybar/style/Chroma Tally.css | 34 ++- config/waybar/style/Pywal.css | 8 +- 8 files changed, 483 insertions(+), 865 deletions(-) delete mode 100755 config/dunst/styles/dunstrc-dark delete mode 100755 config/dunst/styles/dunstrc-light create mode 100755 config/hypr/scripts/PywalDunst.sh diff --git a/config/dunst/dunstrc b/config/dunst/dunstrc index b16e0cd..17d77af 100755 --- a/config/dunst/dunstrc +++ b/config/dunst/dunstrc @@ -1 +1,421 @@ -#for symlink \ No newline at end of file +[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 + + # The geometry of the window: + # [{width}]x{height}[+/-{x}+/-{y}] + # The geometry of the message window. + # The height is measured in number of notifications everything else + # in pixels. If the width is omitted but the height is given + # ("-geometry x2"), the message window expands over the whole screen + # (dmenu-like). If width is 0, the window expands to the longest + # message displayed. A positive x is measured from the left, a + # negative from the right side of the screen. Y is measured from + # the top and down respectively. + # The width can be negative. In this case the actual width is the + # screen width minus the width defined in within the geometry option. + #geometry = "300x60+15+46" + width = (250, 350) + height = 250 + origin = top-center + offset = 10x10 + + notification_limit = 9 + + # Show how many messages are currently hidden (because of geometry). + indicate_hidden = yes + + # Shrink window if it's smaller than the width. Will be ignored if + # width is 0. + shrink = no + + # The transparency of the window. Range: [0; 100]. + # This option will only work if a compositing window manager is + # present (e.g. xcompmgr, compiz, etc.). + #transparency = 100 + + # The height of the entire notification. If the height is smaller + # than the font height and padding combined, it will be raised + # to the font height and padding. + notification_height = 15 + + # 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 = "#7F8153" + + # 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 12 + + # 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/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 + + # Print a notification on startup. + # This is mainly for error detection, since dbus (re-)starts dunst + # automatically after a crash. + startup_notification = false + + # Manage dunst's desire for talking + # Can be one of the following values: + # crit: Critical features. Dunst aborts + # warn: Only non-fatal warnings + # mesg: Important Messages + # info: all unimportant stuff + # debug: all less than unimportant stuff + verbosity = mesg + + # Define the corner radius of the notification window + # in pixel size. If the radius is 0, you have no rounded + # corners. + # The radius will be automatically lowered if it exceeds half of the + # notification height to avoid clipping text and/or icons. + corner_radius = 10 + + ### 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 + +[shortcuts] + + # Shortcuts are specified as [modifier+][modifier+]...key + # Available modifiers are "ctrl", "mod1" (the alt-key), "mod2", + # "mod3" and "mod4" (windows-key). + # Xev might be helpful to find names for keys. + + # Close notification. + close = ctrl+space + + # Close all notifications. + close_all = ctrl+shift+space + + # Redisplay last message(s). + # On the US keyboard layout "grave" is normally above TAB and left + # of "1". Make sure this key actually exists on your keyboard layout, + # e.g. check output of 'xmodmap -pke' + history = ctrl+grave + + # Context menu. + context = ctrl+shift+grave + +[urgency_low] + # IMPORTANT: colors have to be defined in quotation marks. + # Otherwise the "#" and following would be interpreted as a comment. + background = "#00000080" + foreground = "#FFFFFF90" + frame_color = "#7F8153" + timeout = 2 + # Icon for notifications with low urgency, uncomment to enable + icon = $HOME/.config/dunst/images/bell.png + +[urgency_normal] + background = "#00000080" + foreground = "#FFFFFF90" + frame_color = "#7F8153" + timeout = 5 + # Icon for notifications with normal urgency, uncomment to enable + icon = $HOME/.config/dunst/images/bell.png + +[urgency_critical] + background = "#00000080" + foreground = "#FFFFFF90" + frame_color = "#7F8153" + 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/styles/dunstrc-dark b/config/dunst/styles/dunstrc-dark deleted file mode 100755 index 963e823..0000000 --- a/config/dunst/styles/dunstrc-dark +++ /dev/null @@ -1,422 +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 - - # The geometry of the window: - # [{width}]x{height}[+/-{x}+/-{y}] - # The geometry of the message window. - # The height is measured in number of notifications everything else - # in pixels. If the width is omitted but the height is given - # ("-geometry x2"), the message window expands over the whole screen - # (dmenu-like). If width is 0, the window expands to the longest - # message displayed. A positive x is measured from the left, a - # negative from the right side of the screen. Y is measured from - # the top and down respectively. - # The width can be negative. In this case the actual width is the - # screen width minus the width defined in within the geometry option. - #geometry = "300x60+15+46" - width = (250, 350) - height = 250 - origin = top-center - offset = 10x10 - - notification_limit = 9 - - # Show how many messages are currently hidden (because of geometry). - indicate_hidden = yes - - # Shrink window if it's smaller than the width. Will be ignored if - # width is 0. - shrink = no - - # The transparency of the window. Range: [0; 100]. - # This option will only work if a compositing window manager is - # present (e.g. xcompmgr, compiz, etc.). - transparency = 20 - - # The height of the entire notification. If the height is smaller - # than the font height and padding combined, it will be raised - # to the font height and padding. - notification_height = 15 - - # 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 = 1 - - # Defines color of the frame around the notification window. - frame_color = "#cdd6f4" - - # 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 12 - - # 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/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 - - # Print a notification on startup. - # This is mainly for error detection, since dbus (re-)starts dunst - # automatically after a crash. - startup_notification = false - - # Manage dunst's desire for talking - # Can be one of the following values: - # crit: Critical features. Dunst aborts - # warn: Only non-fatal warnings - # mesg: Important Messages - # info: all unimportant stuff - # debug: all less than unimportant stuff - verbosity = mesg - - # Define the corner radius of the notification window - # in pixel size. If the radius is 0, you have no rounded - # corners. - # The radius will be automatically lowered if it exceeds half of the - # notification height to avoid clipping text and/or icons. - corner_radius = 10 - - ### 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 - -[shortcuts] - - # Shortcuts are specified as [modifier+][modifier+]...key - # Available modifiers are "ctrl", "mod1" (the alt-key), "mod2", - # "mod3" and "mod4" (windows-key). - # Xev might be helpful to find names for keys. - - # Close notification. - close = ctrl+space - - # Close all notifications. - close_all = ctrl+shift+space - - # Redisplay last message(s). - # On the US keyboard layout "grave" is normally above TAB and left - # of "1". Make sure this key actually exists on your keyboard layout, - # e.g. check output of 'xmodmap -pke' - history = ctrl+grave - - # Context menu. - context = ctrl+shift+grave - -[urgency_low] - # IMPORTANT: colors have to be defined in quotation marks. - # Otherwise the "#" and following would be interpreted as a comment. - background = "#1e1e2e" - foreground = "#cdd6f4" - #frame_color = "#2c2c2c" - timeout = 2 - # Icon for notifications with low urgency, uncomment to enable - icon = $HOME/.config/dunst/images/bell.png - -[urgency_normal] - background = "#1e1e2e" - foreground = "#cdd6f4" - #frame_color = "#2c2c2c" - timeout = 5 - # Icon for notifications with normal urgency, uncomment to enable - icon = $HOME/.config/dunst/images/bell.png - -[urgency_critical] - background = "#131313" - foreground = "#f5cb42" - frame_color = "#f38ba8" - 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 -# background = "#1e1e2e" -# 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/styles/dunstrc-light b/config/dunst/styles/dunstrc-light deleted file mode 100755 index b9374fe..0000000 --- a/config/dunst/styles/dunstrc-light +++ /dev/null @@ -1,422 +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 - - # The geometry of the window: - # [{width}]x{height}[+/-{x}+/-{y}] - # The geometry of the message window. - # The height is measured in number of notifications everything else - # in pixels. If the width is omitted but the height is given - # ("-geometry x2"), the message window expands over the whole screen - # (dmenu-like). If width is 0, the window expands to the longest - # message displayed. A positive x is measured from the left, a - # negative from the right side of the screen. Y is measured from - # the top and down respectively. - # The width can be negative. In this case the actual width is the - # screen width minus the width defined in within the geometry option. - #geometry = "300x60+15+46" - width = (250, 350) - height = 250 - origin = top-center - offset = 10x10 - - notification_limit = 9 - - # Show how many messages are currently hidden (because of geometry). - indicate_hidden = yes - - # Shrink window if it's smaller than the width. Will be ignored if - # width is 0. - shrink = no - - # The transparency of the window. Range: [0; 100]. - # This option will only work if a compositing window manager is - # present (e.g. xcompmgr, compiz, etc.). - transparency = 20 - - # The height of the entire notification. If the height is smaller - # than the font height and padding combined, it will be raised - # to the font height and padding. - notification_height = 15 - - # 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 = 1 - - # Defines color of the frame around the notification window. - frame_color = "#313244" - - # 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 12 - - # 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/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 - - # Print a notification on startup. - # This is mainly for error detection, since dbus (re-)starts dunst - # automatically after a crash. - startup_notification = false - - # Manage dunst's desire for talking - # Can be one of the following values: - # crit: Critical features. Dunst aborts - # warn: Only non-fatal warnings - # mesg: Important Messages - # info: all unimportant stuff - # debug: all less than unimportant stuff - verbosity = mesg - - # Define the corner radius of the notification window - # in pixel size. If the radius is 0, you have no rounded - # corners. - # The radius will be automatically lowered if it exceeds half of the - # notification height to avoid clipping text and/or icons. - corner_radius = 10 - - ### 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 - -[shortcuts] - - # Shortcuts are specified as [modifier+][modifier+]...key - # Available modifiers are "ctrl", "mod1" (the alt-key), "mod2", - # "mod3" and "mod4" (windows-key). - # Xev might be helpful to find names for keys. - - # Close notification. - close = ctrl+space - - # Close all notifications. - close_all = ctrl+shift+space - - # Redisplay last message(s). - # On the US keyboard layout "grave" is normally above TAB and left - # of "1". Make sure this key actually exists on your keyboard layout, - # e.g. check output of 'xmodmap -pke' - history = ctrl+grave - - # Context menu. - context = ctrl+shift+grave - -[urgency_low] - # IMPORTANT: colors have to be defined in quotation marks. - # Otherwise the "#" and following would be interpreted as a comment. - background = "#e7e7ec" - foreground = "#1e1e2e" - #frame_color = "#2c2c2c" - timeout = 2 - # Icon for notifications with low urgency, uncomment to enable - icon = $HOME/.config/dunst/images/bell.png - -[urgency_normal] - background = "#e7e7ec" - foreground = "#1e1e2e" - #frame_color = "#2c2c2c" - timeout = 5 - # Icon for notifications with normal urgency, uncomment to enable - icon = $HOME/.config/dunst/images/bell.png - -[urgency_critical] - background = "#e7e7ec" - foreground = "#f5cb42" - frame_color = "#f38ba8" - 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 -# background = "#e7e7ec" -# foreground -# format -# frame_color -# fullscreen -# new_icon -# set_stack_tag -# set_transient -# timeout -# urgency -# -# Shell-like globbing will get expanded. -# -# Instead of the appname filter, it's recommended to use the desktop_entry filter. -# GLib based applications export their desktop-entry name. In comparison to the appname, -# the desktop-entry won't get localized. -# -# SCRIPTING -# You can specify a script that gets run when the rule matches by -# setting the "script" option. -# The script will be called as follows: -# script appname summary body icon urgency -# where urgency can be "LOW", "NORMAL" or "CRITICAL". -# -# NOTE: if you don't want a notification to be displayed, set the format -# to "". -# NOTE: It might be helpful to run dunst -print in a terminal in order -# to find fitting options for rules. - -# Disable the transient hint so that idle_threshold cannot be bypassed from the -# client -#[transient_disable] -# match_transient = yes -# set_transient = no -# -# Make the handling of transient notifications more strict by making them not -# be placed in history. -#[transient_history_ignore] -# match_transient = yes -# history_ignore = yes - -# fullscreen values -# show: show the notifications, regardless if there is a fullscreen window opened -# delay: displays the new notification, if there is no fullscreen window active -# If the notification is already drawn, it won't get undrawn. -# pushback: same as delay, but when switching into fullscreen, the notification will get -# withdrawn from screen again and will get delayed like a new notification -#[fullscreen_delay_everything] -# fullscreen = delay -#[fullscreen_show_critical] -# msg_urgency = critical -# fullscreen = show - -#[espeak] -# summary = "*" -# script = dunst_espeak.sh - -#[script-test] -# summary = "*script*" -# script = dunst_test.sh - -#[ignore] -# # This notification will not be displayed -# summary = "foobar" -# format = "" - -#[history-ignore] -# # This notification will not be saved in history -# summary = "foobar" -# history_ignore = yes - -#[skip-display] -# # This notification will not be displayed, but will be included in the history -# summary = "foobar" -# skip_display = yes - -#[signed_on] -# appname = Pidgin -# summary = "*signed on*" -# urgency = low -# -#[signed_off] -# appname = Pidgin -# summary = *signed off* -# urgency = low -# -#[says] -# appname = Pidgin -# summary = *says* -# urgency = critical -# -#[twitter] -# appname = Pidgin -# summary = *twitter.com* -# urgency = normal -# -#[stack-volumes] -# appname = "some_volume_notifiers" -# set_stack_tag = "volume" -# -# vim: ft=cfg diff --git a/config/hypr/scripts/DarkLight.sh b/config/hypr/scripts/DarkLight.sh index 7d371a1..fc75bf7 100755 --- a/config/hypr/scripts/DarkLight.sh +++ b/config/hypr/scripts/DarkLight.sh @@ -11,6 +11,8 @@ dunst_notif="$HOME/.config/dunst/images/bell.png" dark_rofi_pywal="$HOME/.cache/wal/colors-rofi-dark.rasi" light_rofi_pywal="$HOME/.cache/wal/colors-rofi-light.rasi" + + # Tokyo Night light_gtk_theme="Tokyonight-Light-B" dark_gtk_theme="Tokyonight-Dark-B" @@ -42,7 +44,14 @@ path_param=$(echo $next_mode | sed 's/.*/\u&/') notify_user "$next_mode" -ln -sf "${dunst_config}/styles/dunstrc-${next_mode}" "${dunst_config}/dunstrc" +# Change background for dunst +if [ "$next_mode" = "dark" ]; then + sed -i '/background = /s/.*/ background = "#00000080"/' "${dunst_config}/dunstrc" + sed -i '/foreground = /s/.*/ foreground = "#FFFFFF90"/' "${dunst_config}/dunstrc" +else + sed -i '/background = /s/.*/ background = "#FFFFFF80"/' "${dunst_config}/dunstrc" + sed -i '/foreground = /s/.*/ foreground = "#00000090"/' "${dunst_config}/dunstrc" +fi # Symlink for rofi theme if [ "$next_mode" = "dark" ]; then diff --git a/config/hypr/scripts/PywalDunst.sh b/config/hypr/scripts/PywalDunst.sh new file mode 100755 index 0000000..2a66aec --- /dev/null +++ b/config/hypr/scripts/PywalDunst.sh @@ -0,0 +1,23 @@ +#!/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" + +pidof dunst && 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 + +dunst -config ~/.config/dunst/dunstrc > /dev/null 2>&1 & \ No newline at end of file diff --git a/config/hypr/scripts/Refresh.sh b/config/hypr/scripts/Refresh.sh index 460f11f..b5e705d 100755 --- a/config/hypr/scripts/Refresh.sh +++ b/config/hypr/scripts/Refresh.sh @@ -3,7 +3,7 @@ SCRIPTSDIR=$HOME/.config/hypr/scripts # Kill already running processes -_ps=(waybar dunst rofi) +_ps=(waybar rofi) for _prs in "${_ps[@]}"; do if pidof "${_prs}" >/dev/null; then pkill "${_prs}" @@ -12,7 +12,9 @@ done # Relaunch waybar waybar & -dunst & + +# Relaunch dunst with pywal-borders +${SCRIPTSDIR}/PywalDunst.sh ## trying to figure out how to restart Rainbow borders #sleep 1 diff --git a/config/waybar/style/Chroma Tally.css b/config/waybar/style/Chroma Tally.css index 44825ee..55047b1 100644 --- a/config/waybar/style/Chroma Tally.css +++ b/config/waybar/style/Chroma Tally.css @@ -8,7 +8,7 @@ font-family: "JetBrainsMono Nerd Font"; font-weight: bold; min-height: 0; /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */ -font-size: 98%; +font-size: 96%; font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; padding: 1px; } @@ -23,9 +23,7 @@ window#waybar { #workspaces button { color: #eceff4; - border-color: #d8dee9; - border-style: solid; - margin-top:2px; + margin-top: 2px; margin-bottom: 3px; box-shadow: none; text-shadow: none; @@ -38,7 +36,11 @@ window#waybar { } #workspaces button.active { - border-color: #81a1c1; + border: 1px; + border-color: #cba6f7; + border-style: solid; + border-radius: 15px; + background-color: @color2; margin-left: 3px; padding-left: 12px; padding-right: 12px; @@ -143,9 +145,12 @@ window#waybar { } #cpu { - color:#a3be8c ; + color: #a3be8c; } +#disk { + color: #94e2d5; +} #memory { color: #d3869b; } @@ -163,21 +168,23 @@ window#waybar { } #pulseaudio { - color: #b48ead; + color: #04a5e5; } #pulseaudio.muted { - color: #3b4252; + color: #9ca0b0; } +#custom-light_dark, #temperature { - color: #8fbcbb; + color: #7287fd; } #temperature.critical { color: #bf616a; } +#keyboard-state, #idle_inhibitor { color: #ebcb8b; } @@ -187,17 +194,20 @@ window#waybar { #custom-menu, #custom-power{ - color: #cba6f7; + color: #eba0ac; margin-top:2px; } #window{ border-style: hidden; margin-top:1px; -} +} + +#custom-lock, #bluetooth{ color:#d08770; -} +} + #custom-weather{ color:#d08770; } diff --git a/config/waybar/style/Pywal.css b/config/waybar/style/Pywal.css index 37618ae..ee7cb14 100644 --- a/config/waybar/style/Pywal.css +++ b/config/waybar/style/Pywal.css @@ -164,7 +164,7 @@ tooltip { #custom-weather.sunnyDay { color: @foreground; padding-right: 8px; - padding-left: 12px; + padding-left: 8px; } #temperature.critical { @@ -179,10 +179,7 @@ tooltip { #taskbar button.active { background-color: rgb(47, 46, 46); - margin-left: 3px; - padding-left: 12px; - padding-right: 12px; - margin-right: 3px; + border-radius: 30px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } @@ -190,6 +187,7 @@ tooltip { #taskbar button:hover { padding-left: 3px; padding-right: 3px; + border-radius: 15px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } From 310f3c880c0153c1fa463cc6b7f772239eef7df0 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Tue, 28 Nov 2023 11:51:17 +0900 Subject: [PATCH 4/6] removal of margins on waybar styles, added highway dark and light wallpapers, some small tweaks on waybar configs(layouts) --- config/waybar/configs/Camellia [Bottom] | 4 +- config/waybar/configs/Camellia [TOP] | 4 +- config/waybar/configs/Chrysanthemum [Bottom] | 4 +- config/waybar/configs/Chrysanthemum [TOP] | 3 +- config/waybar/style/Black & White.css | 19 ++---- config/waybar/style/Catppuccin-Latte.css | 14 ++--- config/waybar/style/Catppuccin-Mocha.css | 12 ++-- config/waybar/style/Chroma Tally.css | 19 +++--- config/waybar/style/Colored (Bordered).css | 47 ++++----------- config/waybar/style/Crimson.css | 24 ++++---- config/waybar/style/Dark.css | 43 ++++++++------ config/waybar/style/Golden Noir.css | 22 ++++--- config/waybar/style/Light.css | 55 ++++++++++-------- config/waybar/style/Purpl.css | 18 ++---- config/waybar/style/Pywal.css | 33 ++++------- config/waybar/style/Rainbow Spectrum.css | 16 ++--- config/waybar/style/Rose-Pine.css | 12 +--- config/waybar/style/Simple Pink.css | 25 ++++---- config/waybar/style/Translucent Chromatic.css | 16 ----- config/waybar/style/Transparent.css | 20 ++----- .../Dynamic-Wallpapers/Dark/highway_dark.jpg | Bin 0 -> 274916 bytes .../Light/highway_light.jpg | Bin 0 -> 208003 bytes 22 files changed, 160 insertions(+), 250 deletions(-) create mode 100644 wallpapers/Dynamic-Wallpapers/Dark/highway_dark.jpg create mode 100644 wallpapers/Dynamic-Wallpapers/Light/highway_light.jpg diff --git a/config/waybar/configs/Camellia [Bottom] b/config/waybar/configs/Camellia [Bottom] index c335757..4865c4a 100644 --- a/config/waybar/configs/Camellia [Bottom] +++ b/config/waybar/configs/Camellia [Bottom] @@ -131,7 +131,7 @@ }, "tray#cam": { - "icon-size": 16, + //"icon-size": 16, "spacing": 10 }, @@ -151,7 +151,7 @@ "wlr/taskbar": { "format": "{icon}", - "icon-size": 14, + //"icon-size": 14, //"icon-theme": "Numix-Circle", "tooltip-format": "{title}", "on-click": "activate", diff --git a/config/waybar/configs/Camellia [TOP] b/config/waybar/configs/Camellia [TOP] index 601be63..4081716 100644 --- a/config/waybar/configs/Camellia [TOP] +++ b/config/waybar/configs/Camellia [TOP] @@ -131,7 +131,7 @@ }, "tray#cam": { - "icon-size": 16, + //"icon-size": 16, "spacing": 10 }, @@ -151,7 +151,7 @@ "wlr/taskbar": { "format": "{icon}", - "icon-size": 14, + //"icon-size": 14, //"icon-theme": "Numix-Circle", "tooltip-format": "{title}", "on-click": "activate", diff --git a/config/waybar/configs/Chrysanthemum [Bottom] b/config/waybar/configs/Chrysanthemum [Bottom] index 8b2c542..326bed0 100644 --- a/config/waybar/configs/Chrysanthemum [Bottom] +++ b/config/waybar/configs/Chrysanthemum [Bottom] @@ -14,8 +14,8 @@ "spacing": 5, "fixed-center": false, "ipc": true, -//"margin-top": 0, -//"margin-bottom": 5, +"margin-left": 5, +"margin-right": 5, "modules-left": ["clock#gar","tray"], diff --git a/config/waybar/configs/Chrysanthemum [TOP] b/config/waybar/configs/Chrysanthemum [TOP] index 4f691b3..a948ce1 100644 --- a/config/waybar/configs/Chrysanthemum [TOP] +++ b/config/waybar/configs/Chrysanthemum [TOP] @@ -14,8 +14,9 @@ "spacing": 5, "fixed-center": false, "ipc": true, +"margin-left": 5, +"margin-right": 5, "margin-top": 0, -//"margin-bottom": 5, "modules-left": ["clock#gar","tray"], diff --git a/config/waybar/style/Black & White.css b/config/waybar/style/Black & White.css index fb84370..5976090 100644 --- a/config/waybar/style/Black & White.css +++ b/config/waybar/style/Black & White.css @@ -21,14 +21,12 @@ window#waybar.empty { window#waybar.empty #window { padding: 0px; - margin: 0px; border: 0px; /* background-color: rgba(66,66,66,0.5); */ /* transparent */ background-color: transparent; } window > box { - /*margin: 1px 2px 2px;*/ background: rgba(0, 0, 0, 0); border-bottom: 1px solid rgba(0, 0, 0, 0); color: white; @@ -54,7 +52,6 @@ tooltip label{ /*-----module groups----*/ .modules-right { background-color: black; - /*margin: 2px 10px 0 0;*/ border: 1px; border-style: solid; border-color: white; @@ -62,14 +59,12 @@ tooltip label{ } .modules-center { background-color: black;; - /*margin: 2px 0 0 0;*/ border: 1px; border-style: solid; border-color: white; border-radius: 10px; } .modules-left { - /*margin: 2px 0 0 5px;*/ background-color: black; border: 1px; border-style: solid; @@ -83,8 +78,6 @@ tooltip label{ text-shadow: none; padding: 0px; border-radius: 9px; - margin-top: 3px; - margin-bottom: 3px; padding-left: 3px; padding-right: 3px; animation: gradient_f 20s ease-in infinite; @@ -105,10 +98,8 @@ tooltip label{ #workspaces button.active { color: white; background-color: rgba(191, 191, 191,0.1); - margin-left: 3px; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } @@ -159,16 +150,16 @@ tooltip label{ #custom-weather.showyIcyDay, #custom-weather.snowyIcyNight, #custom-weather.sunnyDay { - padding: 0px 6px; + padding-top: 3px; + padding-bottom: 3px; + padding-left: 6px; + padding-right: 6px; } #mode { color: #cc3436; font-weight: bold; } #custom-power { - /*background-color: rgba(0,119,179,0.6);*/ - /*border-radius: 50px;*/ - margin: 5px 5px; padding: 1px 3px; } /*-----Indicators----*/ @@ -204,10 +195,8 @@ tooltip label{ #taskbar button.active { background-color: #7f849c; - margin-left: 3px; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } diff --git a/config/waybar/style/Catppuccin-Latte.css b/config/waybar/style/Catppuccin-Latte.css index 3ddc4d6..d7bf65d 100644 --- a/config/waybar/style/Catppuccin-Latte.css +++ b/config/waybar/style/Catppuccin-Latte.css @@ -17,7 +17,7 @@ window#waybar { transition-property: background-color; transition-duration: 0.5s; /*background: transparent;*/ - border: 2px solid @sapphire; + border-bottom: 3px solid @sapphire; background: @theme_base_color; border-radius: 10px; } @@ -90,7 +90,10 @@ window#waybar.hidden { #custom-weather.showyIcyDay, #custom-weather.snowyIcyNight, #custom-weather.sunnyDay { - padding: 0px 6px; + padding-top: 3px; + padding-bottom: 3px; + padding-left: 5px; + padding-right: 5px; } #idle_inhibitor { @@ -162,8 +165,6 @@ window#waybar.hidden { text-shadow: none; padding: 0px; border-radius: 9px; - margin-top: 3px; - margin-bottom: 3px; padding-left: 3px; padding-right: 3px; animation: gradient_f 20s ease-in infinite; @@ -188,10 +189,8 @@ window#waybar.hidden { #workspaces button.active { color: @peach; border-radius: 8px; - margin-left: 3px; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } @@ -202,10 +201,8 @@ window#waybar.hidden { } #taskbar button.active { - margin-left: 3px; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } @@ -223,7 +220,6 @@ window#waybar.hidden { #custom-power { color: @red; - margin-right: 3px; } #custom-updater { diff --git a/config/waybar/style/Catppuccin-Mocha.css b/config/waybar/style/Catppuccin-Mocha.css index 52e3a48..32582a9 100644 --- a/config/waybar/style/Catppuccin-Mocha.css +++ b/config/waybar/style/Catppuccin-Mocha.css @@ -89,7 +89,10 @@ window#waybar.hidden { #custom-weather.showyIcyDay, #custom-weather.snowyIcyNight, #custom-weather.sunnyDay { - padding: 0px 6px; + padding-top: 3px; + padding-bottom: 3px; + padding-left: 5px; + padding-right: 5px; } #idle_inhibitor { @@ -161,8 +164,6 @@ window#waybar.hidden { text-shadow: none; padding: 0px; border-radius: 9px; - margin-top: 3px; - margin-bottom: 3px; padding-left: 3px; padding-right: 3px; animation: gradient_f 20s ease-in infinite; @@ -187,10 +188,8 @@ window#waybar.hidden { #workspaces button.active { color: @peach; border-radius: 8px; - margin-left: 3px; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } @@ -201,10 +200,8 @@ window#waybar.hidden { } #taskbar button.active { - margin-left: 3px; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } @@ -222,7 +219,6 @@ window#waybar.hidden { #custom-power { color: @red; - margin-right: 3px; } #custom-updater { diff --git a/config/waybar/style/Chroma Tally.css b/config/waybar/style/Chroma Tally.css index 55047b1..72745a7 100644 --- a/config/waybar/style/Chroma Tally.css +++ b/config/waybar/style/Chroma Tally.css @@ -8,7 +8,7 @@ font-family: "JetBrainsMono Nerd Font"; font-weight: bold; min-height: 0; /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */ -font-size: 96%; +font-size: 98%; font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; padding: 1px; } @@ -23,8 +23,6 @@ window#waybar { #workspaces button { color: #eceff4; - margin-top: 2px; - margin-bottom: 3px; box-shadow: none; text-shadow: none; padding: 0px; @@ -41,10 +39,8 @@ window#waybar { border-style: solid; border-radius: 15px; background-color: @color2; - margin-left: 3px; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } @@ -103,7 +99,10 @@ window#waybar { #custom-weather.showyIcyDay, #custom-weather.snowyIcyNight, #custom-weather.sunnyDay { - padding: 1px 4px; + padding-top: 3px; + padding-bottom: 3px; + padding-left: 4px; + padding-right: 4px; } /* ----------------------------------------------------------------------------- @@ -194,13 +193,11 @@ window#waybar { #custom-menu, #custom-power{ - color: #eba0ac; - margin-top:2px; + color: #eba0ac; } #window{ - border-style: hidden; - margin-top:1px; + border-style: hidden; } #custom-lock, @@ -214,10 +211,8 @@ window#waybar { #taskbar button.active { background-color: #7f849c; - margin-left: 3px; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } diff --git a/config/waybar/style/Colored (Bordered).css b/config/waybar/style/Colored (Bordered).css index 5e64371..ada3cf5 100644 --- a/config/waybar/style/Colored (Bordered).css +++ b/config/waybar/style/Colored (Bordered).css @@ -1,6 +1,8 @@ /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ /* Colored - Bordered */ +@import '../../.cache/wal/colors-waybar.css'; + * { font-family: "JetBrainsMono Nerd Font"; font-weight: bold; @@ -20,14 +22,12 @@ window#waybar { /* border-top: 8px transparent; */ border-radius: 0px; transition-duration: 0.5s; - margin: 0px 0px; } window#waybar.empty { background-color: transparent; } window#waybar.empty #window { padding: 0px; - margin: 0px; border: 0px; /* background-color: rgba(66,66,66,0.5); */ /* transparent */ background-color: transparent; @@ -40,10 +40,10 @@ window#waybar.hidden { tooltip { background: #1e1e2e; opacity: 0.8; - border-radius: 10px; + border-radius: 12px; border-width: 2px; border-style: solid; - border-color: #11111b; + border-color: @color2; } tooltip label{ @@ -56,8 +56,6 @@ tooltip label{ text-shadow: none; padding: 0px; border-radius: 9px; - margin-top: 3px; - margin-bottom: 3px; padding-left: 3px; padding-right: 3px; animation: gradient_f 20s ease-in infinite; @@ -76,10 +74,8 @@ tooltip label{ } #workspaces button.active { color: white; - margin-left: 3px; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } @@ -97,8 +93,6 @@ tooltip label{ #cpu, #disk, #idle_inhibitor, -#keyboard-state label, -#keyboard-state label.locked, #keyboard-state, #memory, #mode, @@ -106,7 +100,6 @@ tooltip label{ #network, #pulseaudio, #pulseaudio-slider, -#taskbar button, #taskbar, #temperature, #tray, @@ -134,35 +127,33 @@ tooltip label{ #custom-weather.showyIcyDay, #custom-weather.snowyIcyNight, #custom-weather.sunnyDay { - padding: 0px 10px; + padding-top: 3px; + padding-bottom: 3px; + padding-left: 10px; + padding-right: 10px; color: #e5e5e5; /* color: #bf616a; */ - border-radius: 8px; + border-radius: 12px; background-color: rgba(50, 50, 50, 0.1); - border: 1px solid #b4befe; + border: 2px solid @color2; } #workspaces { - border-radius: 6px; + border-radius: 12px; padding: 0px 6px; - border: 1px solid #b4befe; } #cpu { color: #fb958b; padding: 3px; - border-radius: 8px; background-color: rgba(50, 50, 50, 0.1); - border: 1px solid #b4befe; } #custom-cycle_wall, #custom-updater { color: #cba7f7; padding: 3px; - border-radius: 8px; background-color: rgba(50, 50, 50, 0.1); - border: 1px solid #b4befe; } @@ -170,9 +161,7 @@ tooltip label{ color: #FFFFFF; padding: 6px; padding-right: 6px; - border-radius: 8px; background-color: rgba(50, 50, 50, 0.1); - border: 1px solid #b4befe; } #memory { @@ -186,7 +175,6 @@ tooltip label{ #custom-launcher { background-color: #1b242b; color: #6a92d7; - border-radius: 6px; padding: 0 0px; } @@ -221,16 +209,6 @@ tooltip label{ color: #ebecf0; } -/* If workspaces is the leftmost module, omit left margin */ -.modules-left > widget:first-child > #workspaces { - margin-left: 0; -} - -/* If workspaces is the rightmost module, omit right margin */ -.modules-right > widget:last-child > #workspaces { - margin-right: 0; -} - #pulseaudio { color: #FFD580; } @@ -342,10 +320,8 @@ label:focus { #taskbar button.active { background-color: #7f849c; - margin-left: 3px; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } @@ -356,6 +332,7 @@ label:focus { animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } + #pulseaudio-slider slider { min-width: 0px; min-height: 0px; diff --git a/config/waybar/style/Crimson.css b/config/waybar/style/Crimson.css index 720197a..171b8d7 100644 --- a/config/waybar/style/Crimson.css +++ b/config/waybar/style/Crimson.css @@ -16,7 +16,7 @@ font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; window#waybar { background: #240303; color: wheat; - border-radius: 00px 0px 100px 100px; + border-radius: 0px 0px 100px 100px; border: 1px solid grey; } @@ -29,7 +29,6 @@ window#waybar.empty { window#waybar.empty #window { padding: 0px; - margin: 0px; border: 0px; /* background-color: rgba(66,66,66,0.5); */ /* transparent */ background-color: transparent; @@ -46,17 +45,24 @@ tooltip { /*-----module groups----*/ .modules-right { - padding-right: 5px; + padding-top: 4px; + padding-bottom: 4px; padding-left: 5px; + padding-right: 5px; } .modules-center { - + padding-top: 4px; + padding-bottom: 4px; + padding-left: 5px; + padding-right: 5px; } .modules-left { - padding-right: 5px; + padding-top: 4px; + padding-bottom: 4px; padding-left: 5px; + padding-right: 5px; } #workspaces button { @@ -65,8 +71,6 @@ tooltip { text-shadow: none; padding: 0px; border-radius: 9px; - margin-top: 3px; - margin-bottom: 3px; padding-left: 3px; padding-right: 3px; animation: gradient_f 20s ease-in infinite; @@ -78,10 +82,8 @@ tooltip { background-color: #000000; border: 1px solid grey; border-radius: 15px 15px 15px 15px; - margin-left: 3px; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } @@ -152,6 +154,8 @@ tooltip { #custom-weather.snowyIcyNight, #custom-weather.sunnyDay { color: wheat; + padding-top: 2px; + padding-bottom: 2px; padding-right: 10px; padding-left: 10px; } @@ -169,10 +173,8 @@ tooltip { #taskbar button.active { background-color: rgb(128, 31, 31); border: 1px solid grey; - margin-left: 3px; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } diff --git a/config/waybar/style/Dark.css b/config/waybar/style/Dark.css index 84cbeda..1ee744c 100644 --- a/config/waybar/style/Dark.css +++ b/config/waybar/style/Dark.css @@ -1,6 +1,8 @@ /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ /* Dark */ +@import '../../.cache/wal/colors-waybar.css'; + * { font-family: "JetBrainsMono Nerd Font"; font-weight: bold; @@ -25,21 +27,21 @@ window#waybar.empty { window#waybar.empty #window { padding: 0px; - margin: 0px; border: 0px; /* background-color: rgba(66,66,66,0.5); */ /* transparent */ background-color: transparent; } tooltip { - background: rgba(0, 0, 0, 0.6); + color: @foreground; + background: rgba(0, 0, 0, 0.8); border-radius: 10px; } tooltip label { - color: #cba6f7; - margin-right: 2px; - margin-left: 2px; + color: @foreground; + padding-right: 2px; + padding-left: 2px; } /*-----module groups----*/ @@ -47,33 +49,38 @@ tooltip label { background-color: rgba(0, 0, 0, 0.8); border: 0px solid #b4befe; border-radius: 10px; - padding-right: 2px; - padding-left: 2px; + padding-top: 2px; + padding-bottom: 2px; + padding-right: 4px; + padding-left: 4px; } .modules-center { background-color: rgba(0, 0, 0, 0.8); border: 0px solid #b4befe; border-radius: 10px; + padding-top: 2px; + padding-bottom: 2px; + padding-right: 4px; + padding-left: 4px; } .modules-left { background-color: rgba(0, 0, 0, 0.8); border: 0px solid #b4befe; border-radius: 10px; - padding-right: 2px; - padding-left: 2px; - + padding-top: 2px; + padding-bottom: 2px; + padding-right: 4px; + padding-left: 4px; } #workspaces button { - color: #6E6A86; + color: @color2; box-shadow: none; text-shadow: none; padding: 0px; border-radius: 9px; - margin-top: 3px; - margin-bottom: 3px; padding-left: 3px; padding-right: 3px; animation: gradient_f 20s ease-in infinite; @@ -81,12 +88,10 @@ tooltip label { } #workspaces button.active { - color: #cba6f7; + color: @foreground; border-radius: 15px 15px 15px 15px; - margin-left: 3px; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } @@ -155,7 +160,9 @@ tooltip label { #custom-weather.showyIcyDay, #custom-weather.snowyIcyNight, #custom-weather.sunnyDay { - color: #cba7f7; + color: @foreground; + padding-top: 2px; + padding-bottom: 2px; padding: 1px 4px; border-radius: 8px; } @@ -172,10 +179,8 @@ tooltip label { #taskbar button.active { background-color: #7f849c; - margin-left: 3px; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } diff --git a/config/waybar/style/Golden Noir.css b/config/waybar/style/Golden Noir.css index 54c7f60..ce7c2e2 100644 --- a/config/waybar/style/Golden Noir.css +++ b/config/waybar/style/Golden Noir.css @@ -32,7 +32,6 @@ window#waybar.empty { window#waybar.empty #window { padding: 0px; - margin: 0px; border: 0px; /* background-color: rgba(66,66,66,0.5); */ /* transparent */ @@ -51,6 +50,8 @@ tooltip { /*-----module groups----*/ .modules-right { + padding-top: 3px; + padding-bottom: 3px; padding-right: 5px; padding-left: 5px; @@ -60,14 +61,17 @@ tooltip { border-left: 1px solid #ffd700; border-right: 1px solid #ffd700; border-radius: 20px; - - + padding-top: 3px; + padding-bottom: 3px; + padding-right: 5px; + padding-left: 5px; } .modules-left { + padding-top: 3px; + padding-bottom: 3px; padding-right: 5px; padding-left: 5px; - } #workspaces button { @@ -76,8 +80,6 @@ tooltip { text-shadow: none; padding: 0px; border-radius: 9px; - margin-top: 3px; - margin-bottom: 3px; padding-left: 3px; padding-right: 3px; animation: gradient_f 20s ease-in infinite; @@ -89,10 +91,8 @@ tooltip { border-radius: 50%; background-color: black; border-radius: 15px 15px 15px 15px; - margin-left: 3px; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } @@ -166,8 +166,8 @@ tooltip { #custom-weather.snowyIcyNight, #custom-weather.sunnyDay { color: #e5d9f5; - padding-right: 10px; - padding-left: 15px; + padding-right: 8px; + padding-left: 8px; } #temperature.critical { @@ -182,10 +182,8 @@ tooltip { #taskbar button.active { background-color: rgb(47, 46, 46); - margin-left: 3px; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } diff --git a/config/waybar/style/Light.css b/config/waybar/style/Light.css index 669de75..0d4a40f 100644 --- a/config/waybar/style/Light.css +++ b/config/waybar/style/Light.css @@ -25,7 +25,6 @@ window#waybar.empty { window#waybar.empty #window { padding: 0px; - margin: 0px; border: 0px; /* background-color: rgba(66,66,66,0.5); */ /* transparent */ background-color: transparent; @@ -38,8 +37,8 @@ tooltip { tooltip label { color: #373737; - margin-right: 2px; - margin-left: 2px; + padding-right: 2px; + padding-left: 2px; } /*-----module groups----*/ @@ -47,23 +46,30 @@ tooltip label { background-color: rgba(232, 236, 241, 0.8); border: 0px solid #b4befe; border-radius: 10px; - padding-right: 2px; - padding-left: 2px; + padding-top: 2px; + padding-bottom: 2px; + padding-left: 4px; + padding-right: 4px; } .modules-center { background-color: rgba(232, 236, 241, 0.8); border: 0px solid #b4befe; border-radius: 10px; + padding-top: 2px; + padding-bottom: 2px; + padding-left: 4px; + padding-right: 4px; } .modules-left { background-color: rgba(232, 236, 241, 0.8); border: 0px solid #b4befe; border-radius: 10px; - padding-right: 2px; - padding-left: 2px; - + padding-top: 2px; + padding-bottom: 2px; + padding-left: 4px; + padding-right: 4px; } #workspaces button { @@ -72,8 +78,6 @@ tooltip label { text-shadow: none; padding: 0px; border-radius: 9px; - margin-top: 3px; - margin-bottom: 3px; padding-left: 3px; padding-right: 3px; animation: gradient_f 20s ease-in infinite; @@ -83,10 +87,8 @@ tooltip label { #workspaces button.active { color: #000000; border-radius: 15px 15px 15px 15px; - margin-left: 3px; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } @@ -173,10 +175,8 @@ tooltip label { #taskbar button.active { background-color: #585b70; color: #cdd6f4; - margin-left: 3px; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } @@ -196,6 +196,7 @@ tooltip label { animation-iteration-count: infinite; animation-direction: alternate; } + #pulseaudio-slider slider { min-width: 0px; min-height: 0px; @@ -204,16 +205,18 @@ tooltip label { border: none; box-shadow: none; } - + #pulseaudio-slider trough { - min-width: 80px; - min-height: 5px; + min-width: 80px; + min-height: 5px; border-radius: 5px; + background-color: #22252a; } - + #pulseaudio-slider highlight { - min-height: 10px; + min-height: 10px; border-radius: 5px; + background-color: #ba5663; } #backlight-slider slider { @@ -224,14 +227,16 @@ tooltip label { border: none; box-shadow: none; } - + #backlight-slider trough { - min-width: 80px; - min-height: 10px; + min-width: 80px; + min-height: 10px; border-radius: 5px; + background-color: #22252a; } - + #backlight-slider highlight { - min-width: 10px; + min-width: 10px; border-radius: 5px; -} + background-color: #ba5663; +} \ No newline at end of file diff --git a/config/waybar/style/Purpl.css b/config/waybar/style/Purpl.css index db0bafd..6aeb41b 100644 --- a/config/waybar/style/Purpl.css +++ b/config/waybar/style/Purpl.css @@ -31,14 +31,12 @@ window#waybar.empty { window#waybar.empty #window { padding: 0px; - margin: 0px; border: 0px; /* background-color: rgba(66,66,66,0.5); */ /* transparent */ background-color: transparent; } - tooltip { background: #1e1e2e; border-radius: 10px; @@ -53,8 +51,8 @@ tooltip { border: 5px solid #20052a; border-radius: 100px 0px 0px 0px; background-color: #3d174b; - padding-right: 5px; - padding-left: 5px; + padding-right: 10px; + padding-left: 10px; } .modules-center { @@ -68,20 +66,16 @@ tooltip { border: 5px solid #20052a; border-radius: 0px 0px 100px 0px; background-color: #441a53; - padding-right: 5px; - padding-left: 5px; - + padding-right: 10px; + padding-left: 10px; } #workspaces button { color: #6E6A86; - margin-right: 5px; box-shadow: none; text-shadow: none; padding: 0px; border-radius: 9px; - margin-top: 3px; - margin-bottom: 3px; padding-left: 3px; padding-right: 3px; animation: gradient_f 20s ease-in infinite; @@ -92,10 +86,8 @@ tooltip { color: #cba6f7; border-radius: 50%; background-color: black; - margin-left: 3px; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } @@ -181,10 +173,8 @@ tooltip { #taskbar button.active { background-color: purple; - margin-left: 3px; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } diff --git a/config/waybar/style/Pywal.css b/config/waybar/style/Pywal.css index ee7cb14..90a87f8 100644 --- a/config/waybar/style/Pywal.css +++ b/config/waybar/style/Pywal.css @@ -27,10 +27,7 @@ window#waybar.empty { window#waybar.empty #window { padding: 0px; - margin: 0px; border: 0px; - /* background-color: rgba(66,66,66,0.5); */ - /* transparent */ background-color: transparent; } @@ -40,34 +37,32 @@ tooltip { border-radius: 10px; border-width: 1px; border-style: solid; - border-color: @foreground; + border-color: @color2; } /*-----module groups----*/ .modules-right { border: 3px solid @color14; - border-radius: 100px 0px 0px 0px; + border-radius: 40px 0px 0px 0px; background-color: @color1; - padding-right: 2px; - padding-left: 2px; - + padding-left: 8px; + padding-right: 8px; } .modules-center { border: 3px solid @color14; - border-radius: 100px 0px 100px 0px; + border-radius: 60px 0px 60px 0px; background-color: @background; - - + padding-left: 8px; + padding-right: 8px; } .modules-left { - padding-right: 2px; - padding-left: 2px; border: 3px solid @color14; - border-radius: 0px 0px 100px 0px; + border-radius: 0px 0px 40px 0px; background-color: @color1; - + padding-left: 8px; + padding-right: 8px; } #workspaces button { @@ -76,8 +71,6 @@ tooltip { text-shadow: none; padding: 0px; border-radius: 9px; - margin-top: 3px; - margin-bottom: 3px; padding-left: 3px; padding-right: 3px; animation: gradient_f 20s ease-in infinite; @@ -85,12 +78,10 @@ tooltip { } #workspaces button.active { - color: @foreground; - background-color: @color0; - margin-left: 3px; + color: @background; + background-color: @color2; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } diff --git a/config/waybar/style/Rainbow Spectrum.css b/config/waybar/style/Rainbow Spectrum.css index 3a6df80..e0a03b1 100644 --- a/config/waybar/style/Rainbow Spectrum.css +++ b/config/waybar/style/Rainbow Spectrum.css @@ -6,7 +6,7 @@ font-family: "JetBrainsMono Nerd Font"; font-weight: bold; min-height: 0; /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */ -font-size: 96%; +font-size: 98%; font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; padding: 1px; } @@ -30,7 +30,6 @@ window#waybar.empty { window#waybar.empty #window { padding: 0px; - margin: 0px; border: 0px; /* background-color: rgba(66,66,66,0.5); */ /* transparent */ background-color: transparent; @@ -95,9 +94,10 @@ tooltip label{ #custom-weather.showyIcyDay, #custom-weather.snowyIcyNight, #custom-weather.sunnyDay { - border-radius: 8px; - margin: 4px 1px; + border-radius: 10px; padding: 0px 4px; + padding-top: 2px; + padding-bottom: 2px; color: #3A3B3C; border: 1px solid #b4befe; } @@ -170,8 +170,6 @@ tooltip label{ text-shadow: none; padding: 0px; border-radius: 9px; - margin-top: 3px; - margin-bottom: 3px; padding-left: 3px; padding-right: 3px; animation: gradient_f 20s ease-in infinite; @@ -181,15 +179,15 @@ tooltip label{ #workspaces button.active { background-color: #eba0ac; color: #3A3B3C; - margin-left: 3px; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } #workspaces button:hover { + background: #eb6f92; + color: #f6c177; padding-left: 3px; padding-right: 3px; animation: gradient_f 20s ease-in infinite; @@ -205,10 +203,8 @@ tooltip label{ #taskbar button.active { background-color: #b4befe; color: #3A3B3C; - margin-left: 3px; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } diff --git a/config/waybar/style/Rose-Pine.css b/config/waybar/style/Rose-Pine.css index 613e3d4..8df0c9f 100644 --- a/config/waybar/style/Rose-Pine.css +++ b/config/waybar/style/Rose-Pine.css @@ -36,8 +36,6 @@ tooltip { text-shadow: none; padding: 0px; border-radius: 9px; - margin-top: 3px; - margin-bottom: 3px; padding-left: 3px; padding-right: 3px; color: @main-fg; @@ -48,10 +46,8 @@ tooltip { #workspaces button.active { background: @wb-act-bg; color: @wb-act-fg; - margin-left: 3px; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } @@ -70,8 +66,6 @@ tooltip { text-shadow: none; padding: 0px; border-radius: 9px; - margin-top: 3px; - margin-bottom: 3px; padding-left: 3px; padding-right: 3px; color: @wb-color; @@ -82,10 +76,8 @@ tooltip { #taskbar button.active { background: @wb-act-bg; color: @wb-act-color; - margin-left: 3px; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } @@ -148,8 +140,8 @@ tooltip { color: @main-fg; background: @main-bg; opacity: 1; - padding-top: 2px; - padding-bottom: 2px; + padding-top: 3px; + padding-bottom: 3px; padding-left: 6px; padding-right: 6px; } diff --git a/config/waybar/style/Simple Pink.css b/config/waybar/style/Simple Pink.css index 3ebbe21..fda97d4 100644 --- a/config/waybar/style/Simple Pink.css +++ b/config/waybar/style/Simple Pink.css @@ -30,7 +30,6 @@ window#waybar.empty { window#waybar.empty #window { padding: 0px; - margin: 0px; border: 0px; /* background-color: rgba(66,66,66,0.5); */ /* transparent */ @@ -52,13 +51,18 @@ tooltip { border: 5px solid #19141b; border-radius: 50px 50px 50px 50px; background-color: #ba5663; + padding-top: 3px; + padding-bottom: 3px; padding-right: 10px; padding-left: 10px; - margin: 3px; } .modules-center { background-color: black; + padding-top: 3px; + padding-bottom: 3px; + padding-right: 10px; + padding-left: 10px; } @@ -67,6 +71,10 @@ tooltip { border: 5px solid #0d0a0f; border-radius: 50px 50px 50px 50px; background-color: #ba5663; + padding-top: 3px; + padding-bottom: 3px; + padding-right: 10px; + padding-left: 10px; } #workspaces button { @@ -75,8 +83,6 @@ tooltip { text-shadow: none; padding: 0px; border-radius: 9px; - margin-top: 3px; - margin-bottom: 3px; padding-left: 3px; padding-right: 3px; animation: gradient_f 20s ease-in infinite; @@ -85,11 +91,10 @@ tooltip { #workspaces button.active { color: whitesmoke; + background-color: pink; border-radius: 15px 15px 15px 15px; - margin-left: 3px; - padding-left: 12px; - padding-right: 12px; - margin-right: 3px; + padding-left: 10px; + padding-right: 10px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); @@ -163,7 +168,6 @@ tooltip { #custom-weather.sunnyDay { color: whitesmoke; padding: 0px 10px; - margin: 3px; } @@ -179,11 +183,8 @@ tooltip { #taskbar button.active { background-color: pink; - border: 1px solid #22252a; - margin-left: 3px; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } diff --git a/config/waybar/style/Translucent Chromatic.css b/config/waybar/style/Translucent Chromatic.css index 9b4aa40..338bf49 100644 --- a/config/waybar/style/Translucent Chromatic.css +++ b/config/waybar/style/Translucent Chromatic.css @@ -45,7 +45,6 @@ window#waybar.empty { window#waybar.empty #window { padding: 0px; - margin: 0px; border: 0px; /* background-color: rgba(66,66,66,0.5); */ /* transparent */ background-color: transparent; @@ -71,8 +70,6 @@ tooltip label{ text-shadow: none; padding: 0px; border-radius: 9px; - margin-top: 3px; - margin-bottom: 3px; padding-left: 3px; padding-right: 3px; animation: gradient_f 20s ease-in infinite; @@ -82,10 +79,8 @@ tooltip label{ #workspaces button.active { background-color: transparent; color: #D3D3D3; - margin-left: 3px; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } @@ -165,17 +160,14 @@ tooltip label{ #window, #workspaces { - margin: 0 4px; } /* If workspaces is the leftmost module, omit left margin */ .modules-left > widget:first-child > #workspaces { - margin-left: 0; } /* If workspaces is the rightmost module, omit right margin */ .modules-right > widget:last-child > #workspaces { - margin-right: 0; } #clock { @@ -313,10 +305,8 @@ label:focus { #taskbar button.active { background-color: #7f849c; - margin-left: 3px; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } @@ -345,18 +335,12 @@ label:focus { } #custom-language { - /* background: #bbccdd; - color: #333333; - padding: 0 5px; - margin: 4px 3px 6px 3px; */ color: @accent5; min-width: 16px; } #custom-separator { color: #606060; - margin: 0 1px; - padding-bottom: 5px; } #pulseaudio-slider slider { min-width: 0px; diff --git a/config/waybar/style/Transparent.css b/config/waybar/style/Transparent.css index 60b8341..5f7f852 100644 --- a/config/waybar/style/Transparent.css +++ b/config/waybar/style/Transparent.css @@ -29,7 +29,6 @@ window#waybar.empty { window#waybar.empty #window { padding: 0px; - margin: 0px; border: 0px; background-color: transparent; } @@ -58,13 +57,10 @@ tooltip { #workspaces button { color: #6E6A86; - margin-right: 5px; box-shadow: none; text-shadow: none; padding: 0px; border-radius: 9px; - margin-top: 3px; - margin-bottom: 3px; padding-left: 3px; padding-right: 3px; animation: gradient_f 20s ease-in infinite; @@ -74,10 +70,8 @@ tooltip { #workspaces button.active { color: whitesmoke; border-radius: 15px 15px 15px 15px; - margin-left: 3px; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } @@ -166,10 +160,8 @@ tooltip { #taskbar button.active { background-color: #7f849c; - margin-left: 3px; padding-left: 12px; padding-right: 12px; - margin-right: 3px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } @@ -193,14 +185,14 @@ tooltip { } #pulseaudio-slider trough { - min-width: 80px; /* Ajusta el ancho según tus preferencias */ - min-height: 10px; /* Ajusta la altura según tus preferencias */ + min-width: 80px; + min-height: 10px; border-radius: 5px; background-color: black; } #pulseaudio-slider highlight { - min-height: 10px; /* Ajusta la altura según tus preferencias */ + min-height: 10px; border-radius: 5px; background-color: wheat; } @@ -215,14 +207,14 @@ tooltip { } #backlight-slider trough { - min-width: 80px; /* Ajusta el ancho según tus preferencias */ - min-height: 10px; /* Ajusta la altura según tus preferencias */ + min-width: 80px; + min-height: 10px; border-radius: 5px; background-color: black; } #backlight-slider highlight { - min-width: 10px; /* Ajusta el ancho según tus preferencias */ + min-width: 10px; border-radius: 5px; background-color: wheat; } diff --git a/wallpapers/Dynamic-Wallpapers/Dark/highway_dark.jpg b/wallpapers/Dynamic-Wallpapers/Dark/highway_dark.jpg new file mode 100644 index 0000000000000000000000000000000000000000..ad1eed8aad77509c7f35331c49364992c1c4fc03 GIT binary patch literal 274916 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