From a4c28e719e69177cb9e2d6c498a796b95c4c3106 Mon Sep 17 00:00:00 2001 From: Tuan-Dat Tran Date: Fri, 22 Mar 2024 13:26:13 +0100 Subject: [PATCH] Updated dunst and added automatic monitor switching Signed-off-by: Tuan-Dat Tran --- README.md | 30 +- config/.config/dunst/dunstrc | 299 ++++++++++++++----- config/.config/i3/config | 10 +- config/.config/zellij/config.kdl | 1 + config/.gitconfig | 1 - config/.scripts/{screen.sh => brightness.sh} | 0 config/.scripts/startup.sh | 58 ++-- 7 files changed, 293 insertions(+), 106 deletions(-) rename config/.scripts/{screen.sh => brightness.sh} (100%) diff --git a/README.md b/README.md index ba8a970..09a6138 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,9 @@ pavucontrol btrfs-progs udiskie blueman acpi acpid tlp conky stow openssh xsel \ firefox veracrypt keepassxc ranger rofi chromium delta-git tesseract-data-eng \ neofetch xf86-video-amdgpu lib32-mesa libva-mesa-driver lxappearance mesa-vdpau \ lib32-libva-mesa-driver lib32-mesa-vdpau tesseract-data-eng p7zip pandoc-cli \ -nvtop wireguard-tools nmap bind wireshark-qt iperf3 cargo-flamegraph +nvtop wireguard-tools nmap bind wireshark-qt iperf3 cargo-flamegraph amd-ucode \ +ethtool smartmontools adobe-source-han-sans-kr-fonts docker docker-compose \ +docker-buildx systemd-resolvconf tailscale cargo-bloat brotherconfig4 ``` ## Picture @@ -26,9 +28,18 @@ nvtop wireguard-tools nmap bind wireshark-qt iperf3 cargo-flamegraph ## Permissions +### sudo + +```sh +echo "%$SUDOGRP ALL=(ALL) ALL" >> /etc/sudoers +``` + +### Groups + ```sh usermod -a -G network $USER usermod -a -G video $USER +usermod -a -G docker $USER usermod -a -G $SUDOGRP $USER ``` @@ -68,3 +79,20 @@ EDITOR=/usr/bin/nvim ``` to `/etc/environment`. + +## Systemd + +Enable: + +- tlp +- acpid + +## Printer MFC + +I notice this is becoming more of a documentation on how to set my own laptop, +but... +¯\_(ツ)_/¯ + +```sh +sudo brsaneconfig4 -a name=MFC-L2710DW model=MFC-L2710DW nodename=192.168.50.219 +``` diff --git a/config/.config/dunst/dunstrc b/config/.config/dunst/dunstrc index c17b0a8..01da749 100644 --- a/config/.config/dunst/dunstrc +++ b/config/.config/dunst/dunstrc @@ -1,4 +1,4 @@ -# From https://github.com/addy-dclxvi/almighty-dotfiles +# See dunst(5) for all configuration options [global] ### Display ### @@ -17,42 +17,68 @@ # # If this option is set to mouse or keyboard, the monitor option # will be ignored. - follow = mouse + follow = none - # 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 = "250x-50-30+20" + ### Geometry ### - # Show how many messages are currently hidden (because of geometry). + # dynamic width from 0 to 300 + # width = (0, 300) + # constant width of 300 + width = 300 + + # 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 = 10x50 + + # 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 = 0 + + # Show how many messages are currently hidden (because of + # notification_limit). 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.). + # present (e.g. xcompmgr, compiz, etc.). (X11 only) transparency = 0 - # The height of the entire notification. If the height is smaller - # than the font height and padding combined, it will be raised - # to the font height and padding. - notification_height = 0 - # Draw a line of "separator_height" pixel height between two # notifications. # Set to 0 to disable. + # If gap_size is greater than 0, this setting will be ignored. separator_height = 4 # Padding between text and separator. @@ -61,6 +87,9 @@ # Horizontal padding. horizontal_padding = 16 + # 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 = 2 @@ -68,6 +97,12 @@ # Defines color of the frame around the notification window. frame_color = "#2f343f" + # 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; @@ -76,21 +111,28 @@ # * anything else will be interpreted as a X color. separator_color = frame - # Sort messages by urgency. + # Sort type. + # possible values are: + # * id: sort by id + # * urgency_ascending: sort by urgency (low then normal then critical) + # * urgency_descending: sort by urgency (critical then normal then low) + # * update: sort by update (most recent always at the top) 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. - idle_threshold = 120 + # 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 = Roboto 8 + font = Monospace 8 # The spacing between lines. If the height is smaller than the # font height, it will get raised to the font height. - line_height = 4 + line_height = 0 # Possible values are: # full: Allow a small subset of html markup in notifications: @@ -100,7 +142,7 @@ # 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 @@ -124,6 +166,7 @@ # %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" @@ -131,40 +174,55 @@ # Possible values are "left", "center" and "right". alignment = left + # Vertical alignment of message text and icon. + # Possible values are "top", "center" and "bottom". + vertical_alignment = center + # Show age of message if message is older than show_age_threshold # seconds. # Set to -1 to disable. show_age_threshold = 60 - # Split notifications into multiple lines if they don't fit into - # geometry. - word_wrap = yes + # 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 - # Merge multiple notifications with the same content + # Stack together notifications with the same content stack_duplicates = true - # Sets the stack tag for the notification, notifications with the same (non-empty) stack tag will replace each-other so only the newest one is visible. - set_stack_tag = "tag" - - # Hide the count of merged notifications with the same content - hide_duplicate_count = 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 = off + # 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 = Adwaita + # 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 = 32 + max_icon_size = 128 - # Paths to default icons. - icon_folders = /usr/share/icons/Arc/status/16/:/usr/share/icons/Arc/devices/16/ + # 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 ### @@ -181,7 +239,7 @@ dmenu = /usr/bin/dmenu -p dunst: # Browser for opening urls in context menu. - browser = /usr/bin/firefox -new-tab + browser = /usr/bin/xdg-open # Always run rule-defined scripts, even if the notification is suppressed always_run_script = true @@ -192,10 +250,28 @@ # 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 + # 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 = 0 + + # 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 @@ -209,6 +285,25 @@ # 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] @@ -219,27 +314,6 @@ # where there are multiple screens with very different dpi values. per_monitor_dpi = false -[shortcuts] - - # Shortcuts are specified as [modifier+][modifier+]...key - # Available modifiers are "ctrl", "mod1" (the alt-key), "mod2", - # "mod3" and "mod4" (windows-key). - # Xev might be helpful to find names for keys. - - # Close notification. - close = ctrl+space - - # Close all notifications. - close_all = ctrl+shift+space - - # Redisplay last message(s). - # On the US keyboard layout "grave" is normally above TAB and left - # of "1". Make sure this key actually exists on your keyboard layout, - # e.g. check output of 'xmodmap -pke' - history = ctrl+grave - - # Context menu. - context = ctrl+shift+period [urgency_low] # IMPORTANT: colors have to be defined in quotation marks. @@ -267,11 +341,50 @@ # 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", "summary", "body", "icon", "category", -# "msg_urgency" and you can override the "timeout", "urgency", "foreground", -# "background", "new_icon" and "format". +# +# 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 +# override_pause_level +# # 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. +# +# You can also allow a notification to appear even when paused. Notification will appear whenever notification's override_pause_level >= dunst's paused level. +# This can be used to set partial pause modes, where more urgent notifications get through, but less urgent stay paused. To do that, you can override the following in the rules: +# override_pause_level = X + # SCRIPTING # You can specify a script that gets run when the rule matches by # setting the "script" option. @@ -279,11 +392,33 @@ # 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 @@ -295,13 +430,18 @@ #[ignore] # # This notification will not be displayed # summary = "foobar" -# format = "" +# 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*" @@ -322,5 +462,8 @@ # summary = *twitter.com* # urgency = normal # +#[stack-volumes] +# appname = "some_volume_notifiers" +# set_stack_tag = "volume" +# # vim: ft=cfg - diff --git a/config/.config/i3/config b/config/.config/i3/config index d5f3837..8929ea0 100644 --- a/config/.config/i3/config +++ b/config/.config/i3/config @@ -93,7 +93,7 @@ exec --no-startup-id conky -c ~/.conky/syclo-crimson-bottomleft.conkyrc exec --no-startup-id dunst exec --no-startup-id ~/.scripts/startup.sh exec --no-startup-id syncthing serve --no-browser -exec --no-startup-id feh --randomize --bg-fill $HOME/Pictures/Wallpaper/* +exec --no-startup-id feh --randomize --bg-fill $HOME/Pictures/Wallpaper/basic/* ############################################################################### ################################# Keybindings ################################# @@ -114,8 +114,8 @@ bindsym $mod+Shift+q kill bindsym $mod+d exec --no-startup-id $HOME/.config/rofi/launchers/type-1/launcher.sh # Screen brightness controls -bindsym XF86MonBrightnessUp exec --no-startup-id ~/.scripts/screen.sh up -bindsym XF86MonBrightnessDown exec --no-startup-id ~/.scripts/screen.sh down +bindsym XF86MonBrightnessUp exec --no-startup-id ~/.scripts/brightness.sh up +bindsym XF86MonBrightnessDown exec --no-startup-id ~/.scripts/brightness.sh down # Pulse Audio controls bindsym XF86AudioLowerVolume exec --no-startup-id ~/.scripts/sound.sh down @@ -128,9 +128,9 @@ bindsym XF86AudioPrevious exec "playerctl previous" bindsym XF86AudioMicMute exec "amixer set Capture toggle" # F9-F12 on Thinkpad -bindsym XF86Display exec lxrandr +bindsym XF86Display exec autorandr --cycle bindsym XF86Messenger exec signal-desktop -bindsym XF86Go exec dunstify -r 3 "Go" +bindsym XF86Go exec blueman-manager bindsym Cancel exec dunstify -r 3 "Cancel" bindsym XF86Favorites exec dunstify -r 3 "Favorites" diff --git a/config/.config/zellij/config.kdl b/config/.config/zellij/config.kdl index 892104d..0dc4db2 100644 --- a/config/.config/zellij/config.kdl +++ b/config/.config/zellij/config.kdl @@ -222,6 +222,7 @@ plugins { // For more examples, see: https://github.com/zellij-org/zellij/tree/main/example/themes // Once these themes are defined, one of them should to be selected in the "theme" section of this file // +// themes { tokyo-night-dark { fg 169 177 214 diff --git a/config/.gitconfig b/config/.gitconfig index 7460846..b708772 100644 --- a/config/.gitconfig +++ b/config/.gitconfig @@ -10,7 +10,6 @@ [delta] navigate = true # use n and N to move between diff sections - light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal) [merge] conflictstyle = diff3 diff --git a/config/.scripts/screen.sh b/config/.scripts/brightness.sh similarity index 100% rename from config/.scripts/screen.sh rename to config/.scripts/brightness.sh diff --git a/config/.scripts/startup.sh b/config/.scripts/startup.sh index 0e4e603..773627d 100755 --- a/config/.scripts/startup.sh +++ b/config/.scripts/startup.sh @@ -1,38 +1,54 @@ #!/bin/sh -type xset >/dev/null 2>&1 || { echo >&2 "I require xset but it's not installed. Aborting."; exit 1; } - lower_battery_threshold=10 KBD=""; oldKBD=""; +intern="eDP"; +extern="HDMI-A-0"; function kb_routine { - oldKBD="$KBD"; - case "$(xset -q | grep -A 0 'LED' | cut -c59-67)" in - "00000000") - KBD="Europe" ;; - "00001000") - KBD="Deutsch" ;; - *) KBD="unknown" ;; - esac + oldKBD="$KBD"; + case "$(xset -q | grep -A 0 'LED' | cut -c59-67)" in + "00000000") + KBD="Europe" ;; + "00001000") + KBD="Deutsch" ;; + *) KBD="unknown" ;; + esac - if [ "$KBD" != "$oldKBD" ]; then - dunstify -r 1 "$KBD"; - fi + if [ "$KBD" != "$oldKBD" ]; then + dunstify -r 1 "$KBD"; + fi } function battery_routine { - capacity=$(< /sys/class/power_supply/BAT0/capacity) - if [[ $capacity -lt lower_battery_threshold ]]; then - acpi | grep -q '0: Discharging' && dunstify "Battery at $capacity%"; - sleep 60; - fi + capacity=$(< /sys/class/power_supply/BAT0/capacity) + if [[ $capacity -lt lower_battery_threshold ]]; then + acpi | grep -q '0: Discharging' && dunstify "Battery at $capacity%"; + sleep 60; + fi } + +function monitor { + oldmonstats="$monstats" + if xrandr | grep "$extern disconnected"; then + monstats="$intern" + xrandr --output "$extern" --off --output "$intern" --auto + else + monstats="$extern" + xrandr --output "$intern" --off --output "$extern" --auto + fi + + if [ "$oldmonstats" != "$monstats" ]; then + dunstify -r 1 "Using $monstats."; + fi +} while : do - kb_routine - battery_routine - sleep 1; + kb_routine; + battery_routine; + monitor; + sleep 1; done