make pass respect XDG

.chezmoi.yaml.tmpl

@@ -2,5 +2,3 @@ sourceDir: ~/repos/dotfiles
 merge:
   command: vim
   args: "-d"
-diff:
-  pager: "less -R"

.chezmoiexternal.toml

@@ -1,16 +1,6 @@
 [".config/kitty/kitty-gruvbox-theme"]
-type = "archive"
+    type = "archive"
-url = "https://github.com/wdomitrz/kitty-gruvbox-theme/archive/master.tar.gz"
+    url = "https://github.com/wdomitrz/kitty-gruvbox-theme/archive/master.tar.gz"
-exact = true
+    exact = true
-stripComponents = 1
+    stripComponents = 1
-refreshPeriod = "168h"
+    refreshPeriod = "168h"
-
-[".config/variety/plugins/verse.py"]
-type = "file"
-url = "https://raw.githubusercontent.com/Crissium/variety-daily-verse/master/verse.py"
-refreshPeriod = "168h"
-
-[".local/share/xxtools"]
-type = "git-repo"
-url = "https://github.com/Piraty/xxtools.git"
-refreshPeriod = "168h"

.chezmoiignore

@@ -1,14 +1,29 @@
-README.md
+{{ if eq .chezmoi.hostname "daybreak" }}
-
-{{ if or (eq .chezmoi.hostname "daybreak") (eq .chezmoi.hostname "epoch") (eq .chezmoi.hostname "UGC13335X84") (env "ANDROID_ROOT") }}
 .config/beets
-.config/davfs2/secrets
 .config/kitty
 .config/kitty/kitty-gruvbox-theme
 .config/sway
 .config/waybar
+bin/kde-rofi-rbw-totp
+bin/kde-rofi-rbw-autotype
 {{ end }}
 
-{{ if or (eq .chezmoi.hostname "daybreak") (eq .chezmoi.hostname "epoch") (eq .chezmoi.hostname "UGC13335X84") }}
+{{ if eq .chezmoi.hostname "epoch" }}
-.local/share/gnupg/sshcontrol
+.config/beets
+.config/kitty
+.config/kitty/kitty-gruvbox-theme
+.config/sway
+.config/waybar
+bin/kde-rofi-rbw-totp
+bin/kde-rofi-rbw-autotype
+{{ end }}
+
+{{ if eq .chezmoi.hostname "WGC1065CTK7C3" }}
+.config/beets
+.config/kitty
+.config/kitty/kitty-gruvbox-theme
+.config/sway
+.config/waybar
+bin/kde-rofi-rbw-totp
+bin/kde-rofi-rbw-autotype
 {{ end }}

README.md

@@ -1,27 +0,0 @@
-# Miscellaneous topics that I'm too lazy to script
-## Firefox with tree-style tabs
-1. Go to `about:config` in Firefox and make sure all of these are enabled/true
-   (as of 136, it appears the only one needed is the first):
-```
-toolkit.legacyUserProfileCustomizations.stylesheets
-layers.acceleration.force-enabled
-gfx.webrender.all
-gfx.webrender.enabled
-layout.css.backdrop-filter.enabled
-svg.context-properties.content.enabled
-```
-2. Close Firefox.
-3. Create the file `<firefox profile>/chrome/userChrome.css` in the Firefox
-   profile directory (there may be multiple directories, one will only have one
-   file called `times.json`, this is the wrong one, choose the other one):
-    - Windows: `%AppData%/Mozilla/Firefox/Profiles`
-    - Linux: `~/.mozilla/firefox`
-```
-#TabsToolbar
-{
-        visibility: collapse;
-}
-```
-4. Open Firefox and confirm the top bar is gone. To enable the title bar, go to
-   `Menu -> More Tools -> Customize toolbar...` and check "Title Bar" in the
-   bottom-left corner.

bin/executable_kde-rofi-rbw-autotype

@@ -0,0 +1,14 @@
+#!/bin/sh
+current_layout=$(dbus-send --print-reply=literal --dest=org.kde.keyboard \
+	/Layouts org.kde.KeyboardLayouts.getLayout | xargs | tr " " ":")
+
+trap reset_layout 1 2 3 6 15
+reset_layout() {
+	dbus-send --type=method_call --dest=org.kde.keyboard /Layouts org.kde.KeyboardLayouts.setLayout "$current_layout"
+}
+
+dbus-send --type=method_call --dest=org.kde.keyboard /Layouts org.kde.KeyboardLayouts.setLayout uint32:0
+
+rofi-rbw --typer=dotool
+
+reset_layout

bin/executable_kde-rofi-rbw-totp

@@ -0,0 +1,14 @@
+#!/bin/sh
+current_layout=$(dbus-send --print-reply=literal --dest=org.kde.keyboard \
+	/Layouts org.kde.KeyboardLayouts.getLayout | xargs | tr " " ":")
+
+trap reset_layout 1 2 3 6 15
+reset_layout() {
+	dbus-send --type=method_call --dest=org.kde.keyboard /Layouts org.kde.KeyboardLayouts.setLayout "$current_layout"
+}
+
+dbus-send --type=method_call --dest=org.kde.keyboard /Layouts org.kde.KeyboardLayouts.setLayout uint32:0
+
+rofi-rbw --typer=dotool --target=totp
+
+reset_layout

dot_config/bottom/bottom.toml

@@ -1,170 +0,0 @@
-# This is a default config file for bottom.  All of the settings are commented
-# out by default; if you wish to change them uncomment and modify as you see
-# fit.
-
-# This group of options represents a command-line flag/option.  Flags explicitly
-# added when running (ie: btm -a) will override this config file if an option
-# is also set here.
-
-[flags]
-# Whether to hide the average cpu entry.
-#hide_avg_cpu = false
-# Whether to use dot markers rather than braille.
-#dot_marker = false
-# The update rate of the application.
-#rate = 1000
-# Whether to put the CPU legend to the left.
-#left_legend = false
-# Whether to set CPU% on a process to be based on the total CPU or just current usage.
-#current_usage = false
-# Whether to group processes with the same name together by default.
-#group_processes = false
-# Whether to make process searching case sensitive by default.
-#case_sensitive = false
-# Whether to make process searching look for matching the entire word by default.
-#whole_word = false
-# Whether to make process searching use regex by default.
-#regex = false
-# Defaults to Celsius.  Temperature is one of:
-#temperature_type = "k"
-#temperature_type = "f"
-#temperature_type = "c"
-#temperature_type = "kelvin"
-#temperature_type = "fahrenheit"
-#temperature_type = "celsius"
-# The default time interval (in milliseconds).
-#default_time_value = 60000
-# The time delta on each zoom in/out action (in milliseconds).
-#time_delta = 15000
-# Hides the time scale.
-#hide_time = false
-# Override layout default widget
-#default_widget_type = "proc"
-#default_widget_count = 1
-# Use basic mode
-#basic = false
-# Use the old network legend style
-#use_old_network_legend = false
-# Remove space in tables
-#hide_table_gap = false
-# Show the battery widgets
-#battery = false
-# Disable mouse clicks
-#disable_click = false
-# Built-in themes.  Valid values are "default", "default-light", "gruvbox", "gruvbox-light", "nord", "nord-light"
-color = "gruvbox-light"
-# Show memory values in the processes widget as values by default
-#mem_as_value = false
-# Show tree mode by default in the processes widget.
-#tree = false
-# Shows an indicator in table widgets tracking where in the list you are.
-#show_table_scroll_position = false
-# Show processes as their commands by default in the process widget.
-#process_command = false
-# Displays the network widget with binary prefixes.
-#network_use_binary_prefix = false
-# Displays the network widget using bytes.
-#network_use_bytes = false
-# Displays the network widget with a log scale.
-#network_use_log = false
-# Hides advanced options to stop a process on Unix-like systems.
-#disable_advanced_kill = false
-
-# These are all the components that support custom theming.  Note that colour support
-# will depend on terminal support.
-
-#[colors] # Uncomment if you want to use custom colors
-# Represents the colour of table headers (processes, CPU, disks, temperature).
-#table_header_color="LightBlue"
-# Represents the colour of the label each widget has.
-#widget_title_color="Gray"
-# Represents the average CPU color.
-#avg_cpu_color="Red"
-# Represents the colour the core will use in the CPU legend and graph.
-#cpu_core_colors=["LightMagenta", "LightYellow", "LightCyan", "LightGreen", "LightBlue", "LightRed", "Cyan", "Green", "Blue", "Red"]
-# Represents the colour RAM will use in the memory legend and graph.
-#ram_color="LightMagenta"
-# Represents the colour SWAP will use in the memory legend and graph.
-#swap_color="LightYellow"
-# Represents the colour rx will use in the network legend and graph.
-#rx_color="LightCyan"
-# Represents the colour tx will use in the network legend and graph.
-#tx_color="LightGreen"
-# Represents the colour of the border of unselected widgets.
-#border_color="Gray"
-# Represents the colour of the border of selected widgets.
-#highlighted_border_color="LightBlue"
-# Represents the colour of most text.
-#text_color="Gray"
-# Represents the colour of text that is selected.
-#selected_text_color="Black"
-# Represents the background colour of text that is selected.
-#selected_bg_color="LightBlue"
-# Represents the colour of the lines and text of the graph.
-#graph_color="Gray"
-# Represents the colours of the battery based on charge
-#high_battery_color="green"
-#medium_battery_color="yellow"
-#low_battery_color="red"
-
-# Layout - layouts follow a pattern like this:
-# [[row]] represents a row in the application.
-# [[row.child]] represents either a widget or a column.
-# [[row.child.child]] represents a widget.
-#
-# All widgets must have the type value set to one of ["cpu", "mem", "proc", "net", "temp", "disk", "empty"].
-# All layout components have a ratio value - if this is not set, then it defaults to 1.
-# The default widget layout:
-#[[row]]
-#  ratio=30
-#  [[row.child]]
-#  type="cpu"
-#[[row]]
-#    ratio=40
-#    [[row.child]]
-#      ratio=4
-#      type="mem"
-#    [[row.child]]
-#      ratio=3
-#      [[row.child.child]]
-#        type="temp"
-#      [[row.child.child]]
-#        type="disk"
-#[[row]]
-#  ratio=30
-#  [[row.child]]
-#    type="net"
-#  [[row.child]]
-#    type="proc"
-#    default=true
-
-
-# Filters - you can hide specific temperature sensors, network interfaces, and disks using filters.  This is admittedly
-# a bit hard to use as of now, and there is a planned in-app interface for managing this in the future:
-#[disk_filter]
-#is_list_ignored = true
-#list = ["/dev/sda\\d+", "/dev/nvme0n1p2"]
-#regex = true
-#case_sensitive = false
-#whole_word = false
-
-#[mount_filter]
-#is_list_ignored = true
-#list = ["/mnt/.*", "/boot"]
-#regex = true
-#case_sensitive = false
-#whole_word = false
-
-#[temp_filter]
-#is_list_ignored = true
-#list = ["cpu", "wifi"]
-#regex = false
-#case_sensitive = false
-#whole_word = false
-
-#[net_filter]
-#is_list_ignored = true
-#list = ["virbr0.*"]
-#regex = true
-#case_sensitive = false
-#whole_word = false

dot_config/environment

@@ -1,23 +1,14 @@
-#!/bin/sh
-
 # icky, but necessary since this might inject the needed XDG vars
 . "$HOME/.config/environment.local" 2>/dev/null
 . "$XDG_DATA_HOME/cargo/env" 2>/dev/null
 
-# set to defaults if any of these are unset
-export XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
-export XDG_STATE_HOME="${XDG_STATE_HOME:-$HOME/.local/state}"
-export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
-export XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}"
-export TERMINFO_DIRS="$TERMINFO_DIRS:/usr/share/terminfo"
-
-# runit
-export SVDIR="$XDG_STATE_HOME"/service
-
 # editor
 export EDITOR=nvim
 export SUDO_EDITOR=nvim
-export PAGER=less
+
+# wayland
+export MOZ_ENABLE_WAYLAND=1
+export QT_QPA_PLATFORM=wayland
 
 # sway stuff
 #export XDG_CURRENT_DESKTOP=sway
@@ -25,40 +16,22 @@ export PAGER=less
 #export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
 
 # XDG enforcement
-export ANDROID_HOME="$XDG_DATA_HOME"/android/Sdk
+PASSWORD_STORE_DIR="$XDG_DATA_HOME"/pass
-export ANDROID_USER_HOME="$XDG_DATA_HOME"/android
+export ANDROID_HOME="$XDG_DATA_HOME"/android
 export CARGO_HOME="$XDG_DATA_HOME"/cargo
 export GNUPGHOME="$XDG_DATA_HOME"/gnupg
 export GRADLE_USER_HOME="$XDG_DATA_HOME"/gradle
-export GRIDCOIN_DATADIR="$XDG_DATA_HOME"/GridcoinResearch
 export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
 export INPUTRC="$XDG_CONFIG_HOME"/readline/inputrc
 export KDEHOME="$XDG_CONFIG_HOME"/kde
 export LESSHISTFILE="$XDG_STATE_HOME"/less/history
 export MINETEST_USER_PATH="$XDG_DATA_HOME"/minetest
-export NODE_REPL_HISTORY="$XDG_DATA_HOME"/node_repl_history
-export NPM_CONFIG_CACHE="$XDG_CACHE_HOME"/npm                                 
-export NPM_CONFIG_INIT_MODULE="$XDG_CONFIG_HOME"/npm/config/npm-init.js       
-export NPM_CONFIG_TMP="$XDG_RUNTIME_DIR"/npm 
 export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc
-export PASSWORD_STORE_DIR="$XDG_DATA_HOME"/pass
-export PATH="$HOME/.local/bin:$PATH:$XDG_DATA_HOME/xxtools:$XDG_DATA_HOME/flutter/bin:$ANDROID_HOME/platform-tools"
-export PYTHON_HISTORY="$XDG_STATE_HOME"/python_history
 export RUSTUP_HOME="$XDG_DATA_HOME"/rustup
 export SQLITE_HISTORY="$XDG_CACHE_HOME"/sqlite_history
 export WINEPREFIX="$XDG_DATA_HOME"/wine
 export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority
-export XCURSOR_PATH=/usr/share/icons:"$XDG_DATA_HOME"/icons
 export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java
 
 export PGUSER=postgres
-export XBPS_DISTDIR="$HOME"/repos/void-packages
+export XBPS_DISTDIR=$HOME/repos/void-packages
-
-# pipewire logging
-#export PIPEWIRE_DEBUG="*:1,mod.raop*:5,default*:5"
-#export PIPEWIRE_LOG=/home/joel/pipewire.log
-
-# Android build stuff
-export USE_CCACHE=1
-export CCACHE_EXEC=/usr/bin/ccache
-export ANDROID_STUDIO=/opt/android-studio

dot_config/foot/foot.ini

@@ -1,271 +0,0 @@
-# -*- conf -*-
-
-# shell=$SHELL (if set, otherwise user's default shell from /etc/passwd)
-# term=foot (or xterm-256color if built with -Dterminfo=disabled)
-# login-shell=no
-
-# app-id=foot # globally set wayland app-id. Default values are "foot" and "footclient" for desktop and server mode
-# title=foot
-# locked-title=no
-
-font=FiraCode:size=10
-# font-bold=<bold variant of regular font>
-# font-italic=<italic variant of regular font>
-# font-bold-italic=<bold+italic variant of regular font>
-# font-size-adjustment=0.5
-# line-height=<font metrics>
-# letter-spacing=0
-# horizontal-letter-offset=0
-# vertical-letter-offset=0
-# underline-offset=<font metrics>
-# underline-thickness=<font underline thickness>
-# strikeout-thickness=<font strikeout thickness>
-# box-drawings-uses-font-glyphs=no
-# dpi-aware=no
-
-# initial-window-size-pixels=700x500  # Or,
-# initial-window-size-chars=<COLSxROWS>
-initial-window-mode=maximized
-pad=1x1                             # optionally append 'center'
-# resize-by-cells=yes
-# resize-keep-grid=yes
-# resize-delay-ms=100
-
-# bold-text-in-bright=no
-# word-delimiters=,│`|:"'()[]{}<>
-# selection-target=primary
-# workers=<number of logical CPUs>
-# utmp-helper=/usr/lib/utempter/utempter  # When utmp backend is ‘libutempter’ (Linux)
-# utmp-helper=/usr/libexec/ulog-helper    # When utmp backend is ‘ulog’ (FreeBSD)
-
-[environment]
-# name=value
-
-[security]
-# osc52=enabled  # disabled|copy-enabled|paste-enabled|enabled
-
-[bell]
-# system=yes
-# urgent=no
-# notify=no
-# visual=no
-# command=
-# command-focused=no
-
-[desktop-notifications]
-# command=notify-send --wait --app-name ${app-id} --icon ${app-id} --category ${category} --urgency ${urgency} --expire-time ${expire-time} --hint STRING:image-path:${icon} --hint BOOLEAN:suppress-sound:${muted} --hint STRING:sound-name:${sound-name} --replace-id ${replace-id} ${action-argument} --print-id -- ${title} ${body}
-# command-action-argument=--action ${action-name}=${action-label}
-# close=""
-# inhibit-when-focused=yes
-
-
-[scrollback]
-# lines=1000
-# multiplier=3.0
-# indicator-position=relative
-# indicator-format=""
-
-[url]
-# launch=xdg-open ${url}
-# label-letters=sadfjklewcmpgh
-# osc8-underline=url-mode
-# regex=(([a-z][[:alnum:]-]+:(/{1,3}|[a-z0-9%])|www[:digit:]{0,3}[.])([^[:space:](){}<>]+|\(([^[:space:](){}<>]+|(\([^[:space:](){}<>]+\)))*\)|\[([^]\[[:space:](){}<>]+|(\[[^]\[[:space:](){}<>]+\]))*\])+(\(([^[:space:](){}<>]+|(\([^[:space:](){}<>]+\)))*\)|\[([^]\[[:space:](){}<>]+|(\[[^]\[[:space:](){}<>]+\]))*\]|[^]\[[:space:]`!(){};:'".,<>?«»“”‘’]))
-
-# You can define your own regex's, by adding a section called
-# 'regex:<ID>' with a 'regex' and 'launch' key. These can then be tied
-# to a key-binding. See foot.ini(5) for details
-
-# [regex:your-fancy-name]
-# regex=<a POSIX-Extended Regular Expression>
-# launch=<path to script or application> ${match}
-#
-# [key-bindings]
-# regex-launch=[your-fancy-name] Control+Shift+q
-# regex-copy=[your-fancy-name] Control+Alt+Shift+q
-
-[cursor]
-# style=block
-# color=<inverse foreground/background>
-# blink=no
-# blink-rate=500
-# beam-thickness=1.5
-# underline-thickness=<font underline thickness>
-
-[mouse]
-# hide-when-typing=no
-# alternate-scroll-mode=yes
-
-[touch]
-# long-press-delay=400
-
-[colors]
-alpha=0.95
-background=fbf1c7
-foreground=3c3836
-
-# Normal/regular colors (color palette 0-7)
-regular0=bdae93
-regular1=cc241d
-regular2=98971a
-regular3=d79921
-regular4=458588
-regular5=b16286
-regular6=689d6a
-regular7=7c6f64
-
-# Bright colors (color palette 8-15)
-bright0=a89984
-bright1=9d0006
-bright2=79740e
-bright3=b57614
-bright4=076678
-bright5=8f3f71
-bright6=427b58
-bright7=665c54
-
-## dimmed colors (see foot.ini(5) man page)
-# dim0=<not set>
-# ...
-# dim7=<not-set>
-
-## The remaining 256-color palette
-# 16 = <256-color palette #16>
-# ...
-# 255 = <256-color palette #255>
-
-## Sixel colors
-# sixel0 =  000000
-# sixel1 =  3333cc
-# sixel2 =  cc2121
-# sixel3 =  33cc33
-# sixel4 =  cc33cc
-# sixel5 =  33cccc
-# sixel6 =  cccc33
-# sixel7 =  878787
-# sixel8 =  424242
-# sixel9 =  545499
-# sixel10 = 994242
-# sixel11 = 549954
-# sixel12 = 995499
-# sixel13 = 549999
-# sixel14 = 999954
-# sixel15 = cccccc
-
-## Misc colors
-# selection-foreground=<inverse foreground/background>
-# selection-background=<inverse foreground/background>
-# jump-labels=<regular0> <regular3>          # black-on-yellow
-# scrollback-indicator=<regular0> <bright4>  # black-on-bright-blue
-# search-box-no-match=<regular0> <regular1>  # black-on-red
-# search-box-match=<regular0> <regular3>     # black-on-yellow
-# urls=<regular3>
-
-[csd]
-# preferred=server
-# size=26
-# font=<primary font>
-# color=<foreground color>
-# hide-when-maximized=no
-# double-click-to-maximize=yes
-# border-width=0
-# border-color=<csd.color>
-# button-width=26
-# button-color=<background color>
-# button-minimize-color=<regular4>
-# button-maximize-color=<regular2>
-# button-close-color=<regular1>
-
-[key-bindings]
-# scrollback-up-page=Shift+Page_Up Shift+KP_Page_Up
-# scrollback-up-half-page=none
-# scrollback-up-line=none
-# scrollback-down-page=Shift+Page_Down Shift+KP_Page_Down
-# scrollback-down-half-page=none
-# scrollback-down-line=none
-# scrollback-home=none
-# scrollback-end=none
-# clipboard-copy=Control+Shift+c XF86Copy
-# clipboard-paste=Control+Shift+v XF86Paste
-# primary-paste=Shift+Insert
-# search-start=Control+Shift+r
-# font-increase=Control+plus Control+equal Control+KP_Add
-# font-decrease=Control+minus Control+KP_Subtract
-# font-reset=Control+0 Control+KP_0
-# spawn-terminal=Control+Shift+n
-# minimize=none
-# maximize=none
-# fullscreen=none
-# pipe-visible=[sh -c "xurls | fuzzel | xargs -r firefox"] none
-# pipe-scrollback=[sh -c "xurls | fuzzel | xargs -r firefox"] none
-# pipe-selected=[xargs -r firefox] none
-# pipe-command-output=[wl-copy] none # Copy last command's output to the clipboard
-# show-urls-launch=Control+Shift+o
-# show-urls-copy=none
-# show-urls-persistent=none
-# prompt-prev=Control+Shift+z
-# prompt-next=Control+Shift+x
-# unicode-input=Control+Shift+u
-# noop=none
-# quit=none
-
-[search-bindings]
-# cancel=Control+g Control+c Escape
-# commit=Return KP_Enter
-# find-prev=Control+r
-# find-next=Control+s
-# cursor-left=Left Control+b
-# cursor-left-word=Control+Left Mod1+b
-# cursor-right=Right Control+f
-# cursor-right-word=Control+Right Mod1+f
-# cursor-home=Home Control+a
-# cursor-end=End Control+e
-# delete-prev=BackSpace
-# delete-prev-word=Mod1+BackSpace Control+BackSpace
-# delete-next=Delete
-# delete-next-word=Mod1+d Control+Delete
-# delete-to-start=Control+u
-# delete-to-end=Control+k
-# extend-char=Shift+Right
-# extend-to-word-boundary=Control+w Control+Shift+Right
-# extend-to-next-whitespace=Control+Shift+w
-# extend-line-down=Shift+Down
-# extend-backward-char=Shift+Left
-# extend-backward-to-word-boundary=Control+Shift+Left
-# extend-backward-to-next-whitespace=none
-# extend-line-up=Shift+Up
-# clipboard-paste=Control+v Control+Shift+v Control+y XF86Paste
-# primary-paste=Shift+Insert
-# unicode-input=none
-# scrollback-up-page=Shift+Page_Up Shift+KP_Page_Up
-# scrollback-up-half-page=none
-# scrollback-up-line=none
-# scrollback-down-page=Shift+Page_Down Shift+KP_Page_Down
-# scrollback-down-half-page=none
-# scrollback-down-line=none
-# scrollback-home=none
-# scrollback-end=none
-
-[url-bindings]
-# cancel=Control+g Control+c Control+d Escape
-# toggle-url-visible=t
-
-[text-bindings]
-# \x03=Mod4+c  # Map Super+c -> Ctrl+c
-
-[mouse-bindings]
-# scrollback-up-mouse=BTN_WHEEL_BACK
-# scrollback-down-mouse=BTN_WHEEL_FORWARD
-# font-increase=Control+BTN_WHEEL_BACK
-# font-decrease=Control+BTN_WHEEL_FORWARD
-# selection-override-modifiers=Shift
-# primary-paste=BTN_MIDDLE
-# select-begin=BTN_LEFT
-# select-begin-block=Control+BTN_LEFT
-# select-extend=BTN_RIGHT
-# select-extend-character-wise=Control+BTN_RIGHT
-# select-word=BTN_LEFT-2
-# select-word-whitespace=Control+BTN_LEFT-2
-# select-quote = BTN_LEFT-3
-# select-row=BTN_LEFT-4
-
-# vim: ft=dosini

dot_config/gammastep/config.ini

@@ -1,6 +0,0 @@
-[general]
-temp-day=4500
-temp-night=3000
-fade=1
-adjustment-method=wayland
-location-provider=geoclue2

dot_config/git/config.tmpl

@@ -1,30 +0,0 @@
-[core]
-  autocrlf = input
-  safecrlf = warn
-[user]
-{{- if eq .chezmoi.hostname "UGC13335X84" }}
-  email = jbeckmey@ford.com
-{{- else }}
-  email = joel@beckmeyer.us
-{{- end }}
-  name = Joel Beckmeyer
-[color]
-  ui = auto
-[push]
-  default = current
-  autoSetupRemote = true
-[filesystem "N/A|13.0.2|/dev/sda2"]
-  timestampResolution = 10000 nanoseconds
-  minRacyThreshold = 6379 microseconds
-[merge]
-  tool = meld
-  conflictstyle = diff3
-[review "review.lineageos.org"]
-  username = jbeckmeyer
-[filter "lfs"]
-  clean = git-lfs clean -- %f
-  smudge = git-lfs smudge -- %f
-  process = git-lfs filter-process
-  required = true
-[pull]
-  rebase = false

dot_config/ideavim/ideavimrc

@@ -1,36 +0,0 @@
-" .ideavimrc is a configuration file for IdeaVim plugin. It uses
-"   the same commands as the original .vimrc configuration.
-" You can find a list of commands here: https://jb.gg/h38q75
-" Find more examples here: https://jb.gg/share-ideavimrc
-
-
-"" -- Suggested options --
-" Show a few lines of context around the cursor. Note that this makes the
-" text scroll if you mouse-click near the start or end of the window.
-set scrolloff=5
-
-" Do incremental searching.
-set incsearch
-
-" Don't use Ex mode, use Q for formatting.
-map Q gq
-
-" --- Enable IdeaVim plugins https://jb.gg/ideavim-plugins
-
-" Highlight copied text
-Plug 'machakann/vim-highlightedyank'
-" Commentary plugin
-Plug 'tpope/vim-commentary'
-
-
-"" -- Map IDE actions to IdeaVim -- https://jb.gg/abva4t
-"" Map \r to the Reformat Code action
-"map \r <Action>(ReformatCode)
-
-"" Map <leader>d to start debug
-"map <leader>d <Action>(Debug)
-
-"" Map \b to toggle the breakpoint on the current line
-"map \b <Action>(ToggleLineBreakpoint)
-
-set clipboard+=unnamedplus

dot_config/npm/npmrc

@@ -0,0 +1,3 @@
+prefix=${XDG_DATA_HOME}/npm                                                                                      
+cache=${XDG_CACHE_HOME}/npm
+init-module=${XDG_CONFIG_HOME}/npm/config/npm-init.js

dot_config/nvim/init.lua

@@ -37,14 +37,10 @@ vim.keymap.set('i', '<S-Tab>', function()
 	return '<S-Tab>'
 end, { expr=true })
 
--- Code search? https://news.ycombinator.com/item?id=41739452
-vim.keymap.set('n', 'gv', '<c-w>v<cmd>lua vim.lsp.buf.definition()<CR>', opts)
-
 -- Tab stuff
 vim.opt.shiftwidth = 2
 vim.opt.softtabstop = 2
 vim.opt.tabstop = 2
-vim.opt.expandtab = true
 
 -- set filetype for void-packages templates
 vim.api.nvim_create_autocmd(
@@ -68,10 +64,10 @@ require'nvim-treesitter.configs'.setup {
 }
 
 -- Install coc extensions
-vim.g.coc_global_extensions = {'coc-json', 'coc-lua', 'coc-pyright', 'coc-rust-analyzer', 'coc-yaml', 'coc-eslint'}
+vim.g.coc_global_extensions = {'coc-json', 'coc-lua', 'coc-pyright', 'coc-rust-analyzer'}
 
 -- Turn on nice things
-vim.opt.clipboard:append("unnamedplus")
+vim.opt.clipboard = "unnamedplus"
 vim.opt.mouse = "a"
 
 -- Colorscheme

dot_config/pgcli/config

@@ -40,7 +40,7 @@ generate_aliases = False
 # In Unix/Linux: ~/.config/pgcli/log
 # In Windows: %USERPROFILE%\AppData\Local\dbcli\pgcli\log
 # %USERPROFILE% is typically C:\Users\{username}
-log_file = ~/.local/state/pgcli/log
+log_file = default
 
 # keyword casing preference. Possible values "lower", "upper", "auto"
 keyword_casing = auto
@@ -62,7 +62,7 @@ case_column_headers = True
 # In Unix/Linux: ~/.config/pgcli/history
 # In Windows: %USERPROFILE%\AppData\Local\dbcli\pgcli\history
 # %USERPROFILE% is typically C:\Users\{username}
-history_file = ~/.local/state/pgcli/history
+history_file = default
 
 # Default log level. Possible values: "CRITICAL", "ERROR", "WARNING", "INFO"
 # and "DEBUG". "NONE" disables logging.

dot_config/private_davfs2/private_secrets.tmpl

@@ -1 +0,0 @@
-https://cloud.beckmeyer.us/remote.php/dav/files/joel joel {{ (rbw "cloud.beckmeyer.us" "joel").data.password }}

dot_config/tealdeer/config.toml

@@ -1,38 +0,0 @@
-[style.description]
-underline = false
-bold = false
-italic = false
-
-[style.command_name]
-foreground = "cyan"
-underline = false
-bold = false
-italic = false
-
-[style.example_text]
-foreground = "green"
-underline = false
-bold = false
-italic = false
-
-[style.example_code]
-foreground = "cyan"
-underline = false
-bold = false
-italic = false
-
-[style.example_variable]
-foreground = "cyan"
-underline = true
-bold = false
-italic = false
-
-[display]
-compact = false
-use_pager = false
-
-[updates]
-auto_update = true
-auto_update_interval_hours = 720
-
-[directories]

dot_config/variety/variety.conf

@@ -5,7 +5,7 @@ change_on_start = True
 change_enabled = True
 
 # change_interval = <interval in seconds - not less than 5>
-change_interval = 600
+change_interval = 300
 
 # internet_enabled = <True or False>
 internet_enabled = True
@@ -81,7 +81,7 @@ icon = Current
 # desired_color = <None or rgb like this: 100 150 200>
 # DISCLAIMER: This feature is still experimental
 desired_color_enabled = False
-desired_color = 160 160 160
+desired_color = None
 
 # Minimum size of images to use, as a percentage of the screen resolution
 # min_size_enabled = <True or False>
@@ -121,7 +121,7 @@ stats_enabled = True
 # copyto_folder = <Default or Path to a custom folder>, the default is Default
 # Default means to use the XDG Pictures folder when home folder is unencrypted and /usr/share/backgrounds when it is encrypted.
 copyto_enabled = True
-copyto_folder = Default
+copyto_folder = ~/Pictures/wallpapers
 
 # Clock settings
 # clock_enabled = <True or False>
@@ -129,8 +129,8 @@ copyto_folder = Default
 # clock_date_font = <FontName Size>, default is "Serif 30"
 clock_enabled = False
 
-clock_font = Serif 70
+clock_font = "Serif 70"
-clock_date_font = Serif 30
+clock_date_font = "Serif 30"
 # clock_filter = <an ImageMagick filter, read below>
 #
 # The filter defines the ImageMagick command that Variety uses to render the clock on the wallpaper.
@@ -192,8 +192,8 @@ quotes_vpos = 40
 quotes_max_length = 4096
 quotes_disabled_sources = Goodreads|Local text files|TheQuotationsPage.com|UNIX fortune program|Urban Dictionary
 quotes_tags = LSB
-quotes_authors = ""
+quotes_authors =
-quotes_change_enabled = True
+quotes_change_enabled = False
 quotes_change_interval = 86400
 quotes_favorites_file = ~/.config/variety/favorite_quotes.txt
 quotes_favorites_format = fortune
@@ -207,12 +207,10 @@ slideshow_custom_folder = ~/Pictures
 slideshow_sort_order = Random
 slideshow_monitor = All
 slideshow_mode = Desktop
-slideshow_seconds = 6.0
+slideshow_seconds = 6
 slideshow_fade = 0.4
 slideshow_zoom = 0.2
 slideshow_pan = 0.05
-name_regex_enabled = False
-name_regex = .*
 
 # List of sources
 # Each source is srcX = <enabled or not|source type - one of image, folder, flickr, wallhaven, etc.|location>
@@ -225,7 +223,7 @@ src2 = True|fetched|The Fetched folder
 src3 = True|folder|/usr/share/backgrounds
 src4 = False|flickr|user:www.flickr.com/photos/peter-levi/;user_id:93647178@N00;
 src5 = True|apod|NASA's Astronomy Picture of the Day
-src6 = True|bing|Bing Photo of the Day
+src6 = False|bing|Bing Photo of the Day
 src7 = True|earthview|Google Earth View Wallpapers
 src8 = False|natgeo|National Geographic's photo of the day
 src9 = False|unsplash|High-resolution photos from Unsplash.com

dot_config/xsettingsd/xsettingsd.conf

@@ -1,15 +0,0 @@
-Net/SoundThemeName "ocean"
-Gdk/UnscaledDPI 98304
-Gdk/WindowScalingFactor 1
-Gtk/ButtonImages 1
-Gtk/CursorThemeName "breeze_cursors"
-Gtk/CursorThemeSize 24
-Gtk/DecorationLayout "icon:minimize,maximize,close"
-Gtk/EnableAnimations 1
-Gtk/FontName "Noto Sans,  10"
-Gtk/MenuImages 1
-Gtk/PrimaryButtonWarpsSlider 1
-Gtk/ToolbarStyle 3
-Net/IconThemeName "breeze-dark"
-Net/ThemeName "Breeze-Dark"
-

dot_config/zathura/zathurarc

@@ -1 +0,0 @@
-set selection-clipboard clipboard

dot_config/zsh/dot_zshrc

@@ -4,7 +4,7 @@
 #
 # Lines configured by zsh-newuser-install
 export HISTFILE="$XDG_STATE_HOME"/zsh/history
-mkdir -p "$(dirname "$HISTFILE")"
+mkdir -p "$(dirname $HISTFILE)"
 HISTSIZE=100000
 SAVEHIST=100000
 setopt autocd
@@ -17,13 +17,18 @@ zstyle :compinstall filename "$ZDOTDIR/.zshrc"
 autoload -Uz compinit
 compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
 # End of lines added by compinstall
-### User configuration
+prependpath() {
-
+    case ":$PATH:" in
-# for shell integration
+        *:"$1":*)
-precmd() {
+            ;;
-	print -Pn "\e]133;A\e\\"
+        *)
+            PATH="$1:${PATH:+$PATH}"
+    esac
 }
+prependpath ~/bin
+prependpath ~/repos/xxtools
 
+### User configuration
 # prompt configuration
 autoload -Uz vcs_info
 precmd_vcs_info () { vcs_info }
@@ -33,125 +38,33 @@ zstyle ':vcs_info:*' formats ' %F{green}%b'
 PROMPT='%F{yellow}%n@%m %F{white}%1~%(?.. %?) $ '
 RPROMPT='%f$vcs_info_msg_0_ '
 
-# Detect if we're in a schroot and modify prompt accordingly
+alias adb='HOME="$XDG_DATA_HOME"/android adb'
-if [[ -n "$SCHROOT_CHROOT_NAME" ]]; then
-    # We're in a schroot - add [chroot:name] to the prompt
-    PS1="[chroot:$SCHROOT_CHROOT_NAME] $PS1"
-fi
-
-alias boinctui='boinctui --boinchost=localhost'
 alias bt='bluetoothctl'
 alias c='clear'
 alias daybreak='mosh daybreak -p 60101'
 alias epoch='mosh epoch -p 60104'
 alias grc='gridcoinresearchd'
-alias l='eza -lh --all --octal-permissions'
+alias l='exa -lh --git --all --octal-permissions'
 alias less='less -r'
-alias ls='eza'
+alias ls='exa'
-alias lsa='eza -a'
+alias lsa='exa -a'
-alias lss='eza -a'
+alias lss='exa -a'
 alias vim='nvim'
 alias wake_circadian='ssh epoch wol a8:a1:59:11:06:f1'
 alias xrm='sudo xbps-remove'
-alias zf='z --pipe="fzf"'
-
-if [[ -n "$WSL_DISTRO_NAME" ]]; then
-    alias adb='adb.exe'
-    alias choco='choco.exe'
-    alias fastboot='fastboot.exe'
-    alias gsudo='gsudo.exe'
-    alias pwsh='pwsh.exe'
-    alias usbipd='usbipd.exe'
-fi
 
 # GPG setup (and SSH)
-# SSH setup
-# I finally figured out how to export my id_rsa from GPG using
-# https://superuser.com/a/1681454 (copied/summarized here to avoid link rot):
-# 0. Run `gpg -K --with-keygrip` and note the desired keygrip (probably the one
-#   with [A] for auth).
-# 1. Run `gpgsm --gen-key -o tempcert`:
-#   a. Select "Existing Key".
-#   b. Enter the keygrip from step 0.
-#   c. Select "(1) sign, encrypt". This and following steps don't really apply
-#   for our use case, but we need to do it to make the tool happy.
-#   d. Enter some valid X.509 subject, e.g. "C=US".
-#   e. Press enter for rest of fields.
-#   f. "y" to create self-signed certificate.
-#   g. "y" to proceed with creation.
-# 2. `gpgsm --import tempcert` and `gpgsm -K` to get the (new) keyid.
-# 3. `gpgsm --export-secret-key-p8 -a -o id_rsa $keyid`
-# 4. (optional) `rm tempcert`, probably don't want that sitting around.
-# 5. (optional) Trim the phony metadata we gave to gpgsm that is prepended to
-# the exported PEM cert (id_rsa).
 if command -v keychain >/dev/null; then
-	alias keychain="keychain --nolock --absolute --dir $XDG_RUNTIME_DIR"
+	alias keychain='keychain --dir "$XDG_RUNTIME_DIR" --absolute'
-	eval "$(keychain --quick --eval)"
+	eval `keychain --quiet --eval --agents gpg D7F966B85D985743C76A17AC5A9572AE7B2E7E1C`
-  if command -v rbw >/dev/null; then
-    rbw unlock
-    SSH_ASKPASS=get_id_rsa_pass SSH_ASKPASS_REQUIRE=force ssh-add ~/.ssh/id_rsa
-  else
-    ssh-add ~/.ssh/id_rsa
-  fi
 fi
-
+if command -v gpgconf >/dev/null; then
-# Command not found handler
+	SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
-if [ -x /usr/lib/command-not-found -o -x /usr/share/command-not-found/command-not-found ]; then
+	export SSH_AUTH_SOCK
-    function command_not_found_handler {
-        if [ -x /usr/lib/command-not-found ]; then
-            /usr/lib/command-not-found -- "$1"
-            return $?
-        elif [ -x /usr/share/command-not-found/command-not-found ]; then
-            /usr/share/command-not-found/command-not-found -- "$1"
-            return $?
-        else
-            printf "zsh: command not found: %s\n" "$1" >&2
-            return 127
-        fi
-    }
 fi
+### End user configuration
 
 ### hooks/includes
-for plugin in zsh-syntax-highlighting zsh-history-substring-search zsh-autosuggestions; do
+. /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh
-    # Define possible locations for this plugin
+. /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
-    possible_locations=(
+. /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-        # Standard location
-        "/usr/share/zsh/plugins/$plugin/$plugin.zsh"
-        # Nix
-        "/nix/var/nix/profiles/default/share/$plugin/$plugin.zsh"
-        # Direct in /usr/share
-        "/usr/share/$plugin/$plugin.zsh"
-        # Home directory locations
-        "$HOME/.local/share/$plugin/$plugin.zsh"
-        # Version-specific directory (for history-substring-search)
-        "$HOME/.local/share/$plugin/$plugin-*/($plugin).zsh"
-        # Oh-My-Zsh style plugin location
-        "$HOME/.oh-my-zsh/custom/plugins/$plugin/$plugin.zsh"
-        # Homebrew location (for macOS users)
-        "/usr/local/share/$plugin/$plugin.zsh"
-    )
-    # Try each location until we find one that exists
-    for location in "${possible_locations[@]}"; do
-        # Expand the path in case it contains wildcards
-        expanded_locations=( ${~location} )
-        # Check each expanded location
-        for expanded_location in "${expanded_locations[@]}"; do
-            if [[ -f "$expanded_location" ]]; then
-                source "$expanded_location"
-                # Break out of the inner loop
-                break 2
-            fi
-        done
-    done
-done
-
-bindkey '^[[A' history-substring-search-up
-bindkey '^[[B' history-substring-search-down
-bindkey -M vicmd 'k' history-substring-search-up
-bindkey -M vicmd 'j' history-substring-search-down
-
-if command -v pazi &>/dev/null; then
-  eval "$(pazi init zsh)" # or 'bash'
-fi
-
-### End user configuration

dot_config/zsh/symlink_dot_zshenv

@@ -1 +0,0 @@
-../environment

dot_local/bin/executable_android-bt-snoop

@@ -1,2 +0,0 @@
-#!/bin/sh
-adb shell nc -s 127.0.0.1 -p 8872 -L system/bin/tail -f -c +0 data/misc/bluetooth/logs/btsnoop_hci.log

dot_local/bin/executable_dotool

@@ -1,8 +0,0 @@
-#!/bin/sh
-
-current_layer=$(get_plasma_keyboard_layout)
-#current_layer=$(timeout 0.1s keyd listen | grep -m 1 '^/' | sed 's/^\///')
-#if [ "$current_layer" = "qwerty" ]; then
-#    current_layer="basic"
-#fi
-DOTOOL_XKB_LAYOUT=us DOTOOL_XKB_VARIANT=$current_layer /usr/bin/dotool "$@"

dot_local/bin/executable_ffmpeg.bars

@@ -1,3 +0,0 @@
-#!/bin/sh
-output_file="$(echo "$1" | sed 's,.mp4,.bars.mp4,')"
-ffmpeg -i "$1" -vf "scale=1920:1080:force_original_aspect_ratio=decrease,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,setsar=1" -c:a copy "$output_file"

dot_local/bin/executable_ffmpeg.lossy_trim

@@ -1,3 +0,0 @@
-#!/bin/sh
-output_file="$(echo "$1" | sed 's,\(.*\)\.\(.*\)$,\1.sermon.\2,')"
-ffmpeg -i "$1" -ss "$2" -to "$3" "$output_file"

dot_local/bin/executable_find-acoustid-dups

@@ -1,14 +0,0 @@
-#!/bin/sh
-for i in $(seq 1 60); do
-if [ "$(find . -name "$i *" | wc -l)" = 2 ]; then
-	first_track="$(find . -name "$i *" | head -n1)"
-	last_track="$(find . -name "$i *" | tail -n1)"
-	first_acoustid="$(exiftool "$first_track" | rg Acoustid)"
-	last_acoustid="$(exiftool "$last_track" | rg Acoustid)"
-	if [ "$first_acoustid" = "$last_acoustid" ]; then
-		if [ "$first_track" != "$last_track" ]; then
-			rm "$first_track"
-		fi
-	fi
-fi
-done

dot_local/bin/executable_get_plasma_keyboard_layout

@@ -1,31 +0,0 @@
-#!/usr/bin/env python3
-
-import dbus
-
-def get_keyboard_info():
-    bus = dbus.SessionBus()
-    keyboard = bus.get_object('org.kde.keyboard', '/Layouts')
-    keyboard_interface = dbus.Interface(keyboard, dbus_interface='org.kde.KeyboardLayouts')
-
-    layouts_list = keyboard_interface.getLayoutsList()
-    current_layout_index = keyboard_interface.getLayout()
-
-    return layouts_list, current_layout_index
-
-def set_keyboard_layout_env(layouts_list, current_layout_index):
-    current_layout = layouts_list[current_layout_index]
-    _, _, name = current_layout
-
-    if "Dvorak" in name:
-        keyboard_layout = "dvorak"
-    elif "US" in name:
-        keyboard_layout = "basic"
-    else:
-        keyboard_layout = "unknown"
-
-    return keyboard_layout
-
-if __name__ == "__main__":
-    layouts_list, current_layout_index = get_keyboard_info()
-    keyboard_layout = set_keyboard_layout_env(layouts_list, current_layout_index)
-    print(keyboard_layout)

dot_local/bin/executable_jq-compress

@@ -1,5 +0,0 @@
-#!/bin/sh
-# 
-# I made this script to clean up duplicate messages in the Android SMS/MMS
-# database as exported by https://github.com/tmo1/sms-ie (v2.0.0).
-jq -c '.__recipient_addresses |= unique_by(.address)' messages.ndjson > messages.uniqued.ndjson

dot_local/bin/executable_lineageos4microg_build_redfin

@@ -1,27 +0,0 @@
-#!/bin/sh
-
-sudo swapon /dev/disk/by-partlabel/sata_ssd_swap
-
-set -x
-
-podman pull lineageos4microg/docker-lineage-cicd:experimental
-
-podman run \
-	-e "BRANCH_NAME=lineage-21.0" \
-	-e "DEVICE_LIST=redfin" \
-	-e "SIGN_BUILDS=true" \
-	-e "PARALLEL_JOBS=10" \
-	-e "RESET_VENDOR_UNDO_PATCHES=false" \
-	-e "CALL_REPO_INIT=false" \
-	-e "CALL_REPO_SYNC=false" \
-	-e "APPLY_PATCHES=false" \
-	-e "CLEAN_AFTER_BUILD=false" \
-	-v "$ANDROID_HOME/lineage:/srv/src" \
-	-v "$ANDROID_HOME/lineageos4microg/zips:/srv/zips" \
-	-v "$ANDROID_HOME/lineageos4microg/logs:/srv/logs" \
-	-v "$XDG_CACHE_HOME/ccache:/srv/ccache" \
-	-v "$ANDROID_HOME/lineageos4microg/keys:/srv/keys" \
-	-v "$ANDROID_HOME/lineageos4microg/manifests:/srv/local_manifests" \
-	lineageos4microg/docker-lineage-cicd:experimental
-
-sudo swapoff /dev/disk/by-partlabel/sata_ssd_swap

dot_local/bin/executable_occ

@@ -1,2 +0,0 @@
-#!/bin/sh
-sudo -u _phpfpm php /usr/share/webapps/nextcloud/occ "$@"

dot_local/bin/executable_xxbranch

@@ -1,10 +0,0 @@
-#!/bin/sh
-if [ $# -eq 1 ]; then
-	branch=$1
-	git fetch upstream master
-	git checkout upstream/master
-	git checkout -b "$branch"
-else
-	echo "Please specify new branch."
-fi
-

dot_local/bin/executable_xxbranchupdates

@@ -1,67 +0,0 @@
-#!/bin/sh
-
-# always capture the current branch so we can go back to it :)
-current_branch="$(git branch --show-current)"
-
-_default() {
-	if [ -n "$1" ]; then
-		git checkout -q "$1"
-	fi
-	branch_name="$(git branch --show-current)"
-	update_list=""
-	for p in $(common/travis/changed_templates.sh 2>&1 >/dev/null); do
-		if [ -z "$update_list" ]; then
-			update_list=$("${XBPS_DISTDIR}"/xbps-src update-check "$p" 2>&1)
-		else
-			appendee=$("${XBPS_DISTDIR}"/xbps-src update-check "$p")
-			if [ -n "$appendee" ]; then
-				# yay explicit newline :(
-				update_list="${update_list}
-${appendee}"
-			fi
-		fi
-	done
-	if [ -n "$update_list" ]; then
-		printf "branch: %s\n%s\n\n" "$branch_name" "$update_list"
-	fi
-}
-
-_maint() {
-	git checkout -q master
-	for b in $(git branch --list 'maint*'); do
-		_default "$b"
-	done
-}
-
-_update() {
-	git checkout -q master
-	for b in $(git branch --list 'update*'); do
-		_default "$b"
-	done
-}
-
-_organized() {
-	git checkout -q master
-	for b in $(git branch --list '*/*'); do
-		_default "$b"
-	done
-}
-
-if [ $# = 0 ]; then
-	_default
-else
-	while test $# != 0
-	do
-		case "$1" in
-			-m|--maint) _maint;;
-			-u|--update) _update;;
-			-o|--organized) _organized;;
-			--) shift; break;;
-			*)  _default;;
-		esac
-		shift
-	done
-fi
-
-# return to branch we were on before running script
-git checkout "$current_branch" >/dev/null 2>&1

dot_local/bin/executable_xxdeps

@@ -1,2 +0,0 @@
-#!/bin/sh
-xbps-query -Rx "$1"

dot_local/bin/executable_xxdist

@@ -1,39 +0,0 @@
-#!/bin/sh
-
-branch_name="$(git branch --show-current)"
-targets=""
-install=false
-
-distribute() {
-  rsync -P -r "${XBPS_DISTDIR}/hostdir/binpkgs/${branch_name}" "$1":
-}
-
-install() {
-  package_dir=$(basename "$branch_name")
-  ssh "$1" "xi -R $package_dir -Suy && rm -rf $package_dir"
-}
-
-if [ "$1" = "-i" ]; then
-  install=true
-  shift
-fi
-
-if [ $# = 0 ]; then
-  targets="daybreak epoch"
-elif [ "$1" = "repo" ]; then
-	cd "${XBPS_DISTDIR}/hostdir/binpkgs/${branch_name}" || exit 1
-	for p in *.xbps; do
-		rsync -P "$p" daybreak:/srv/repo
-		ssh daybreak "xbps-rindex --add /srv/repo/$p;
-		xbps-rindex --privkey /srv/repo/private.pem --sign-pkg /srv/repo/*.xbps"
-	done
-else
-  targets="$1"
-fi
-
-for t in $targets; do
-  distribute "$t"
-  if [ "$install" = true ]; then
-    install "$t"
-  fi
-done

dot_local/bin/executable_xxrevdeps

@@ -1,2 +0,0 @@
-#!/bin/sh
-xbps-query -RX "$1"

dot_local/bin/executable_xxtip

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-current_branch="$(git branch --show-current)"
-
-trap back_to_current_branch 1 2 3 6 15
-back_to_current_branch() {
-	git checkout "$current_branch"
-	exit 1
-}
-
-git fetch upstream master
-git rebase upstream/master

dot_local/bin/executable_xxtreecrawl

@@ -1,59 +0,0 @@
-#!/bin/sh
-
-# always capture the current branch so we can go back to it :)
-current_branch="$(git branch --show-current)"
-
-_default() {
-	if [ -n "$1" ]; then
-		git checkout -q "$1"
-	fi
-	branch_name="$(git branch --show-current)"
-	update_list=""
-	for p in $(common/travis/changed_templates.sh 2>&1 >/dev/null); do
-		if [ -z "$update_list" ]; then
-			update_list="$p"
-		else
-			appendee="$p"
-			if [ -n "$appendee" ]; then
-				# yay explicit newline :(
-				update_list="${update_list}
-${appendee}"
-			fi
-		fi
-	done
-	if [ -n "$update_list" ]; then
-		printf "branch: %s\n%s\n\n" "$branch_name" "$update_list"
-	fi
-}
-
-_maint() {
-	git checkout -q master
-	for b in $(git branch --list 'maint*'); do
-		_default "$b"
-	done
-}
-
-_update() {
-	git checkout -q master
-	for b in $(git branch --list 'update*'); do
-		_default "$b"
-	done
-}
-
-if [ $# = 0 ]; then
-	_default
-else
-	while test $# != 0
-	do
-		case "$1" in
-			-m|--maint) _maint;;
-			-u|--update) _update;;
-			--) shift; break;;
-			*)  _default;;
-		esac
-		shift
-	done
-fi
-
-# return to branch we were on before running script
-git checkout "$current_branch" >/dev/null 2>&1

dot_local/bin/executable_xxupdatephp

@@ -1,4 +0,0 @@
-#!/bin/bash
-xxautobump php8.{1,2,3,4}{-{apcu,ast,igbinary,imagick,mongodb,redis},} xdebug8.{1,2,3,4}
-git add .
-xbump :

dot_local/bin/private_executable_get_id_rsa_pass

@@ -1,2 +0,0 @@
-#!/bin/sh
-rbw get id_rsa

dot_local/bin/symlink_ffmpeg.trim

@@ -1 +0,0 @@
-ffmpeg.lossy_trim

dot_local/share/private_gnupg/gpg-agent.conf

@@ -1,5 +0,0 @@
-default-cache-ttl 60480000
-default-cache-ttl-ssh 60480000
-max-cache-ttl 60480000
-max-cache-ttl-ssh 60480000
-enable-ssh-support

dot_local/share/private_gnupg/sshcontrol.tmpl

@@ -1 +0,0 @@
-{{ output "sh" "-c" "gpg -K --with-keygrip | grep -A1 \"\\[A\\]\" | tail -n1 | sed \"s,.*Keygrip = ,,\"" }}

private_dot_ideavimrc

@@ -1,36 +0,0 @@
-" .ideavimrc is a configuration file for IdeaVim plugin. It uses
-"   the same commands as the original .vimrc configuration.
-" You can find a list of commands here: https://jb.gg/h38q75
-" Find more examples here: https://jb.gg/share-ideavimrc
-
-
-"" -- Suggested options --
-" Show a few lines of context around the cursor. Note that this makes the
-" text scroll if you mouse-click near the start or end of the window.
-set scrolloff=5
-
-" Do incremental searching.
-set incsearch
-
-" Don't use Ex mode, use Q for formatting.
-map Q gq
-
-" --- Enable IdeaVim plugins https://jb.gg/ideavim-plugins
-
-" Highlight copied text
-Plug 'machakann/vim-highlightedyank'
-" Commentary plugin
-Plug 'tpope/vim-commentary'
-
-
-"" -- Map IDE actions to IdeaVim -- https://jb.gg/abva4t
-"" Map \r to the Reformat Code action
-"map \r <Action>(ReformatCode)
-
-"" Map <leader>d to start debug
-"map <leader>d <Action>(Debug)
-
-"" Map \b to toggle the breakpoint on the current line
-"map \b <Action>(ToggleLineBreakpoint)
-
-set clipboard+=unnamedplus