dotfiles/zshrc: use vulkan on Sway

Seems to work fine on all Intel now.

config.yaml

@@ -69,6 +69,27 @@ dotfiles:
   d_waybar:
     src: config/waybar
     dst: ~/.config/waybar
+  f_fuzzel.ini:
+    src: config/fuzzel/fuzzel.ini
+    dst: ~/.config/fuzzel/fuzzel.ini
+  f_wezterm.lua:
+    src: wezterm.lua
+    dst: ~/.wezterm.lua
+  f_convert-libaom.sh:
+    src: local/bin/convert-libaom.sh
+    dst: ~/.local/bin/convert-libaom.sh
+    chmod: '755'
+  f_dark-mode-theme.sh:
+    src: local/share/dark-mode.d/01-gtk-theme.sh
+    dst: ~/.local/share/dark-mode.d/01-gtk-theme.sh
+    chmod: '755'
+  f_light-mode-theme.sh:
+    src: local/share/light-mode.d/01-gtk-theme.sh
+    dst: ~/.local/share/light-mode.d/01-gtk-theme.sh
+    chmod: '755'
+  f_darkman_config.yaml:
+    src: config/darkman/config.yaml
+    dst: ~/.config/darkman/config.yaml
 profiles:
   everywhere:
     dotfiles:
@@ -97,6 +118,12 @@ profiles:
     - d_local_bin
     - f_ssh-agent.service
     - d_waybar
+    - f_fuzzel.ini
+    - f_wezterm.lua
+    - f_convert-libaom.sh
+    - f_dark-mode-theme.sh
+    - f_light-mode-theme.sh
+    - f_darkman_config.yaml
   knafeh:
     dotfiles:
     - d_vim
@@ -119,3 +146,9 @@ profiles:
     - d_local_bin
     - f_ssh-agent.service
     - d_waybar
+    - f_fuzzel.ini
+    - f_wezterm.lua
+    - f_convert-libaom.sh
+    - f_dark-mode-theme.sh
+    - f_light-mode-theme.sh
+    - f_darkman_config.yaml

dotfiles/config/darkman/config.yaml

@@ -0,0 +1 @@
+usegeoclue: true

dotfiles/config/fuzzel/fuzzel.ini

@@ -0,0 +1,28 @@
+dpi-aware=auto
+# Use fc-list to check fonts and styles
+font=Source Sans Pro:style=Roman:size=12
+fields=name,generic,comment,categories,filename,keywords
+terminal=foot -e
+prompt="❯   " 
+layer=overlay
+[colors]
+# Selenized colors
+# base03
+background=103c48ff
+# base0
+text=adbcbcff
+# magenta
+match=f275beff
+# base02
+selection=184956ff
+# base0
+selection-text=adbcbcff
+border=adbcbcfa
+
+[border]
+radius=20
+
+[dmenu]
+exit-immediately-if-empty=yes
+
+# vim: ft=dosini

dotfiles/config/sway/config

@@ -18,7 +18,7 @@ set $term foot
 # Your preferred application launcher
 # Note: pass the final command to swaymsg so that the resulting window can be opened
 # on the original workspace that the command was run on.
-set $menu wofi --show drun -i | xargs swaymsg exec --
+set $menu fuzzel | xargs swaymsg exec --
 
 ### Display 
 
@@ -70,7 +70,7 @@ set $WOBSOCK $XDG_RUNTIME_DIR/wob.sock
 #
 # exec swayidle -w \
 #          timeout 300 'swaylock -f -c 000000' \
-#          timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
+#          timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
 #          before-sleep 'swaylock -f -c 000000'
 #
 # This will lock your screen after 300 seconds of inactivity, then turn off
@@ -130,13 +130,6 @@ input type:keyboard {
     # Exit sway (logs you out of your Wayland session)
     bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
 
-    bindsym XF86AudioRaiseVolume exec pamixer -ui 5 && pamixer --get-volume > $WOBSOCK
-    bindsym XF86AudioLowerVolume exec pamixer -ud 5 && pamixer --get-volume > $WOBSOCK
-    bindsym XF86AudioMute exec pamixer --toggle-mute && ( pamixer --get-mute && echo 0 > $WOBSOCK ) || pamixer --get-volume > $WOBSOCK
-    bindsym XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle
-    bindsym XF86MonBrightnessUp exec light -S "$(light -G | awk '{ print int(($1 + .72) * 1.4) }')" && light -G | cut -d'.' -f1 > $WOBSOCK
-    bindsym XF86MonBrightnessDown exec light -S "$(light -G | awk '{ print int($1 / 1.4) }')" && light -G | cut -d'.' -f1 > $WOBSOCK
-
 #
 # Moving around:
 #
@@ -259,6 +252,19 @@ mode "resize" {
     bindsym Escape mode "default"
 }
 bindsym $mod+r mode "resize"
+#
+# Utilities:
+#
+    # Special keys to adjust volume via PulseAudio
+    bindsym --locked XF86AudioMute exec pamixer --toggle-mute && ( pamixer --get-mute && echo 0 > $WOBSOCK ) || pamixer --get-volume > $WOBSOCK
+    bindsym --locked XF86AudioLowerVolume exec pamixer -ud 5 && pamixer --get-volume > $WOBSOCK
+    bindsym --locked XF86AudioRaiseVolume exec pamixer -ui 5 && pamixer --get-volume > $WOBSOCK
+    bindsym --locked XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle
+    # Special keys to adjust brightness via brightnessctl
+    bindsym --locked XF86MonBrightnessUp exec light -S "$(light -G | awk '{ print int(($1 + .72) * 1.4) }')" && light -G | cut -d'.' -f1 > $WOBSOCK
+    bindsym --locked XF86MonBrightnessDown exec light -S "$(light -G | awk '{ print int($1 / 1.4) }')" && light -G | cut -d'.' -f1 > $WOBSOCK
+
+
 
 #
 # Status Bar:

dotfiles/config/systemd/user/swayidle.service

@@ -8,8 +8,8 @@ Type=simple
 ExecStart=/usr/bin/swayidle -w \
             timeout 300 'swaylock -f -c 000000 \
                 -i /home/aorth/Downloads/3121px-Jerusalem-2013-Temple_Mount-Dome_of_the_Rock-Detail_01.jpg' \
-            timeout 600 'swaymsg "output * dpms off"' \
+            timeout 600 'swaymsg "output * power off"' \
-                resume 'swaymsg "output * dpms on"' \
+                resume 'swaymsg "output * power on"' \
             before-sleep 'swaylock -f -c 000000 \
                 -i /home/aorth/Downloads/3121px-Jerusalem-2013-Temple_Mount-Dome_of_the_Rock-Detail_01.jpg'
 

dotfiles/config/waybar/style.css

@@ -22,7 +22,7 @@
 * {
     border: none;
     border-radius: 0;
-    font-family: Source Sans Pro Semibold, sans-serif;
+    font-family: Source Sans Pro Semibold, "Font Awesome 6 Free", sans-serif;
     font-size: 13px;
     min-height: 0;
 }

dotfiles/config/xdg-desktop-portal-wlr/config

@@ -1,4 +1,4 @@
 # 2021-05-24: See https://github.com/emersion/xdg-desktop-portal-wlr/issues/124
 [screencast]
-chooser_cmd = wofi -d -n --prompt='Select the monitor to share:'
+chooser_cmd = fuzzel --dmenu --lines=3 --no-icons --prompt='Select the monitor to share:'
 chooser_type = dmenu

dotfiles/local/bin/add-shadow.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-convert "$1" -trim \( +clone -background grey25 -shadow 80x40+5+30 \) +swap -background transparent -layers merge +repage "$1-shadow.png"
+magick convert "$1" -trim \( +clone -background grey25 -shadow 80x40+5+30 \) +swap -background transparent -layers merge +repage "$1-shadow.png"

dotfiles/local/bin/convert-libaom.sh

@@ -11,6 +11,7 @@
 #   - https://trac.ffmpeg.org/wiki/Encode/AV1
 #
 # Changes:
+# 2024-01-21: minor improvement to handling of output file name
 # 2022-06-13: use _max_crf in mkvpropedit if we don't find an acceptable vmaf
 # 2022-04-05: update VMAF log parsing
 # 2021-10-21: I tested 2-pass and found it doesn't do anything for constant
@@ -53,15 +54,16 @@ elif [[ ! -r "$1" ]]; then
     exit 1
 fi
 
-INPUT_FILE_BASENAME=$(basename "$1")
+INPUT_FILE_BASENAME=$(basename -- "$1")
 INPUT_FILE_EXTENSION=${INPUT_FILE_BASENAME##*.}
-INPUT_FILE_DIRNAME=$(dirname "$1")
+INPUT_FILE_DIRNAME=$(dirname -- "$1")
 
 # Check if an output file name was specified (like if we are calling from the
 # benchmarking script, in which case we want to exit as soon as possible). If
 # not then we can continue with a simple filename based on the input file's.
 if [[ -z $_output_file ]]; then
-    _output_file="${INPUT_FILE_BASENAME/.*/}.webm";
+    # Strip file extension from end of string and replace with webm
+    _output_file="${INPUT_FILE_BASENAME%$INPUT_FILE_EXTENSION}webm";
     _benchmark_mode="false"
 else
     _benchmark_mode="true"

dotfiles/local/bin/pre-process-media.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# pre-process-media.sh v2022-08-01
+# pre-process-media.sh v2024-04-28
 #
 # Prepare a directory of images and videos for long-term archival by normalizing
 # their names, optimizing JPEGs with jpeg-archive, and stripping embedded MP4s
@@ -10,6 +10,7 @@
 
 # Changes:
 #
+# v2024-04-28: support Pixel portrait images
 # v2022-08-01: fix minor syntax issue
 # v2022-01-15: support Pixel panorama images
 # v2021-12-26: add 'ftypiso6' for Nokia Android 9 MVIMG files, anchor regexes to
@@ -90,6 +91,9 @@ perl-rename 's/^PXL_([0-9]{4})([0-9]{2})([0-9]{2})_([0-9]+)\.NIGHT\.jpg/$1-$2-$3
 # Rename PXL_20211118_162823829.PORTRAIT.jpg to 2021-11-18_162823829.jpg (Pixel Portrait mode)
 perl-rename 's/^PXL_([0-9]{4})([0-9]{2})([0-9]{2})_([0-9]+)\.PORTRAIT\.jpg/$1-$2-$3_$4.jpg/' *.jpg
 
+# Rename PXL_20230413_231026946.PORTRAIT.ORIGINAL.jpg to 2023-04-13_231026946.jpg (Pixel portrait original?)
+perl-rename 's/^PXL_([0-9]{4})([0-9]{2})([0-9]{2})_([0-9]+)\.PORTRAIT\.ORIGINAL\.jpg/$1-$2-$3_$4.jpg/' *.jpg
+
 # Rename PXL_20210925_150154460.PANO.jpg to 2021-09-25_150154460.jpg (Pixel Panorama mode)
 perl-rename 's/^PXL_([0-9]{4})([0-9]{2})([0-9]{2})_([0-9]+)\.PANO\.jpg/$1-$2-$3_$4.jpg/' *.jpg
 
@@ -117,6 +121,9 @@ perl-rename 's/^([0-9]{4})([0-9]{2})([0-9]{2})_([0-9]+)\.mp4/$1-$2-$3_$4.mp4/' *
 # Rename PXL_20210714_145336054.mp4 to 2021-07-14_145336054.mp4
 perl-rename 's/PXL_([0-9]{4})([0-9]{2})([0-9]{2})_([0-9]+)\.mp4/$1-$2-$3_$4\.mp4/' *.mp4 
 
+# Rename PXL_20240101_142720131.TS.MP4 to 2024-01-01_142720131.mp4 (Pixel 7a TopShot feature)
+perl-rename 's/PXL_([0-9]{4})([0-9]{2})([0-9]{2})_([0-9]+)\.TS\.mp4/$1-$2-$3_$4\.mp4/' *.mp4
+
 # Optimize JPEGs with jpeg-archive
 find . -name '*.jpg' | chrt -b 0 parallel --no-notice "jpeg-recompress -q high {} {}" 
 

dotfiles/local/share/dark-mode.d/01-gtk-theme.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/bash
+
+gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"
+gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"

dotfiles/local/share/light-mode.d/01-gtk-theme.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/bash
+
+gsettings set org.gnome.desktop.interface gtk-theme "Adwaita"
+gsettings set org.gnome.desktop.interface color-scheme "prefer-light"

dotfiles/wezterm.lua

@@ -0,0 +1,32 @@
+-- Pull in the wezterm API
+local wezterm = require 'wezterm'
+
+-- This table will hold the configuration.
+local config = {}
+
+-- In newer versions of wezterm, use the config_builder which will
+-- help provide clearer error messages
+if wezterm.config_builder then
+  config = wezterm.config_builder()
+end
+
+config.font = wezterm.font 'Cascadia Mono'
+config.font_size = 13.5
+
+-- This is where you actually apply your config choices
+config.color_scheme = 'Selenized Dark (Gogh)'
+
+-- Disable bold colors for Solarized / Selenized
+config.bold_brightens_ansi_colors = false
+config.hide_tab_bar_if_only_one_tab = true
+
+-- Disable default padding
+config.window_padding = {
+  left = 0,
+  right = 0,
+  top = 0,
+  bottom = 0,
+}
+
+-- and finally, return the configuration to wezterm
+return config

dotfiles/zshrc

@@ -27,11 +27,6 @@ compinit
 if [[ "$OSTYPE" =~ ^linux.*$ ]]; then
     PATH=~/.local/bin:$PATH
 
-    # System Node.js with local "global" package prefix, for DSpace build environment:
-    #  $ npm config set prefix ~/.node_modules
-    #  $ npm install -g bower grunt grunt-cli
-    PATH=$PATH:~/.node_modules/bin
-
     {%@@ if profile == "knafeh" or profile == "balozi" @@%}
     # Export these variables in our TTY so that Sway can read them when it
     # starts. It's not pretty, but it's all we can do since support for
@@ -47,23 +42,25 @@ if [[ "$OSTYPE" =~ ^linux.*$ ]]; then
     export SDL_VIDEODRIVER=wayland
     # Signal to xdg-desktop-portal that we're on Sway
     export XDG_CURRENT_DESKTOP=sway
-    # 2022-12-26: use Vulkan renderer in Sway
-    # 2023-01-03: a bit buggy on older Intel, especially in Thunderbird (even on new Intel)
-    #export WLR_RENDERER=vulkan
-    {%@@ endif @@%}
 
     # 2023-02-05: tell pip/poetry not to probe for keyrings. I'm not publishing
     # packages to pypi.org and the popup during pip/poetry install is annoying.
     # See: https://github.com/python-poetry/poetry/issues/1917
     export PYTHON_KEYRING_BACKEND=keyring.backends.null.Keyring
 
-    # Don't show rtx version update warnings
+    # For rsync breaking change in arg parsing since 2022
-    export RTX_HIDE_UPDATE_WARNING=1
+    # See: https://github.com/bit-team/backintime/issues/1247
+    export RSYNC_OLD_ARGS=1
+    {%@@ endif @@%}
+
+    {%@@ if profile == "knafeh" or profile == "balozi" @@%}
+    export WLR_RENDERER=vulkan
+    {%@@ endif @@%}
 fi
 
-# Enable zsh completions for rtx version manager
+# Enable zsh completions for mise version manager
-if [[ -f /usr/bin/rtx ]]; then
+if [[ -f /usr/bin/mise ]]; then
-    eval "$(/usr/bin/rtx activate zsh)"
+    eval "$(/usr/bin/mise activate zsh)"
 fi
 
 alias ls='ls -F --color=auto'