2024 August updates

Author: kmARC

Diff for: .gitmodules

@@ -7,4 +7,10 @@
 	url = https://github.com/tmux-plugins/tpm
 [submodule "todo.actions.d/graph"]
 	path = todo.actions.d/graph
-	url = https://github.com/Bassmann/todo.txt-graph.git
+	url = https://github.com/timpulver/todo.txt-graph.git
+[submodule "todo.actions.d/due"]
+	path = todo.actions.d/due
+	url = https://github.com/rebeccamorgan/due.git
+[submodule "local/opt/fzf-git"]
+	path = local/opt/fzf-git
+	url = https://github.com/junegunn/fzf-git.sh.git

Diff for: bashrc.kmarc

@@ -46,6 +46,10 @@ else
   source /usr/local/share/fzf/shell/completion.bash
 fi
 
+if [ -f "$HOME/.local/opt/fzf-git/fzf-git.sh" ]; then
+  source "$HOME/.local/opt/fzf-git/fzf-git.sh"
+fi
+
 ###################
 #  NODE.JS - NVM  #
 ###################
@@ -124,8 +128,6 @@ alias diff='diff --color=auto'
 alias grep='grep --color=auto'
 alias mutt='neomutt'
 alias sudo='sudo '
-alias htop='TERM=xterm-256color htop'
-alias ssh='TERM=xterm-256color ssh'
 alias monerod="monerod --data-dir ${XDG_DATA_HOME}/bitmonero"
 
 git-recursive-pull() {
@@ -213,6 +215,28 @@ if [[ $OSTYPE == 'darwin'* ]]; then
 fi
 
 
+function git-worktree() {
+  if [ ${#*} -lt 2 ]; then
+    2>&1 echo "Usage: git-worktree JIRA-NNN short-name"
+    return 1
+  fi
+  local ticket orig_branch new_branch
+  ticket="$1"
+  new_branch=$2
+  orig_branch="$(git rev-parse --abbrev-ref HEAD)"
+  new_dir=../"$(basename "$PWD")"-"$new_branch"
+  git fetch origin "$orig_branch"
+  git worktree add "$new_dir" -B "$USER/$ticket-$new_branch"
+  if [ -f .envrc ]; then
+    cp .envrc "$new_dir/.envrc"
+    direnv allow "$new_dir"
+  fi
+  if [ -f user.bazelrc ]; then
+    cp user.bazelrc "$new_dir/user.bazelrc"
+  fi
+}
+
+
 ###############
 #  dark mode  #
 ###############

Diff for: bin/mutt_helpers.sh

@@ -25,6 +25,12 @@ function smtp_pass() {
   _query_keychain "$kind"-pass "$from"
 }
 
+function smtp_user() {
+  local kind="$1"
+  local from="$2"
+  _query_keychain "$kind"-username "$from" | sed 's#\\\\#\\#g'
+}
+
 function query_command() {
   local kind="$1"
   local from="$2"

Diff for: bin/offlineimap.py

@@ -5,11 +5,17 @@
 import platform
 
 
-def get_pass(kind, account):
+def get_entry(typ, kind, account):
     if platform.uname().system == "Darwin":
-        return check_output(f"security find-generic-password -w -s '{kind}-pass' -a '{account}'", shell=True).splitlines()[0]
+        return check_output(f"security find-generic-password -w -s '{kind}-{typ}' -a '{account}'", shell=True).splitlines()[0]
     else:
-        return check_output(f"secret-tool lookup {kind}-pass '{account}'", shell=True).splitlines()[0]
+        return check_output(f"secret-tool lookup {kind}-{typ} '{account}'", shell=True).splitlines()[0]
+
+def get_pass(kind, account):
+    return get_entry('pass', kind, account)
+
+def get_user(kind, account):
+    return get_entry('username', kind, account)
 
 if __name__ == '__main__':
     print(get_pass(sys.argv[1], sys.argv[2]))

Diff for: config/alacritty.toml

@@ -9,16 +9,18 @@ duration = 100
 [env]
 # TERM = "xterm-256color"
 
-[font.bold_italic]
-family = "Menlo"
-style = "Bold Italic"
+# [font.bold_italic]
+# family = "Menlo"
+# style = "Bold Italic"
+[font]
+size = 12
 
 [font.normal]
 family = "Fira Code"
 style = "Medium"
 
 [font.offset]
-y = -1
+y = 0
 
 [[keyboard.bindings]]
 action = "CreateNewWindow"

Diff for: config/environment.d/env.conf

@@ -1,4 +1,9 @@
 # shellcheck disable=SC2034
+
+if infocmp alacritty >/dev/null; then
+  export TERM=alacritty
+fi
+
 # export XDG_SESSION_TYPE=wayland
 export XDG_DATA_HOME="$HOME/.local/share"
 export XDG_CONFIG_HOME="$HOME/.config"
@@ -26,6 +31,7 @@ else
 fi
 
 export PATH="$HOME/bin:$HOME/.local/bin/:$PATH"
+export PATH="$HOME/.local/share/cargo/bin:$PATH"
 
 export GOPATH="$XDG_DATA_HOME/go"
 

Diff for: config/git/config

@@ -65,8 +65,8 @@
   autostash = true
 
 [tag]
-  forceSignAnnotated = true
-  gpgSign = true
+  ; forceSignAnnotated = true
+  ; gpgSign = true
 
 [tig]
   ignore-space = yes

Diff for: config/git/config.linux

@@ -1,4 +1,4 @@
 [credential]
-  helper = git-credential-libsecret
+  helper = /usr/libexec/git-core/git-credential-libsecret
 
 # vim: set ft=gitconfig:

Diff for: config/newsboat/config

@@ -4,7 +4,7 @@ always-display-description yes
 auto-reload                yes
 bookmark-autopilot         yes
 bookmark-cmd               "printf '%s\t%s\t%s\t%s\n' >> $HOME/Documents/Notes/bookmarks.txt"
-browser                    "xdg-open %u"
+browser                    "open %u"
 download-full-page         yes
 feed-sort-order            lastupdated
 notify-always              yes
@@ -44,7 +44,7 @@ highlight feedlist    "[N ]*\\([0-9/]+\\) "      white
 highlight articlelist "^[0-9 ]{4} "              green
 highlight articlelist "\\(([0-9 ]{2}[0-9]\.?|[0-9]\\.[0-9]K|[ 0-9]{2}\\.[0-9])\\) " white
 
-macro o set browser "mpv %u"        ; open-in-browser ; set browser "xdg-open %u"
-macro d set browser "youtube-dl %u" ; open-in-browser ; set browser "xdg-open %u"
+macro o set browser "mpv %u"        ; open-in-browser ; set browser "open %u"
+macro d set browser "youtube-dl %u" ; open-in-browser ; set browser "open %u"
 
 # vim: set ft=conf:

Diff for: config/tmux/fix-ssh.sh

@@ -36,30 +36,36 @@ if grep -iqE "$(echo "${SSH_VARS[@]}" | md5sum)" /tmp/tmux-ssh-settings.md5; the
 fi
 echo "${SSH_VARS[@]}" | md5sum > /tmp/tmux-ssh-settings.md5
 
+monitor_bell="$(tmux show-option -gv monitor-bell)"
+tmux set-option -g monitor-bell off
+
 # Check every pane for the running command and try to update the environment variables
 for pane in $(tmux list-panes -a -F '#{pane_id}'); do
   variables=$(for var in "${!SSH_VARS[@]}"; do
                 printf "%s=\"%s\" " "$var" "${SSH_VARS[$var]}"
               done)
   bash_cmd="export $variables"
 
-  if ! is_bash; then 
-    log "not bash: $(pane_cmd)"
+  log "$(tmux display -t "$pane" -p "#{window_index}.#{pane_index}") command: $(pane_cmd)"
 
+  if is_bash; then 
+    nop
+  else
     if is_vim; then
       commands=$(for var in "${!SSH_VARS[@]}"; do
                    printf "let \$%s=\"%s\" | " "$var" "${SSH_VARS[$var]}"
                  done)
-      tmux send-keys -t "$pane" Escape ":${commands%|*} | call histdel(':', '.*SSH_.*')" Enter
-      sleep 0.5
+      tmux send-keys -t "$pane" Escape Escape ":${commands%|*} | call histdel(':', '.*SSH_.*')" Enter
+      # sleep 0.5
     fi
 
     # If not in a shell, then background the app (C-z) and bring to the foreground after
-    tmux send-keys -t "$pane" C-z C-c
+    tmux send-keys -t "$pane" C-z
+    sleep 0.1
+    tmux send-keys -t "$pane" C-c
     bash_cmd+="; fg"
-    sleep 1.0
   fi
 
   tmux send-keys -t "$pane" C-u "  $bash_cmd" Enter
 done
-
+tmux set-option -g monitor-bell "$monitor_bell"

Diff for: config/tmux/tmux.conf

@@ -38,13 +38,12 @@ bind -T copy-mode-vi v   send-keys -X begin-selection
 bind -T copy-mode-vi C-v send-keys -X rectangle-toggle
 
 set -g history-limit 128000
-# set -g xterm-keys on
 set -g focus-events on
 
 set -g set-clipboard on
 
 # Slimux integration
-is_vim='echo "#{pane_current_command}" | grep -iqE "(^|\/)g?(view|n?vim?x?)(diff)?$"'
+is_vim='echo "#{pane_current_command}" | grep -iqE "(^|\/)g?(view|n?vim?x?|git)(diff)?$"'
 bind -n C-h if-shell "$is_vim" "send-keys C-h" "select-pane -L"
 bind -n C-j if-shell "$is_vim" "send-keys C-j" "select-pane -D"
 bind -n C-k if-shell "$is_vim" "send-keys C-k" "select-pane -U"

Diff for: install.conf.yaml

@@ -98,6 +98,8 @@
       path: config/rtorrent/rtorrent.rc
     $XDG_DATA_HOME/terminfo:
       path: local/share/terminfo
+    $HOME/.local/opt/fzf-git:
+      path: local/opt/fzf-git
     $XDG_CONFIG_HOME/tmux/tmux.conf:
       path: config/tmux/tmux.conf
     $XDG_CONFIG_HOME/tmux/fix-ssh.sh:

Diff for: mutt/muttrc._owa_

@@ -10,6 +10,7 @@ set trash      = +Trash
 set ssl_starttls   = no
 set ssl_force_tls  = no
 set smtp_pass      = "`~/bin/mutt_helpers.sh smtp_pass owa '$from'`"
+set smtp_user      = "`~/bin/mutt_helpers.sh smtp_user owa '$from'`"
 # set smtp_url       = "<see muttrc.local>"
 
 # Addressbook