From 92d86f879e4c19bb9db27b940f783aad4506fc59 Mon Sep 17 00:00:00 2001 From: lostecho <752549025@qq.com> Date: Sat, 15 Jul 2023 16:07:30 +0800 Subject: [PATCH] update config file --- config.yaml | 4 + dotfiles/config/dunst/dunstrc | 461 ---------------------- dotfiles/config/hypr/hyprland.conf | 28 +- dotfiles/config/mako/config | 22 ++ dotfiles/config/swaylock/config | 62 +-- dotfiles/config/swaylock/qt5ct/qt5ct.conf | 28 -- dotfiles/config/waybar/config.jsonc | 10 +- dotfiles/config/waybar/scripts/brightness | 0 8 files changed, 90 insertions(+), 525 deletions(-) delete mode 100644 dotfiles/config/dunst/dunstrc create mode 100644 dotfiles/config/mako/config delete mode 100644 dotfiles/config/swaylock/qt5ct/qt5ct.conf mode change 100644 => 100755 dotfiles/config/waybar/scripts/brightness diff --git a/config.yaml b/config.yaml index 74229a5..feda4f9 100644 --- a/config.yaml +++ b/config.yaml @@ -29,6 +29,9 @@ dotfiles: f_software: src: software dst: ~/.software + d_mako: + src: config/mako + dst: ~/.config/mako profiles: lostecho-nuc11pahi5: dotfiles: @@ -39,3 +42,4 @@ profiles: - d_kitty - d_swaylock - f_software + - d_mako diff --git a/dotfiles/config/dunst/dunstrc b/dotfiles/config/dunst/dunstrc deleted file mode 100644 index c504bd9..0000000 --- a/dotfiles/config/dunst/dunstrc +++ /dev/null @@ -1,461 +0,0 @@ -# See dunst(5) for all configuration options - -[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 = none - - ### Geometry ### - - # dynamic width from 0 to 300 - # width = (0, 300) - # constant width of 300 - width = 500 - - # The maximum height of a single notification, excluding the frame. - height = 300 - - # Position the notification in the top right corner - origin = top-right - - # Offset from the origin - offset = 10x10 - - # Scale factor. It is auto-detected if value is 0. - scale = 0 - - # Maximum number of notification (0 means no limit) - notification_limit = 20 - - ### Progress bar ### - - # Turn on the progess bar. It appears when a progress hint is passed with - # for example dunstify -h int:value:12 - progress_bar = true - - # Set the progress bar height. This includes the frame, so make sure - # it's at least twice as big as the frame width. - progress_bar_height = 10 - - # Set the frame width of the progress bar - progress_bar_frame_width = 1 - - # Set the minimum width for the progress bar - progress_bar_min_width = 150 - - # Set the maximum width for the progress bar - progress_bar_max_width = 300 - - # Corner radius for the progress bar. 0 disables rounded corners. - progress_bar_corner_radius = 0 - - # Corner radius for the icon image. - icon_corner_radius = 8 - - # Show how many messages are currently hidden (because of - # notification_limit). - indicate_hidden = yes - - # 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.). (X11 only) - transparency = 30 - - # Draw a line of "separator_height" pixel height between two - # notifications. - # Set to 0 to disable. - # If gap_size is greater than 0, this setting will be ignored. - separator_height = 2 - - # Padding between text and separator. - padding = 8 - - # Horizontal padding. - horizontal_padding = 8 - - # Padding between text and icon. - text_icon_padding = 0 - - # Defines width in pixels of frame around the notification window. - # Set to 0 to disable. - frame_width = 3 - - # Defines color of the frame around the notification window. - frame_color = "#f5c2e7" - - # Size of gap to display between notifications - requires a compositor. - # If value is greater than 0, separator_height will be ignored and a border - # of size frame_width will be drawn around each notification instead. - # Click events on gaps do not currently propagate to applications below. - gap_size = 0 - - # Define a color for the separator. - # possible values are: - # * auto: dunst tries to find a color fitting to the background; - # * foreground: use the same color as the foreground; - # * frame: use the same color as the frame; - # * anything else will be interpreted as a X color. - separator_color = frame - - # Sort messages by urgency. - sort = yes - - # Don't remove messages, if the user is idle (no mouse or keyboard input) - # for longer than idle_threshold seconds. - # Set to 0 to disable. - # A client can set the 'transient' hint to bypass this. See the rules - # section for how to disable this if necessary - # idle_threshold = 120 - - ### Text ### - - font = JetBrains Mono Nerd Font 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 = right - - # Vertical alignment of message text and icon. - # Possible values are "top", "center" and "bottom". - vertical_alignment = center - - # Show age of message if message is older than show_age_threshold - # seconds. - # Set to -1 to disable. - show_age_threshold = 60 - - # 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 ### - - # Recursive icon lookup. You can set a single theme, instead of having to - # define all lookup paths. - enable_recursive_icon_lookup = true - - # Set icon theme (only used for recursive icon lookup) - icon_theme = candy-icons - # You can also set multiple icon themes, with the leftmost one being used first. - # icon_theme = "Adwaita, breeze" - - # Align icons left/right/top/off - icon_position = left - - # Scale small icons up to this size, set to 0 to disable. Helpful - # for e.g. small files or high-dpi screens. In case of conflict, - # max_icon_size takes precedence over this. - min_icon_size = 32 - - # Scale larger icons down to this size, set to 0 to disable - max_icon_size = 64 - - # Paths to default icons (only neccesary when not using recursive icon lookup) - icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/ - - ### History ### - - # Should a notification popped up from history be sticky or timeout - # as if it would normally do. - sticky_history = yes - - # Maximum amount of notifications kept in history - history_length = 20 - - ### Misc/Advanced ### - - # dmenu path. - dmenu = /usr/bin/dmenu -p dunst: - - # Browser for opening urls in context menu. - browser = /usr/bin/xdg-open - - # 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 = 15 - - # Ignore the dbus closeNotification message. - # Useful to enforce the timeout set by dunst configuration. Without this - # parameter, an application may close the notification sent before the - # user defined timeout. - ignore_dbusclose = false - - ### Wayland ### - # These settings are Wayland-specific. They have no effect when using X11 - - # Uncomment this if you want to let notications appear under fullscreen - # applications (default: overlay) - # layer = top - - # Set this to true to use X11 output on Wayland. - force_xwayland = false - - ### Legacy - - # Use the Xinerama extension instead of RandR for multi-monitor support. - # This setting is provided for compatibility with older nVidia drivers that - # do not support RandR and using it on systems that support RandR is highly - # discouraged. - # - # By enabling this setting dunst will not be able to detect when a monitor - # is connected or disconnected which might break follow mode if the screen - # layout changes. - force_xinerama = false - - ### mouse - - # Defines list of actions for each mouse event - # Possible values are: - # * none: Don't do anything. - # * do_action: Invoke the action determined by the action_name rule. If there is no - # such action, open the context menu. - # * open_url: If the notification has exactly one url, open it. If there are multiple - # ones, open the context menu. - # * close_current: Close current notification. - # * close_all: Close all notifications. - # * context: Open context menu for the notification. - # * context_all: Open context menu for all notifications. - # These values can be strung together for each mouse event, and - # will be executed in sequence. - mouse_left_click = close_current - mouse_middle_click = do_action, close_current - mouse_right_click = close_all - -# 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 = "#1e1e2e" - foreground = "#cdd6f4" - frame_color = "#f5c2e7" - timeout = 10 - # Icon for notifications with low urgency, uncomment to enable - #default_icon = /path/to/icon - -[urgency_normal] - background = "#1e1e2e" - foreground = "#cdd6f4" - frame_color = "#cba6f7" - timeout = 10 - # Icon for notifications with normal urgency, uncomment to enable - #default_icon = /path/to/icon - -[urgency_critical] - background = "#1e1e2e" - foreground = "#cdd6f4" - frame_color = "#f38ba8" - timeout = 0 - # Icon for notifications with critical urgency, uncomment to enable - #default_icon = /path/to/icon - -# Every section that isn't one of the above is interpreted as a rules to -# override settings for certain messages. -# -# Messages can be matched by -# appname (discouraged, see desktop_entry) -# body -# category -# desktop_entry -# icon -# match_transient -# msg_urgency -# stack_tag -# summary -# -# and you can override the -# background -# foreground -# format -# frame_color -# fullscreen -# new_icon -# set_stack_tag -# set_transient -# set_category -# timeout -# urgency -# icon_position -# skip_display -# history_ignore -# action_name -# word_wrap -# ellipsize -# alignment -# hide_text -# -# 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: 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" -# skip_display = true - -#[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/dotfiles/config/hypr/hyprland.conf b/dotfiles/config/hypr/hyprland.conf index 88ae091..ebfc276 100644 --- a/dotfiles/config/hypr/hyprland.conf +++ b/dotfiles/config/hypr/hyprland.conf @@ -26,7 +26,7 @@ exec-once = ~/.local/share/hyprload/hyprload.sh #exec = ~/.config/HyprV/hyprv_util setbg exec-once = /usr/lib/polkit-kde-authentication-agent-1 exec-once = waybar # status bar -exec-once = dunst # notification daemon +exec-once = mako # notification daemon exec-once = blueman-applet exec-once = nm-applet --indicator # Systray app for Network/Wifi exec-once = fcitx5 --replace -d # input method @@ -215,11 +215,11 @@ bind = $mainMod, E, exec, thunar bind = $mainMod, O, exec, obsidian bind = $mainMod, P, exec, logseq bind = $mainMod, L, exec, swaylock # Lock the screen -bind = $mainMod, G, exec, google-chrome-stable +bind = $mainMod, G, exec, google-chrome-unstable bind = $mainMod, C, killactive, bind = $mainMod, M, exec, nwg-bar #bind = $mainMod, M, exec, wlogout --protocol layer-shell # show the logout window -bind = $mainMod, W, exec, google-chrome-stable --profile-directory=Default --app-id=magamgmomalmppfcmkgppgboggkfiphd +bind = $mainMod, W, exec, google-chrome-unstable --profile-directory=Default --app-id=magamgmomalmppfcmkgppgboggkfiphd # bind = $mainMod, V, exec, cliphist list | rofi -dmenu | cliphist decode | wl-copy # bind = $mainMod, U, exec, grim -g "$(slurp)" - | wl-copy # bind = $mainMod SHIFT, U, exec, grim $screen_file @@ -272,11 +272,25 @@ bindm = $mainMod SHIFT, mouse:272, resizewindow bindm = $mainMod, mouse:273, resizewindow # Brightness control -binde = $mainMod SHIFT, L, exec, ddcutil setvcp 10 + 10 -binde = $mainMod SHIFT, K, exec, ddcutil setvcp 10 - 10 +binde = $mainMod, XF86AudioRaiseVolume, exec, ddcutil setvcp 10 + 10 +binde = $mainMod, XF86AudioLowerVolume, exec, ddcutil setvcp 10 - 10 +#binde = , XF86MonBrightnessUp, exec, ddcutil setvcp 10 + 10 +#binde = , XF86MonBrightnessDown, exec, ddcutil setvcp 10 - 10 +#binde = $mainMod SHIFT, L, exec, ddcutil setvcp 10 + 10 +#binde = $mainMod SHIFT, K, exec, ddcutil setvcp 10 - 10 #binde = $mainMod SHIFT, L, exec, brightnessctl set 5%+ #binde = $mainMod SHIFT, K, exec, brightnessctl set 5%- # Sound control -binde = $mainMod SHIFT, O, exec, pamixer -d 5 -binde = $mainMod SHIFT, P, exec, pamixer -i 5 +binde = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +1% +binde = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -1% +binde = , XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle +#binde = $mainMod SHIFT, O, exec, pamixer -d 5 +#binde = $mainMod SHIFT, P, exec, pamixer -i 5 + +# Player control +#binde = , XF86AudioPlay, exec, playerctl play +#binde = , XF86AudioPause, exec, playerctl pause +binde = , XF86AudioPlay, exec, playerctl play-pause +binde = , XF86AudioNext, exec, playerctl next +binde - , XF86AudioPrev, exec, playerctl previous diff --git a/dotfiles/config/mako/config b/dotfiles/config/mako/config new file mode 100644 index 0000000..7edd1f4 --- /dev/null +++ b/dotfiles/config/mako/config @@ -0,0 +1,22 @@ +font=UbuntuMono 12.5 + +background-color=#404552 +text-color=#e5e9f0 +width=315 +height=200 +padding=10 +margin=10 +progress-color=over #eceff480 +icon-path=/usr/share/icons/Arc-X-D +max-icon-size=70 +layer=overlay + +border-size=5 +border-radius=0 +border-color=#5294e2 + +default-timeout=5000 + +[urgency=high] + +ignore-timeout=1 diff --git a/dotfiles/config/swaylock/config b/dotfiles/config/swaylock/config index 11e7bae..7ae89de 100644 --- a/dotfiles/config/swaylock/config +++ b/dotfiles/config/swaylock/config @@ -1,24 +1,38 @@ -# indicator -# no-unlock-indicator -# daemonize -indicator-caps-lock -# datestr=%A -image=$HOME/.config/sway/swaylock.png -scaling=fill -font=UbuntuMono -font-size=20 - -# Ring -indicator-radius=115 -# line-uses-ring -line-color=#3b4252 -text-color=#d8dee9 -inside-color=#2e344098 -inside-ver-color=#5e81ac -line-ver-color=#5e81ac -ring-ver-color=#5e81ac98 -ring-color=#4c566a -key-hl-color=#5e81ac -separator-color=#4c566a -layout-text-color=#eceff4 -line-wrong-color=#d08770 +daemonize +show-failed-attempts +clock +screenshot +effect-blur=9x5 +effect-vignette=0.5:0.5 +color=1f1d2e80 +font="Inter" +indicator +indicator-radius=200 +indicator-thickness=20 +line-color=1f1d2e +ring-color=191724 +inside-color=1f1d2e +key-hl-color=eb6f92 +separator-color=00000000 +text-color=e0def4 +text-caps-lock-color="" +line-ver-color=eb6f92 +ring-ver-color=eb6f92 +inside-ver-color=1f1d2e +text-ver-color=e0def4 +ring-wrong-color=31748f +text-wrong-color=31748f +inside-wrong-color=1f1d2e +inside-clear-color=1f1d2e +text-clear-color=e0def4 +ring-clear-color=9ccfd8 +line-clear-color=1f1d2e +line-wrong-color=1f1d2e +bs-hl-color=31748f +grace=2 +grace-no-mouse +grace-no-touch +datestr=%a, %B %e +timestr=%I:%M %p +fade-in=0.2 +ignore-empty-password diff --git a/dotfiles/config/swaylock/qt5ct/qt5ct.conf b/dotfiles/config/swaylock/qt5ct/qt5ct.conf deleted file mode 100644 index b32291b..0000000 --- a/dotfiles/config/swaylock/qt5ct/qt5ct.conf +++ /dev/null @@ -1,28 +0,0 @@ -[Appearance] -color_scheme_path=/usr/share/qt5ct/colors/airy.conf -custom_palette=false -icon_theme=Papirus -standard_dialogs=default -style=kvantum-dark - -[Fonts] -fixed=@Variant(\0\0\0@\0\0\0\x12\0\x43\0\x61\0n\0t\0\x61\0r\0\x65\0l\0l@$\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10) -general=@Variant(\0\0\0@\0\0\0\x12\0\x43\0\x61\0n\0t\0\x61\0r\0\x65\0l\0l@$\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10) - -[Interface] -activate_item_on_single_click=1 -buttonbox_layout=0 -cursor_flash_time=1000 -dialog_buttons_have_icons=1 -double_click_interval=400 -gui_effects=@Invalid() -keyboard_scheme=2 -menus_have_icons=true -show_shortcuts_in_context_menus=true -stylesheets=@Invalid() -toolbutton_style=4 -underline_shortcut=1 -wheel_scroll_lines=3 - -[SettingsWindow] -geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\a\x80\0\0\0\"\0\0\v:\0\0\x4\x1c\0\0\a\x80\0\0\0\"\0\0\xe\xff\0\0\x4\x37\0\0\0\0\x2\0\0\0\a\x80\0\0\a\x80\0\0\0\"\0\0\v:\0\0\x4\x1c) diff --git a/dotfiles/config/waybar/config.jsonc b/dotfiles/config/waybar/config.jsonc index b227774..13b73ef 100644 --- a/dotfiles/config/waybar/config.jsonc +++ b/dotfiles/config/waybar/config.jsonc @@ -173,10 +173,10 @@ }, "pulseaudio": { "scroll-step": 1, // %, can be a float - "format": "{volume}% {icon}", - "format-bluetooth": "{volume}% {icon}  {format_source}", + "format": "{icon} {volume}%", + "format-bluetooth": "{icon} {volume}%  {format_source}", "format-bluetooth-muted": " {icon}  {format_source}", - "format-muted": "婢 {format_source}", + "format-muted": " ", "format-source": "{volume}% ", "format-source-muted": "", "format-icons": { @@ -189,8 +189,8 @@ "default": [""] }, "on-click": "pavucontrol", - "on-scroll-up": "pactl set-sink-volume @DEFAULT_SINK@ +2%", - "on-scroll-down": "pactl set-sink-volume @DEFAULT_SINK@ -2%", + "on-scroll-up": "pactl set-sink-volume @DEFAULT_SINK@ +1%", + "on-scroll-down": "pactl set-sink-volume @DEFAULT_SINK@ -1%", }, "pulseaudio_pamixer": { "format": "{icon}", diff --git a/dotfiles/config/waybar/scripts/brightness b/dotfiles/config/waybar/scripts/brightness old mode 100644 new mode 100755