From a77cfc9408ee23e57fe9b6ec874a7b17a7a25037 Mon Sep 17 00:00:00 2001
From: Darren 'Tadgy' Austin <darren@afterdark.org.uk>
Date: Tue, 29 Sep 2020 17:03:47 +0100
Subject: [PATCH 1/6] Update htoprc.

---
 .config/htop/htoprc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.config/htop/htoprc b/.config/htop/htoprc
index 7894e29..338eb97 100644
--- a/.config/htop/htoprc
+++ b/.config/htop/htoprc
@@ -1,6 +1,6 @@
 # Beware! This file is rewritten by htop when settings are changed in the interface.
 # The parser is also very primitive, and not human-friendly.
-fields=0 48 17 18 38 39 40 2 46 47 49 1 
+fields=0 48 17 18 38 39 40 2 46 47 49 1
 sort_key=46
 sort_direction=1
 hide_threads=0
@@ -20,7 +20,7 @@ update_process_names=0
 account_guest_in_cpu_meter=0
 color_scheme=0
 delay=15
-left_meters=AllCPUs CPU 
-left_meter_modes=1 1 
-right_meters=Uptime LoadAverage Tasks Memory Swap 
-right_meter_modes=2 2 2 1 1 
+left_meters=AllCPUs CPU
+left_meter_modes=1 1
+right_meters=Uptime LoadAverage Tasks Memory Swap
+right_meter_modes=2 2 2 1 1

From 6de264500e5825f086397838ce234e5ce3325eb8 Mon Sep 17 00:00:00 2001
From: Darren 'Tadgy' Austin <darren@afterdark.org.uk>
Date: Tue, 29 Sep 2020 17:04:32 +0100
Subject: [PATCH 2/6] Stop pcmanfm from mounting devices on insertion.

---
 .config/pcmanfm/LXDE/pcmanfm.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.config/pcmanfm/LXDE/pcmanfm.conf b/.config/pcmanfm/LXDE/pcmanfm.conf
index 4fba658..b8c62b6 100644
--- a/.config/pcmanfm/LXDE/pcmanfm.conf
+++ b/.config/pcmanfm/LXDE/pcmanfm.conf
@@ -2,8 +2,8 @@
 bm_open_method=0
 
 [volume]
-mount_on_startup=1
-mount_removable=1
+mount_on_startup=0
+mount_removable=0
 autorun=1
 
 [autorun]

From 44acd090aee5890dd625253b34d5fb939c407768 Mon Sep 17 00:00:00 2001
From: Darren 'Tadgy' Austin <darren@afterdark.org.uk>
Date: Tue, 29 Sep 2020 17:13:33 +0100
Subject: [PATCH 3/6] Update gitignore - don't track Xauthority or bash_history
 files.

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 15e522a..26db236 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,10 +6,12 @@
 .*.swp
 .ICEauthority
 .Xauthority
+.Xauthority.orig
 .ab*
 .alpine-smime/
 .aspell.*
 .bash_history
+.bash_history-*
 .cache/
 .gnupg
 .lesshst

From 61f2bae0b84106e7df70a58d405d19d1fe1ee317 Mon Sep 17 00:00:00 2001
From: Darren 'Tadgy' Austin <darren@afterdark.org.uk>
Date: Tue, 29 Sep 2020 18:43:51 +0100
Subject: [PATCH 4/6] Clean up .nanorc-* files.

---
 .nanorc-2.6 |   7 +++-
 .nanorc-2.7 | 100 ---------------------------------------------
 .nanorc-2.9 | 101 ----------------------------------------------
 .nanorc-3.2 | 106 ------------------------------------------------
 .nanorc-4.3 | 114 ----------------------------------------------------
 .nanorc-4.9 | 114 ----------------------------------------------------
 6 files changed, 5 insertions(+), 537 deletions(-)
 delete mode 100644 .nanorc-2.7
 delete mode 100644 .nanorc-2.9
 delete mode 100644 .nanorc-3.2
 delete mode 100644 .nanorc-4.3
 delete mode 100644 .nanorc-4.9

diff --git a/.nanorc-2.6 b/.nanorc-2.6
index b1cc6cd..628b0ea 100644
--- a/.nanorc-2.6
+++ b/.nanorc-2.6
@@ -16,7 +16,7 @@
 ## ", ', ), >, ], and }.
 
 ## Use auto-indentation.
-set autoindent
+# set autoindent
 
 ## Do case-sensitive searches by default.
 # set casesensitive
@@ -33,6 +33,9 @@ set justifytrim
 ## Enable vim-style lock-files.
 set locking
 
+## Use the blank line below the titlebar as extra editing space.
+set morespace
+
 ## Don't display the helpful shortcut lists at the bottom of the screen.
 set nohelp
 
@@ -55,7 +58,7 @@ set quickblank
 set smarthome
 
 ## Use smooth scrolling as the default.
-# set smooth
+set smooth
 
 ## Enable soft line wrapping (AKA full-line display).
 # set softwrap
diff --git a/.nanorc-2.7 b/.nanorc-2.7
deleted file mode 100644
index 59a04d6..0000000
--- a/.nanorc-2.7
+++ /dev/null
@@ -1,100 +0,0 @@
-## 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>".
-##
-## For the options that take parameters, the default value is given.
-## Other options are unset by default.
-##
-## 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 }.
-
-## Use auto-indentation.
-set autoindent
-
-## Do case-sensitive searches by default.
-# set casesensitive
-
-## Set the line length for wrapping text and justifying paragraphs.
-set fill -2
-
-## Remember the used search/replace strings for the next session.
-set historylog
-
-## When justifying text, trailing whitespace will automatically be removed.
-set justifytrim
-
-## Display line numbers to the left of the text area.
-set linenumbers
-
-## Enable vim-style lock-files.
-set locking
-
-## 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
-
-## Don't wrap text at all.
-set nowrap
-
-## 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
-
-## Use smooth scrolling as the default.
-# set smooth
-
-## Enable soft line wrapping (AKA full-line display).
-# set softwrap
-
-## Use this spelling checker instead of the internal one.
-set speller "aspell -x -c"
-
-## Allow nano to be suspended.
-set suspend
-
-## 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
-
-
-## Interface colours.
-set functioncolor magenta
-set keycolor brightwhite
-set numbercolor magenta
-set statuscolor magenta
-set titlecolor 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
diff --git a/.nanorc-2.9 b/.nanorc-2.9
deleted file mode 100644
index 569d5b8..0000000
--- a/.nanorc-2.9
+++ /dev/null
@@ -1,101 +0,0 @@
-## 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>".
-##
-## For the options that take parameters, the default value is given.
-## Other options are unset by default.
-##
-## 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 }.
-
-## Use auto-indentation.
-set autoindent
-
-## Do case-sensitive searches by default.
-# set casesensitive
-
-## Set the line length for wrapping text and justifying paragraphs.
-set fill -2
-
-## Remember the used search/replace strings for the next session.
-set historylog
-
-## Display line numbers to the left of the text area.
-set linenumbers
-
-## Enable vim-style lock-files.
-set locking
-
-## 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
-
-## Don't wrap text at all.
-set nowrap
-
-## 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
-
-## Use smooth scrolling as the default.
-# set smooth
-
-## Enable soft line wrapping (AKA full-line display).
-# set softwrap
-
-## Use this spelling checker instead of the internal one.
-set speller "aspell -x -c"
-
-## Allow nano to be suspended.
-set suspend
-
-## 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
-
-
-## Interface colours.
-set functioncolor magenta
-set keycolor brightwhite
-set numbercolor magenta
-set selectedcolor brightwhite,blue
-set statuscolor magenta
-set titlecolor 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
diff --git a/.nanorc-3.2 b/.nanorc-3.2
deleted file mode 100644
index 0ad5df8..0000000
--- a/.nanorc-3.2
+++ /dev/null
@@ -1,106 +0,0 @@
-## 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>".
-##
-## For the options that take parameters, the default value is given.
-## Other options are unset by default.
-##
-## 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
-
-## Do case-sensitive searches by default.
-# set casesensitive
-
-## Set the line length for wrapping text and justifying paragraphs.
-set fill -2
-
-## Remember the used search/replace strings for the next session.
-set historylog
-
-## Display line numbers to the left of the text area.
-set linenumbers
-
-## Enable vim-style lock-files.
-set locking
-
-## 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
-
-## Don't wrap text at all.
-set nowrap
-
-## 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
-
-## Use smooth scrolling as the default.
-# set smooth
-
-## Enable soft line wrapping (AKA full-line display).
-# set softwrap
-
-## Use this spelling checker instead of the internal one.
-# set speller "aspell -x -c"
-
-## Allow nano to be suspended.
-set suspend
-
-## When justifying text, trailing whitespace will automatically be removed.
-set trimblanks
-
-## 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.
-## This is an example; by default there are no colors.
-set errorcolor brightwhite,red
-set functioncolor magenta
-set keycolor brightwhite
-set numbercolor magenta
-set selectedcolor brightwhite,blue
-set statuscolor magenta
-set titlecolor 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
diff --git a/.nanorc-4.3 b/.nanorc-4.3
deleted file mode 100644
index bce3d8b..0000000
--- a/.nanorc-4.3
+++ /dev/null
@@ -1,114 +0,0 @@
-## 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>".
-##
-## For the options that take parameters, the default value is given.
-## Other options are unset by default.
-##
-## 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
-
-## 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 140
-
-## Remember the used search/replace strings for the next session.
-set historylog
-
-## 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
-
-## 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
-
-## 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"
-
-## Allow nano to be suspended.
-set suspend
-
-## 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.
-## This is an example; by default there are no colors.
-set errorcolor brightwhite,red
-set functioncolor magenta
-set keycolor brightwhite
-set numbercolor magenta
-set selectedcolor brightwhite,blue
-set statuscolor magenta
-set stripecolor brightblue
-set titlecolor 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
diff --git a/.nanorc-4.9 b/.nanorc-4.9
deleted file mode 100644
index 1ede8fd..0000000
--- a/.nanorc-4.9
+++ /dev/null
@@ -1,114 +0,0 @@
-## 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>".
-##
-## For the options that take parameters, the default value is given.
-## Other options are unset by default.
-##
-## 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
-
-## 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 140
-
-## Remember the used search/replace strings for the next session.
-set historylog
-
-## 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
-
-## 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
-
-## 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"
-
-## Allow nano to be suspended.
-set suspendable
-
-## 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.
-## This is an example; by default there are no colors.
-set errorcolor brightwhite,red
-set functioncolor magenta
-set keycolor brightwhite
-set numbercolor magenta
-set selectedcolor brightwhite,blue
-set statuscolor magenta
-set stripecolor brightblue
-set titlecolor 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

From f159818c8822a2fca9cc024d045e2678de4f95db Mon Sep 17 00:00:00 2001
From: Darren 'Tadgy' Austin <darren@afterdark.org.uk>
Date: Tue, 29 Sep 2020 18:46:17 +0100
Subject: [PATCH 5/6] Add new .nanorc-* for newer versions of nano.

---
 .nanorc-4.8 | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++
 .nanorc-5.2 | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 232 insertions(+)
 create mode 100644 .nanorc-4.8
 create mode 100644 .nanorc-5.2

diff --git a/.nanorc-4.8 b/.nanorc-4.8
new file mode 100644
index 0000000..5aeada2
--- /dev/null
+++ b/.nanorc-4.8
@@ -0,0 +1,114 @@
+## 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>".
+##
+## For the options that take parameters, the default value is given.
+## Other options are unset by default.
+##
+## 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
+
+## 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 140
+
+## Remember the used search/replace strings for the next session.
+set historylog
+
+## 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
+
+## 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
+
+## 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"
+
+## Allow nano to be suspended.
+set suspend
+
+## 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.
+## This is an example; by default there are no colors.
+set errorcolor brightwhite,red
+set functioncolor magenta
+set keycolor brightwhite
+set numbercolor magenta
+set selectedcolor brightwhite,blue
+set statuscolor magenta
+set stripecolor brightblue
+set titlecolor 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
diff --git a/.nanorc-5.2 b/.nanorc-5.2
new file mode 100644
index 0000000..51300c3
--- /dev/null
+++ b/.nanorc-5.2
@@ -0,0 +1,118 @@
+## 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>".
+##
+## For the options that take parameters, the default value is given.
+## Other options are unset by default.
+##
+## 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
+
+## 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 140
+
+## 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
+
+## 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
+
+## 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"
+
+## Allow nano to be suspended.
+set suspendable
+
+## 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.
+## This is an example; by default there are no colors.
+set errorcolor brightwhite,red
+set functioncolor magenta
+set keycolor brightwhite
+set numbercolor magenta
+set selectedcolor brightwhite,blue
+set statuscolor magenta
+# set stripecolor brightblue
+set stripecolor magenta
+set titlecolor 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

From 60f84452cf365a3b7c7ef1f9169152538cb252f6 Mon Sep 17 00:00:00 2001
From: Darren 'Tadgy' Austin <darren@afterdark.org.uk>
Date: Wed, 2 Dec 2020 20:06:29 +0000
Subject: [PATCH 6/6] Added screen_attach function to start/reattach screen
 sessions on console/xterm.

---
 .bash_profile |  7 ++++++-
 .bashrc       | 27 ++++++++++++++++++++++++++-
 .dmrc         |  2 +-
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/.bash_profile b/.bash_profile
index 237c8aa..66bfbf6 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -7,7 +7,6 @@ export LANG="en_GB.UTF-8"
 export LC_COLLATE="POSIX"	# 'C' causes issues with some applications
 # export LC_CTYPE="POSIX"	# Not sure why I set this in the first place...
 export LESS="-RMi -PM?f%F:stdin.    --    Page %dt of %D    --    %lt/%L (%Pt\%)$"
-export MANPAGER="less -Mis -PM'Page %dt$'"
 export PAGER="less"
 export PATH="/usr/local/sbin:/usr/sbin:/opt/sbin:/sbin:$PATH"
 export VISUAL="$EDITOR"
@@ -19,10 +18,12 @@ if [[ "$_PLATFORM" = "Linux" ]]; then
   export I_WANT_A_BROKEN_PS=1
   export LYNX_CFG="$HOME/.lynx.cfg"
   export LYNX_LSS="$HOME/.lynx.lss"
+  export MANPAGER="most"
   export MANPATH="$HOME/.local/share/man:$MANPATH"
   hash dircolors >/dev/null 2>&1 && eval "$(dircolors -b ~/.dir_colors)"
 elif [[ "$_PLATFORM" = "Darwin" ]]; then
   export LSCOLORS="ExGxdxdxCxDxDxbcacbeae"
+  export MANPAGER="less -Mis -PM'Page %dt$'"
   export MANPATH="/opt/local/share/man:$MANPATH"
   export PATH="/opt/local/sbin:/opt/local/bin:$PATH"
 else
@@ -116,6 +117,10 @@ unset _OUTPUT _PLATFORM
 
 # Screen.
 hash screen >/dev/null 2>&1 && {
+  # Reattach existing screens.
+  screen_attach
+
+  # Output some screen info.
   export SCREENDIR="$HOME/.screen-$(hostname --short)"
   if [[ ! -e ~/.hushlogin ]]; then
     if [[ ! -z "$STY" ]]; then
diff --git a/.bashrc b/.bashrc
index cd036b9..691948f 100644
--- a/.bashrc
+++ b/.bashrc
@@ -153,6 +153,30 @@ _unlock_agents_file() {
   fi
 }
 
+screen_attach() {
+  local TTY SCREENS
+  # Only continue if it's not a remote connection, and not inside screen already.
+  [[ -z "$SSH_TTY" ]] && [[ -z "$STY" ]] && {
+    TTY="$(tty | cut -d/ -f3-)"
+    SCREENS="$(screen -list | fgrep -v "Dead" | fgrep "$HOSTNAME" | fgrep "${TTY//\//-}")"
+    case "$(echo "${SCREENS:--n}" | wc -l)" in
+      0)
+        # No screens found - start a new instance.
+        screen
+        ;;
+      1)
+        # Just one screen - reconnect.
+        screen -dr "${TTY//\//-}.$HOSTNAME"
+        ;;
+      *)
+        # Multiple screens - output a list
+        echo "Multiple screens found for $TTY:"
+        echo "$SCREENS" | sed -e 's/^/    /g'
+        ;;
+    esac
+  }
+}
+
 # Make bash a little more pleasent - these are valid for all versions.
 shopt -s cdspell checkhash checkwinsize cmdhist histappend no_empty_cmd_completion
 
@@ -205,7 +229,8 @@ unset _COLOUR
 
 # Set the debugger prompt.
 # PS4="+(\\\$? = \$?) \${BASH_SOURCE##*/}\${FUNCNAME:+(\$FUNCNAME)}:\$LINENO: "
-PS4="+(\[\e[33m\]\\\$? = \$?\[$(tput sgr0)\]) \[$(tput bold)$(tput setaf 4)\]\${BASH_SOURCE##*/}\[$(tput sgr0)\]\${FUNCNAME:+(\[$(tput bold)$(tput setaf 2)\]\$FUNCNAME\[$(tput sgr0)\])}:\[$(tput bold)$(tput setaf 1)\]\$LINENO\[$(tput sgr0)\]: "
+# PS4="+(\[\e[33m\]\\\$? = \$?\[$(tput sgr0)\]) \[$(tput bold)$(tput setaf 4)\]\${BASH_SOURCE##*/}\[$(tput sgr0)\]\${FUNCNAME:+(\[$(tput bold)$(tput setaf 2)\]\$FUNCNAME\[$(tput sgr0)\])}:\[$(tput bold)$(tput setaf 1)\]\$LINENO\[$(tput sgr0)\]: "
+export PS4="+(\[\e[33m\]\$?\[$(tput sgr0)\]) \[$(tput bold)$(tput setaf 4)\]\${BASH_SOURCE##*/}\[$(tput sgr0)\]\${FUNCNAME:+(\[$(tput bold)$(tput setaf 2)\]\$FUNCNAME\[$(tput sgr0)\])}:\[$(tput bold)$(tput setaf 1)\]\$LINENO\[$(tput sgr0)\]: "
 
 # The commands to execute before the prompt is displayed.
 PROMPT_COMMAND="_agent_prompt_command"
diff --git a/.dmrc b/.dmrc
index 2817c51..74e11a4 100644
--- a/.dmrc
+++ b/.dmrc
@@ -1,2 +1,2 @@
 [Desktop]
-Session=LXDE
+Session=lightdm-xsession