From e90c014d88be370b4bf1883bcdc0d0b469f7b91a Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Tue, 16 May 2023 19:55:40 -0700
Subject: [PATCH] Bump, add pipx

---
 bin/install_tool                    | 13 ++++++++++---
 dotfiles/config/fish/fish_variables |  3 ++-
 dotfiles/xsessionrc                 |  1 +
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/bin/install_tool b/bin/install_tool
index 65e92f9..276f918 100755
--- a/bin/install_tool
+++ b/bin/install_tool
@@ -118,6 +118,10 @@ function deb_only {
   fi
 }
 
+function require_pipx {
+  command -v pipx >/dev/null 2>&1 || die "Requires pipx"
+}
+
 # Begin main tool selection
 case ${TOOL} in
   john)
@@ -422,10 +426,12 @@ EOF
     add_bin_symlink docker-compose
     ;;
   tldr)
-    pip3 install --user tldr
+    require_pipx
+    pipx install tldr
     ;;
   blint)
-    pip3 install --user blint
+    require_pipx
+    pipx install blint
     ;;
   dust)
     if ! command -v cargo >/dev/null 2>&1 ; then
@@ -514,7 +520,8 @@ EOF
     cargo install igrep
     ;;
   unblob)
-    pip install --user unblob
+    require_pipx
+    pipx install unblob
     ;;
   *)
     echo "Unknown tool: ${TOOL}" >/dev/stderr
diff --git a/dotfiles/config/fish/fish_variables b/dotfiles/config/fish/fish_variables
index af4c3d0..d6a13ac 100644
--- a/dotfiles/config/fish/fish_variables
+++ b/dotfiles/config/fish/fish_variables
@@ -1,7 +1,7 @@
 # This file contains fish universal variable definitions.
 # VERSION: 3.0
 SETUVAR EDITOR:vim
-SETUVAR __fish_initialized:3100
+SETUVAR __fish_initialized:3400
 SETUVAR fish_color_autosuggestion:586e75
 SETUVAR fish_color_cancel:\x2dr
 SETUVAR fish_color_command:93a1a1
@@ -31,3 +31,4 @@ SETUVAR fish_pager_color_completion:B3A06D
 SETUVAR fish_pager_color_description:B3A06D
 SETUVAR fish_pager_color_prefix:cyan\x1e\x2d\x2dunderline
 SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
+SETUVAR fish_pager_color_selected_background:\x2dr
diff --git a/dotfiles/xsessionrc b/dotfiles/xsessionrc
index 5f9bbfe..f25d487 100644
--- a/dotfiles/xsessionrc
+++ b/dotfiles/xsessionrc
@@ -1,4 +1,5 @@
 setxkbmap -option ctrl:nocaps -option compose:ralt
 test -x /usr/bin/xsettingsd && /usr/bin/xsettingsd &
 test -f "$HOME/.env" && "$HOME/.env"
+test -f "$HOME/.shenv" && "$HOME/.shenv"
 test -f "$HOME/.profile" && . "$HOME/.profile"