some install tweaks for python bullshit, udev

This'll need a followup.

home/.sh_common

@@ -195,15 +195,14 @@ function mcd {
 
 # Use official git prompt, if it exists, or fall back to
 # parse_git_branch:
-if [ -f "$HOME/.git-prompt.sh" ]; then
+if [ -f /usr/lib/git-core/git-sh-prompt ]; then
   GIT_PS1_SHOWCOLORHINTS=1
   GIT_PS1_SHOWUNTRACKEDFILES=1
   GIT_PS1_SHOWDIRTYSTATE=1
   GIT_PS1_SHOWUPSTREAM="auto verbose"
   GIT_PS1_SHOWSTASHSTATE=1
 
-  # shellcheck source=/home/brennen/.git-prompt.sh
-  . "$HOME/.git-prompt.sh"
+  . /usr/lib/git-core/git-sh-prompt
 else
   # Emulate __git_ps1 interface which takes 2 params - before part
   # and after part:

home/.vim/vimrc

@@ -537,7 +537,9 @@ let mapleader = ","
   set mouse=a
 
   " https://unix.stackexchange.com/questions/50733/cant-use-mouse-properly-when-running-vim-in-tmux
-  set ttymouse=xterm2
+  " XXX: This seems like it breaks things under Konsole on a recent Debian?
+  "      May no longer be needed.
+  " set ttymouse=xterm2
 
   " render a useful popup menu for right-click instead of extending
   " selection (good for spellchecking, etc.):

home/.xmobarrc

@@ -1,6 +1,6 @@
-Config { font = "xft:Bitstream Vera Sans Mono:size=13:antialias=true"
+Config { font = "xft:Bitstream Vera Sans Mono:size=18:antialias=true"
        , bgColor = "darkgreen"
-       , fgColor = "grey"
+       , fgColor = "white"
        , position = BottomW L 90
        , lowerOnStart = False
 

install.sh

@@ -19,25 +19,29 @@ pasystray pavucontrol exa shellcheck \
   konsole \
   cabal-install \
   ncdu \
-  yubikey-manager
-
-echo 'installing pandoc from cabal'
-cabal update
-cabal install pandoc
+  yubikey-manager \
+  mosh \
+  xcalib
 
 echo 'installing some extra fonts'
 sudo apt-get install fonts-noto-color-emoji fonts-liberation fonts-roboto-hinted texlive-fonts-extra
 
+echo 'installing pandoc from cabal'
+# TODO: restore this or put it elsewhere
+# cabal update
+# cabal install pandoc
+
 echo 'installing perl dependencies'
 # TODO: Some of these belong with specific progs:
 sudo cpan -i Module::Build App::WRT DBI SQL::Abstract DBD::SQLite XML::FeedPP
 
+# TODO: These need to go in a venv now?
 echo 'installing python dependencies and utils'
-sudo apt-get install python3-pip
-pip3 install panflute
-pip3 install mastodon-archive
-pip3 install pinboard-to-sqlite
-pip3 install virtualenv
+# sudo apt-get install python3-pip
+# pip3 install panflute
+# pip3 install mastodon-archive
+# pip3 install pinboard-to-sqlite
+# pip3 install virtualenv
 
 echo 'vim setup'
   if [ -e ~/.vim ]; then
@@ -113,6 +117,12 @@ echo 'lynx setup'
 
 echo 'keyboard setup (Ctrl and CapsLock swap)'
   sudo cp etc/default/keyboard /etc/default/keyboard
+  # TODO: This worked on Debian 12 to trigger the new setup - I _think_.
+  #       Not sure if it's taken on a reboot or if I need to add a rule
+  #       or something to run each time.
+  #
+  #       Sources: https://wiki.debian.org/Keyboard
+  sudo udevadm trigger --subsystem-match=input --action=change
 
 echo 'Remember to:'
 echo '  - install commandlog from https://code.p1k3.com/gitea/brennen/commandlog'