From 173bd00aea3499aa2a4d62672b5cf7debd829adc Mon Sep 17 00:00:00 2001 From: Andrew Scott Date: Tue, 24 Jan 2023 15:10:27 -0500 Subject: [PATCH] Switched to Artix on laptop --- dot_config/bspwm/executable_bspwmrc.tmpl | 28 +-- dot_config/dunst/dunstrc | 212 ++++++++++++--------- dot_config/picom/picom.conf | 8 +- dot_config/sxhkd/executable_sxhkdrc.tmpl | 2 +- dot_config/tint2/tint2rc | 4 +- dot_local/bin/executable_pipewire-launcher | 21 ++ dot_xinitrc.tmpl | 13 +- 7 files changed, 178 insertions(+), 110 deletions(-) create mode 100644 dot_local/bin/executable_pipewire-launcher diff --git a/dot_config/bspwm/executable_bspwmrc.tmpl b/dot_config/bspwm/executable_bspwmrc.tmpl index d157e08..02c6a0d 100644 --- a/dot_config/bspwm/executable_bspwmrc.tmpl +++ b/dot_config/bspwm/executable_bspwmrc.tmpl @@ -31,8 +31,10 @@ bspc rule -a Blueberry.py state=floating bspc rule -a Bitwarden state=floating bspc rule -a Leafpad state=floating bspc rule -a KeePassXC state=floating +bspc rule -a Mousepad state=floating bspc rule -a firefox desktop='^1' follow=on +bspc rule -a firefoxdeveloperedition desktop='^1' follow=on bspc rule -a Chromium desktop='^2' follow=on bspc rule -a Vivaldi-stable desktop='^2' follow=on bspc rule -a Evince desktop='4' follow=on @@ -52,6 +54,7 @@ bspc rule -a Dino desktop='^8' bspc rule -a Gajim desktop='^8' bspc rule -a discord desktop='^8' bspc rule -a Element desktop='^9' +bspc rule -a Mattermost desktop='^9' bspc rule -a Slack desktop='^9' bspc rule -a teams-for-linux desktop='^9' bspc rule -a thunderbird desktop='^10' @@ -65,20 +68,23 @@ grep -x sxhkd > /dev/null || sxhkd & /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 & xss-lock -n /usr/lib/xsecurelock/dimmer -l -- xsecurelock & xsettingsd & +{{- if eq .chezmoi.hostname "helix" }} +$HOME/.local/bin/pipewire-launcher & +{{- end }} +{{- if (or (eq .chezmoi.hostname "helix") (eq .chezmoi.hostname "triangulum")) }} +xidlehook --not-when-fullscreen --timer 120 "killall -q redshift && xrandr --output eDP-1 --brightness .1" "xrandr --output eDP-1 --brightness 1 && redshift -r & disown" --timer 480 "xset s activate" "xrandr --output eDP-1 --brightness 1 && redshift -r & disown" & +cbatticon -u 20 -i standard -c "systemctl hibernate" & +$HOME/.local/bin/tint2-launcher & +{{- end }} +{{- if eq .chezmoi.hostname "hydrus"}} +xidlehook --not-when-fullscreen --timer 360 "xset s activate" "" & +$HOME/.local/bin/dual-polybar-launcher & +{{- end }} sh ~/.fehbg & -pa-notify -t 3 & redshift -r & picom & dunst & dex -a & birdtray & -{{- if (or (eq .chezmoi.hostname "helix") (eq .chezmoi.hostname "triangulum")) }} -xidlehook --not-when-audio --not-when-fullscreen --timer 120 "killall -q redshift && xrandr --output eDP-1 --brightness .1" "xrandr --output eDP-1 --brightness 1 && redshift -r & disown" --timer 480 "xset s activate" "xrandr --output eDP-1 --brightness 1 && redshift -r & disown" & -cbatticon -u 20 -i standard -c "systemctl hibernate" & -$HOME/.local/bin/tint2-launcher & -{{- end }} -{{- if eq .chezmoi.hostname "hydrus"}} -xidlehook --not-when-audio --not-when-fullscreen --timer 360 "xset s activate" "" & -$HOME/.local/bin/dual-polybar-launcher & -{{- end }} -sleep 10 && nextcloud --background & +sleep 5 && pa-notify -t 3 & +sleep 5 && nextcloud --background & diff --git a/dot_config/dunst/dunstrc b/dot_config/dunst/dunstrc index a72c8a3..63eb6fb 100644 --- a/dot_config/dunst/dunstrc +++ b/dot_config/dunst/dunstrc @@ -1,3 +1,5 @@ +# See dunst(5) for all configuration options + [global] ### Display ### @@ -15,43 +17,64 @@ # # 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 = "300x5-30+50" + ### 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 = 0 + + ### 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 + + + # 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.). - 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 + # present (e.g. xcompmgr, compiz, etc.). (X11 only) + transparency = 10 # Draw a line of "separator_height" pixel height between two # notifications. # Set to 0 to disable. - separator_height = 4 + # If gap_size is greater than 0, this setting will be ignored. + separator_height = 2 # Padding between text and separator. padding = 8 @@ -59,6 +82,9 @@ # 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 @@ -66,6 +92,12 @@ # Defines color of the frame around the notification window. frame_color = "#222222" + # 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; @@ -82,7 +114,7 @@ # 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 + # idle_threshold = 120 ### Text ### @@ -100,7 +132,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 @@ -109,7 +141,7 @@ # specific applications *IS GREATLY DISCOURAGED*. # # no: Disable markup parsing, incoming notifications will be treated as - # plain text. Dunstwill not advertise that it has the body-markup + # 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 @@ -132,16 +164,16 @@ # 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 - - # When word_wrap is set to no, specify where to make an ellipsis in long lines. + # Specify where to make an ellipsis in long lines. # Possible values are "start", "middle" and "end". ellipsize = middle @@ -159,13 +191,27 @@ ### 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 = "Papirus-Dark, 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. + # 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 ### @@ -183,7 +229,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 @@ -194,20 +240,6 @@ # 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. @@ -215,6 +247,22 @@ # 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 # Use the Xinerama extension instead of RandR for multi-monitor support. @@ -229,13 +277,19 @@ ### mouse - # Defines action of mouse event + # Defines list of actions for each 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. + # * 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 = do_action mouse_middle_click = close_all mouse_right_click = close_current @@ -250,27 +304,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. @@ -279,21 +312,22 @@ foreground = "#555555" timeout = 10 # Icon for notifications with low urgency, uncomment to enable - #icon = /path/to/icon + #default_icon = /path/to/icon [urgency_normal] background = "#222222" foreground = "#dfdfdf" timeout = 10 # Icon for notifications with normal urgency, uncomment to enable - #icon = /path/to/icon + #default_icon = /path/to/icon [urgency_critical] - background = "#222222" + background = "#900000" foreground = "#8a4644" + frame_color = "#ff0000" timeout = 0 # Icon for notifications with critical urgency, uncomment to enable - #icon = /path/to/icon + #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. @@ -318,8 +352,17 @@ # 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. # @@ -334,8 +377,6 @@ # 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. @@ -374,7 +415,7 @@ #[ignore] # # This notification will not be displayed # summary = "foobar" -# format = "" +# skip_display = true #[history-ignore] # # This notification will not be saved in history @@ -411,4 +452,3 @@ # set_stack_tag = "volume" # # vim: ft=cfg - diff --git a/dot_config/picom/picom.conf b/dot_config/picom/picom.conf index d806700..e66b2c5 100644 --- a/dot_config/picom/picom.conf +++ b/dot_config/picom/picom.conf @@ -424,12 +424,12 @@ log-level = "warn"; # wintypes: { - tooltip = { fade = true; shadow = true; opacity = 0.75; focus = true; full-shadow = false; }; + tooltip = { fade = true; shadow = true; opacity = false; focus = true; full-shadow = false; }; dock = { shadow = false; clip-shadow-above = true; } dnd = { shadow = false; } - popup_menu = { opacity = 0.8; } - dropdown_menu = { opacity = 0.8; } - # menu = { shadow = false; }; + popup_menu = { opacity = false; } + dropdown_menu = { opacity = false; } + menu = { shadow = false; }; # dropdown_menu = { shadow = false; }; # popup_menu = { shadow = false; }; # utility = { shadow = false; }; diff --git a/dot_config/sxhkd/executable_sxhkdrc.tmpl b/dot_config/sxhkd/executable_sxhkdrc.tmpl index 48daf4f..34e9c16 100644 --- a/dot_config/sxhkd/executable_sxhkdrc.tmpl +++ b/dot_config/sxhkd/executable_sxhkdrc.tmpl @@ -8,7 +8,7 @@ super + Return {{ if eq .chezmoi.hostname "helix"}} # power menu super + @End - rofi -dpi 240 -show power-menu -modi power-menu:/usr/bin/rofi-power-menu + rofi -eh 2 -dpi 240 -show power-menu -modi power-menu:rofi-power-menu # program launcher super + @space diff --git a/dot_config/tint2/tint2rc b/dot_config/tint2/tint2rc index 9dc4739..6862c0f 100644 --- a/dot_config/tint2/tint2rc +++ b/dot_config/tint2/tint2rc @@ -23,7 +23,7 @@ end_color = #ffffff 0 rounded = 8 border_width = 0 border_sides = TBLR -background_color = #323d43 88 +background_color = #323d43 90 border_color = #323d43 30 background_color_hover = #323d43 70 border_color_hover = #323d43 30 @@ -278,7 +278,7 @@ separator_padding = 12 0 # Exec3 execp = new execp_command = sys-mon.py -CatMu -N -execp_interval = 30 +execp_interval = 10 execp_has_icon = 0 execp_cache_icon = 0 execp_continuous = 0 diff --git a/dot_local/bin/executable_pipewire-launcher b/dot_local/bin/executable_pipewire-launcher new file mode 100644 index 0000000..b5c8b32 --- /dev/null +++ b/dot_local/bin/executable_pipewire-launcher @@ -0,0 +1,21 @@ +#!/bin/bash + +# Start xdg-desktop-portal +/usr/lib/xdg-desktop-portal -r & + +# Wait for xdg-desktop-portal +while ! pgrep -u $UID -f xdg-desktop-portal >/dev/null; do sleep 1; done + +# Kill any running pipewire processes +killall -q wireplumber & killall -q pipewire-pulse & killall -q pipewire + +# Wait for processes to stop +while pgrep -u $UID -x wireplumber >/dev/null; do sleep 1; done +while pgrep -u $UID -x pipewire >/dev/null; do sleep 1; done +while pgrep -u $UID -x pipewire-pulse >/dev/null; do sleep 1; done + +# Launch pipewire +/usr/bin/wireplumber & +/usr/bin/pipewire & +/usr/bin/pipewire-pulse & + diff --git a/dot_xinitrc.tmpl b/dot_xinitrc.tmpl index 99783e0..2f01ae8 100644 --- a/dot_xinitrc.tmpl +++ b/dot_xinitrc.tmpl @@ -34,12 +34,13 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then fi {{ if eq .chezmoi.hostname "helix" -}} -xinput set-prop 13 312 .8 & -{{ else if eq .chezmoi.hostname "triangulum" -}} -xinput set-prop 10 306 1 & -{{ else if eq .chezmoi.hostname "hydrus" -}} -xset m 10/10 100 r rate 500 30 b on & +xinput set-prop 13 283 1 +xinput set-prop 13 303 1 +{{- else if eq .chezmoi.hostname "triangulum" }} +xinput set-prop 10 306 1 +{{- else if eq .chezmoi.hostname "hydrus" }} +xset m 10/10 100 r rate 500 30 b on numlockx on & {{- end }} -xsetroot -cursor_name left_ptr & +xsetroot -cursor_name left_ptr exec bspwm