lineageos4microg: update to 22.1

dot_config/beets/config.yaml.tmpl

@@ -1,6 +1,16 @@
 directory: ~/Music
-library: ~/.config/beets/library.db
-plugins: chroma embedart edit convert fetchart missing unimported
+plugins: chroma embedart edit convert fetchart missing unimported mbsync scrub
+# these are beets defaults as of 2.3.1
+replace:
+    '[\\/]': _
+    #'^\.': _ disable replacing leading dot with underscore
+    '[\x00-\x1f]': _
+    '[<>:"\?\*\|]': _
+    '\.$': _
+    '\s+$': ''
+    '^\s+': ''
+    '^-': _
+art_filename: .cover
 
 import:
   write: yes
@@ -25,19 +35,20 @@ convert:
     opus:
       command: ffmpeg -i $source -y -vn -acodec libopus -ab 128k $dest
       extension: opus.ogg
-  embed: yes
-  copy_album_art: no
+  embed: no
+  copy_album_art: yes
   never_convert_lossy_files: yes
   dest: ~/Downloads
 
 acoustid:
-  apikey: {{ (rbw "acoustid.org").data.password }}
+  apikey: b'UxU8R3uW
 
 fetchart:
-  sources: filesystem *
+  #sources: filesystem *
+  sources: filesystem
   auto: yes
-  maxwidth: 600
-  minwidth: 200
+  #maxwidth: 600
+  #minwidth: 200
 
 chroma:
   auto: no

dot_config/environment

@@ -42,7 +42,7 @@ 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:$HOME/platform-tools"
+export PATH="$HOME/.local/bin:$HOME/.rebbletool/rebbletool/bin:$PATH:$XDG_DATA_HOME/xxtools:$XDG_DATA_HOME/flutter/bin:$ANDROID_HOME/platform-tools:$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
@@ -61,4 +61,8 @@ export XBPS_DISTDIR="$HOME"/repos/void-packages
 # Android build stuff
 export USE_CCACHE=1
 export CCACHE_EXEC=/usr/bin/ccache
-export ANDROID_STUDIO=/opt/android-studio
+if [ -d "$XDG_DATA_HOME"/flatpak/app/com.google.AndroidStudio/current/active/files/extra/android-studio ]; then
+  export ANDROID_STUDIO="$XDG_DATA_HOME"/flatpak/app/com.google.AndroidStudio/current/active/files/extra/android-studio
+else
+  export ANDROID_STUDIO=/opt/android-studio
+fi

dot_config/git/config.tmpl

@@ -28,3 +28,5 @@
   required = true
 [pull]
   rebase = false
+[init]
+  defaultBranch = main

dot_local/bin/executable_lineageos4microg_build_redfin

@@ -4,24 +4,26 @@ sudo swapon /dev/disk/by-partlabel/sata_ssd_swap
 
 set -x
 
-podman pull lineageos4microg/docker-lineage-cicd:experimental
+podman pull lineageos4microg/docker-lineage-cicd
 
 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
+  -e "BRANCH_NAME=lineage-22.1" \
+  -e "DEVICE_LIST=redfin" \
+  -e "SIGN_BUILDS=true" \
+  -e "PARALLEL_JOBS=10" \
+  -e "CALL_REPO_INIT=false" \
+  -e "CALL_REPO_SYNC=false" \
+  -e "APPLY_PATCHES=false" \
+  -e "PREPARE_BUILD_ENVIRONMENT=true" \
+  -e "CALL_BREAKFAST=true" \
+  -e "CALL_MKA=true" \
+  -e "CLEAN_AFTER_BUILD=false" \
+  -v "$ANDROID_USER_HOME/lineage:/srv/src" \
+  -v "$ANDROID_USER_HOME/lineageos4microg/zips:/srv/zips" \
+  -v "$ANDROID_USER_HOME/lineageos4microg/logs:/srv/logs" \
+  -v "$XDG_CACHE_HOME/ccache:/srv/ccache" \
+  -v "$ANDROID_USER_HOME/lineageos4microg/keys:/srv/keys" \
+  -v "$ANDROID_USER_HOME/lineageos4microg/manifests:/srv/local_manifests" \
+  lineageos4microg/docker-lineage-cicd
 
 sudo swapoff /dev/disk/by-partlabel/sata_ssd_swap

dot_local/bin/executable_xxclean

@@ -0,0 +1,37 @@
+#!/bin/sh
+
+set -e
+
+# Get current git branch
+branch=$(git rev-parse --abbrev-ref HEAD)
+
+# Construct path
+binpkgs_dir="$XBPS_DISTDIR/hostdir/binpkgs/${branch}"
+
+# Check if directory exists
+if [ ! -d "$binpkgs_dir" ]; then
+    echo "Error: Directory '$binpkgs_dir' does not exist"
+    exit 1
+fi
+
+echo "Cleaning old packages in: $binpkgs_dir"
+echo "Current branch: $branch"
+echo
+
+# Get unique package names (strip version info)
+for pkg in $(find "$binpkgs_dir" -maxdepth 1 -name '*.xbps' -type f -printf '%f\n' | sed 's/-[0-9].*//' | sort -u); do
+  # Find all versions of this package, sorted by modification time (newest first)
+  # Keep only the first (newest), remove the rest
+  find "$binpkgs_dir" -maxdepth 1 -name "${pkg}-*.xbps" -type f -printf '%T@ %p\n' | \
+  sort -rn | \
+  tail -n +2 | \
+  cut -d' ' -f2- | \
+  while read -r old_pkg; do
+    echo "Removing: $(basename "$old_pkg")"
+    rm -f "$old_pkg"
+  done
+done
+
+xbps-rindex -c "$binpkgs_dir"
+
+echo "Done!"

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