add Android SDK platform-tools to PATH

This reverts commit 18c2686bec.

.chezmoiexternal.toml

@@ -14,7 +14,3 @@ refreshPeriod = "168h"
 type = "git-repo"
 url = "https://github.com/Piraty/xxtools.git"
 refreshPeriod = "168h"
-
-[".local/share/zsh-history-substring-search"]
-type = "archive"
-url = "https://github.com/zsh-users/zsh-history-substring-search/archive/refs/tags/v1.1.0.tar.gz"

.chezmoiignore

@@ -1,29 +1,14 @@
 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
-.local/share/gnupg/sshcontrol
 {{ end }}
 
-{{ if eq .chezmoi.hostname "epoch" }}
+{{ if or (eq .chezmoi.hostname "daybreak") (eq .chezmoi.hostname "epoch") (eq .chezmoi.hostname "UGC13335X84") }}
-.config/beets
-.config/davfs2/secrets
-.config/kitty
-.config/kitty/kitty-gruvbox-theme
-.config/sway
-.config/waybar
-.local/share/gnupg/sshcontrol
-{{ end }}
-
-{{ if eq .chezmoi.hostname "UGC13335X84" }}
-.config/beets
-.config/davfs2/secrets
-.config/sway
-.config/waybar
 .local/share/gnupg/sshcontrol
 {{ end }}

README.md

@@ -1,6 +1,7 @@
 # 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:
+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

dot_config/environment

@@ -1,8 +1,16 @@
 #!/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
 
@@ -10,10 +18,6 @@ export SVDIR="$XDG_STATE_HOME"/service
 export EDITOR=nvim
 export SUDO_EDITOR=nvim
 
-# wayland
-export MOZ_ENABLE_WAYLAND=1
-export QT_QPA_PLATFORM=wayland
-
 # sway stuff
 #export XDG_CURRENT_DESKTOP=sway
 #export _JAVA_AWT_WM_NONREPARENTING=1
@@ -37,7 +41,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:$HOME/.android/Sdk/platform-tools:$XDG_DATA_HOME/xxtools:$XDG_DATA_HOME/flutter/bin"
+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
@@ -56,3 +60,4 @@ export XBPS_DISTDIR="$HOME"/repos/void-packages
 # Android build stuff
 export USE_CCACHE=1
 export CCACHE_EXEC=/usr/bin/ccache
+export ANDROID_STUDIO="$XDG_DATA_HOME"/flatpak/app/com.google.AndroidStudio/current/active/files/extra/android-studio

dot_config/git/config.tmpl

@@ -2,7 +2,11 @@
   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
@@ -14,7 +18,7 @@
   minRacyThreshold = 6379 microseconds
 [merge]
   tool = meld
-  conflictstyle = zdiff3
+  conflictstyle = diff3
 [review "review.lineageos.org"]
   username = jbeckmeyer
 [filter "lfs"]
@@ -24,5 +28,3 @@
   required = true
 [pull]
   rebase = false
-[credential "https://github.com"]
-	helper = !/usr/bin/gh auth git-credential

dot_config/zsh/dot_zshrc

@@ -33,6 +33,12 @@ 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
+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'
@@ -81,8 +87,12 @@ fi
 if command -v keychain >/dev/null; then
 	alias keychain="keychain --nolock --absolute --dir $XDG_RUNTIME_DIR"
 	eval "$(keychain --quick --eval)"
-  rbw unlock
+  if command -v rbw >/dev/null; then
-  SSH_ASKPASS=get_id_rsa_pass SSH_ASKPASS_REQUIRE=force ssh-add ~/.ssh/id_rsa
+    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
 
 # Command not found handler
@@ -107,6 +117,8 @@ for plugin in zsh-syntax-highlighting zsh-history-substring-search zsh-autosugge
     possible_locations=(
         # 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
@@ -117,8 +129,6 @@ for plugin in zsh-syntax-highlighting zsh-history-substring-search zsh-autosugge
         "$HOME/.oh-my-zsh/custom/plugins/$plugin/$plugin.zsh"
         # Homebrew location (for macOS users)
         "/usr/local/share/$plugin/$plugin.zsh"
-        # Specific path for history-substring-search with version number
-        "$HOME/.local/share/zsh-history-substring-search/zsh-history-substring-search-*/zsh-history-substring-search.zsh"
     )
     # Try each location until we find one that exists
     for location in "${possible_locations[@]}"; do

dot_config/zsh/symlink_dot_zshenv

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

private_dot_ideavimrc

@@ -0,0 +1,36 @@
+" .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