From 5e6fa8ebb41792ecf1861c40b020dab9c17bb28b Mon Sep 17 00:00:00 2001
From: Darren 'Tadgy' Austin <darren@afterdark.org.uk>
Date: Thu, 12 Oct 2023 21:35:36 +0100
Subject: [PATCH] Sync minimal with master.

---
 .bashrc   |  10 ++---
 .nanorc-5 | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 135 insertions(+), 5 deletions(-)
 create mode 100644 .nanorc-5

diff --git a/.bashrc b/.bashrc
index adfd6ab..4628619 100644
--- a/.bashrc
+++ b/.bashrc
@@ -15,6 +15,8 @@ __prompt_git_status() {
   #							<< or <x - Working tree is behind upstream (x = commits behind when used with next option).
   #   GIT_PROMPT_SHOW_UPSTREAM_EXTENDED=1	In addition to upstream status, show the number of commits difference (inplies above).
   #   GIT_PROMPT_AUTO_PREFETCH=1		Automatically 'prefetch' upstream refs for comparisons (requires GIT_PROMPT_SHOW_UPSTREAM above).
+  #						This can be disabled on a per repository basis using:
+  #							git config --add --bool maintenance.promptprefetchdisabled true
   #   GIT_PROMPT_SHOW_IGNORED=1			Show a ! if the current directory is ignored.
   #   GIT_PROMPT_SHOW_UNSTAGED=1		Show a * if there are unstaged changes (superceeded by above).
   #   GIT_PROMPT_SHOW_UNCOMMITTED=1		Show a & if there are staged but uncommitted changes (superceeded by above).
@@ -63,11 +65,9 @@ __prompt_git_status() {
     # Add upstream status.
     [[ -n "$GIT_PROMPT_SHOW_UPSTREAM" ]] || [[ -n "$GIT_PROMPT_SHOW_UPSTREAM_EXTENDED" ]] && {
       # Whether to run prefetch tasks.
-      [[ -n "$GIT_PROMPT_AUTO_PREFETCH" ]] && {
-        # Only prefetch remotes if in the top-level working directory and if the repository is configured for maintenance work.
-        [[ "$PWD" == "${GIT_REPO_INFO[0]}" ]] && git config --global --get --fixed-value maintenance.repo "$PWD" >/dev/null 2>&1 && {
-          git maintenance run --task=prefetch 2>/dev/null || printf "\\033[1;31m%s\\033[39m\\n" "Git maintenance 'prefetch' task failed." >&2
-        }
+      [[ -n "$GIT_PROMPT_AUTO_PREFETCH" ]] && [[ "$PWD" == "${GIT_REPO_INFO[0]}" ]] && \
+          [[ "$(git config --get --bool maintenance.promptprefetchdisabled 2>/dev/null)" != "true" ]] && {
+        git maintenance run --task=prefetch 2>/dev/null || printf "\\033[1;31m%s\\033[39m\\n" "Git maintenance 'prefetch' task failed." >&2
       }
       COUNT="$(git rev-list --count --left-right "${BRANCH:+refs/prefetch/remotes/origin/}${BRANCH:-@{upstream\}}...HEAD" 2>/dev/null | tr '[:blank:]' ' ')"
       case "$COUNT" in
diff --git a/.nanorc-5 b/.nanorc-5
new file mode 100644
index 0000000..52a48e0
--- /dev/null
+++ b/.nanorc-5
@@ -0,0 +1,130 @@
+## Sample initialization file for GNU nano.
+##
+## Please note that you must have configured nano with --enable-nanorc
+## for this file to be read!  Also note that this file should not be in
+## DOS or Mac format, and that characters specially interpreted by the
+## shell should not be escaped here.
+##
+## To make sure an option is disabled, use "unset <option>".
+##
+## Quotes inside string parameters don't have to be escaped with
+## backslashes.  The last double quote in the string will be treated as
+## its end.  For example, for the "brackets" option, ""')>]}" will match
+## ", ', ), >, ], and }.
+
+## When soft line wrapping is enabled, make it wrap lines at blank characters.
+set atblanks
+
+## Use auto-indentation.
+set autoindent
+
+## When saving a file, create a backup file by adding a tilde (~).
+# set backup
+
+## Automatically hard-wrap the current line when it becomes overlong.
+# set breaklonglines
+
+## Do case-sensitive searches by default.
+# set casesensitive
+
+## Do not use the line below the title bar.
+# set emptyline
+
+## Set the line length for wrapping text and justifying paragraphs.
+set fill -2
+
+## Draw a vertical stripe at the given column
+set guidestripe 161
+
+## Remember the used search/replace strings for the next session.
+set historylog
+
+## Display a "scrollbar" on the righthand side of the edit window.
+# set indicator
+
+## Scroll the buffer contents per half-screen instead of per line.
+# set jumpyscrolling
+
+## Display line numbers to the left of the text area.
+set linenumbers
+
+## Enable vim-style lock-files.
+set locking
+
+## Use libmagic for syntax highlighting suggestions.
+set magic
+
+## Don't display the helpful shortcut lists at the bottom of the screen.
+set nohelp
+
+## Don't add newlines to the ends of files.
+# set nonewlines
+
+## Save the cursor position of files between editing sessions.
+# set positionlog
+
+## Do quick statusbar blanking.
+set quickblank
+
+## Do extended regular expression searches by default.
+# set regexp
+
+## Make the Home key smarter.
+set smarthome
+
+## Enable soft line wrapping (AKA full-line display).
+# set softwrap
+
+## Use this spelling checker instead of the internal one.
+set speller "aspell -x -c"
+
+## Show flags in the title bar.
+set stateflags
+
+## When justifying text, trailing whitespace will automatically be removed.
+set trimblanks
+
+## The two characters used to indicate the presence of tabs and spaces.
+set whitespace »·
+
+## Detect word boundaries more accurately by treating punctuation
+## characters as parts of words.
+set wordbounds
+
+## Let an unmodified Backspace or Delete erase the marked region, without
+## affecting the cut-buffer.
+# set zap
+
+
+## Paint the interface elements of nano.
+set errorcolor brightwhite,red
+set functioncolor magenta
+set keycolor brightwhite
+set numbercolor brightwhite,magenta
+set promptcolor brightwhite,magenta
+set selectedcolor brightwhite,blue
+set statuscolor brightwhite,magenta
+set stripecolor ,magenta
+set titlecolor brightwhite,magenta
+
+
+## Include all existing syntax highlight definitions.
+include "/usr/share/nano/*.nanorc"
+
+
+## Key bindings.
+## The following five functions are not bound to any key by default.
+## You may wish to choose different keys than the ones suggested here.
+# bind ^S savefile main
+# bind M-Q findprevious main
+# bind M-W findnext main
+# bind M-B cutwordleft main
+# bind M-N cutwordright main
+## Set this if your Backspace key sends Del most of the time.
+# bind Del backspace all
+# Unbind the ^J (justification) shortcut as it's annoying.
+unbind ^J main
+# Allow ^Z to suspend nano.
+bind ^Z suspend main
+# Allow marking using ^Space.
+bind ^Space mark main