diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2020-09-12 17:30:58 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2020-09-12 17:30:58 +1200 |
commit | 580f15e8ffa32e1f4bc66b7317cf349820aa01dd (patch) | |
tree | c85ac41d2682a5279fa88969ed40e3faa618f4c3 | |
parent | Merge branch 'release/v10.6.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-10.7.0.tar.gz (sig) dotfiles-10.7.0.zip |
Merge branch 'release/v10.7.0'v10.7.0
* release/v10.7.0:
Remove outdated comment on 'dictionary' setting
Set 'backupskip', and have g:undofileskip copy it
Break excludes up for clarity
Simplify systemd unit matching pattern
Prevent systemd units from keeping persistent undo
Refine preferred header display in Mutt
Show "List-Archive:" and "X-List-Archive:" headers
Add settings for undofileskip.vim
Add "I have attached" to match Mutt drop attach
Add "attached are" to Mutt's drop-attach matches
Add XDG basedirs support shim for plenv
-rw-r--r-- | Makefile | 6 | ||||
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | cpanm/profile.d/cpanm.sh | 2 | ||||
-rw-r--r-- | mutt/muttrc | 15 | ||||
-rw-r--r-- | vim/after/plugin/undofileskip.vim | 7 | ||||
-rw-r--r-- | vim/vimrc | 69 |
6 files changed, 69 insertions, 34 deletions
@@ -9,6 +9,7 @@ install-bash-completion \ install-bin \ install-bin-man \ + install-cpanm \ install-curl \ install-dillo \ install-dunst \ @@ -393,6 +394,9 @@ install-bin-man: cp -p -- man/man1/*.1df $(XDG_DATA_HOME)/man/man1 cp -p -- man/man8/*.8df $(XDG_DATA_HOME)/man/man8 +install-cpanm: + cp -p -- cpanm/profile.d/*.sh $(HOME)/.profile.d + install-curl: cp -p -- curl/curlrc $(HOME)/.curlrc @@ -526,7 +530,7 @@ install-perltidy: install-sh mkdir -p -- $(XDG_CONFIG_HOME)/perltidy cp -p -- perltidy/perltidyrc $(XDG_CONFIG_HOME)/perltidy/perltidyrc -install-plenv: install-sh +install-plenv: install-sh install-cpanm cp -p -- plenv/profile.d/*.sh $(HOME)/.profile.d cp -p -- plenv/shrc.d/*.sh $(HOME)/.shrc.d @@ -1,2 +1,2 @@ -tejr dotfiles v10.6.0 -Mon, 07 Sep 2020 05:38:07 +0000 +tejr dotfiles v10.7.0 +Sat, 12 Sep 2020 05:30:54 +0000 diff --git a/cpanm/profile.d/cpanm.sh b/cpanm/profile.d/cpanm.sh new file mode 100644 index 00000000..98b685e3 --- /dev/null +++ b/cpanm/profile.d/cpanm.sh @@ -0,0 +1,2 @@ +PERL_CPANM_HOME=${XDG_CACHE_HOME:-$HOME/.config}/cpanm +export PERL_CPANM_HOME diff --git a/mutt/muttrc b/mutt/muttrc index 1dcd810b..504ce9a9 100644 --- a/mutt/muttrc +++ b/mutt/muttrc @@ -6,7 +6,7 @@ # reflects the usual way I refer to attachments. # set abort_noattach = ask-no -set abort_noattach_regexp = "attached is|(find|i've|see) attached" +set abort_noattach_regexp = "attached (are|is)|(find|i have|i've|see) attached" # Don't assume I don't want to continue editing a message if I didn't change # anything to it; if I want to send a message with just my signature, that's my @@ -186,6 +186,19 @@ my_hdr OpenPGP: id=$pgp_default_key\; \ preference=signencrypt\; \ url=https://keys.openpgp.org/vks/v1/by-fingerprint/$pgp_default_key +# Reset whatever ignore/unignore settings we've been passed by the system +# config, and use our own basic set, excluding User-Agent and other generally +# uninteresting fields. +# +ignore * +unignore date: from: to: cc: subject: + +# Also show List-Archive and X-List-Archive headers, both to show the source +# list, and to provide me with a web link to it to pass on to anyone +# interested. +# +unignore list-archive: x-list-archive: + # Because I (personally) never want to encrypt mail without signing it, add in # a hook for sending or changing a message that forces a signature if it's # encrypted but not signed. This may not suit anyone else reading. diff --git a/vim/after/plugin/undofileskip.vim b/vim/after/plugin/undofileskip.vim new file mode 100644 index 00000000..e7116940 --- /dev/null +++ b/vim/after/plugin/undofileskip.vim @@ -0,0 +1,7 @@ +" If undofileskip.vim loaded, add a few applicable paths to its list +if !exists('g:undofileskip') + finish +endif + +" Just split and copy 'backupskip' +let g:undofileskip = option#Split(&backupskip) @@ -2,7 +2,7 @@ " Tom Ryder (tejr)’s Literate Vimrc " ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ " -" Last updated: Sat, 18 Jul 2020 15:09:37 UTC +" Last updated: Sat, 12 Sep 2020 05:21:43 UTC " " │ And I was lifted up in heart, and thought " │ Of all my late-shown prowess in the lists, @@ -246,31 +246,49 @@ endif " Files in certain directories on Unix-compatible filesystems should not be " backed up, for security reasons. This is particularly important if editing -" temporary files created by sudoedit(8). On Unix-like systems, we here add -" a few paths to the default value of 'backupskip' in order to prevent the -" creation of such undesired backup files. -" -" * /dev/shm: RAM disk, default path for password-store’s temporary files -" * /usr/tmp: Hard-coded path for sudoedit(8) [1/2] -" * /var/tmp: Hard-coded path for sudoedit(8) [2/2] -" -" Prior to v8.1.1519, Vim didn’t check patterns added to 'backupskip' for -" uniqueness, so adding the same path repeatedly resulted in duplicate strings -" in the value. This was due to the absence of the P_NODUP flag for the -" option’s definition in src/option.c in the Vim source code. If we’re using -" a version older than v8.1.1519, we’ll need to explicitly reset 'backupskip' -" to its default value before adding patterns to it, so that reloading this -" file doesn’t stack up multiple copies of any added paths. -" -" <https://github.com/vim/vim/releases/tag/v8.1.1519> +" temporary files created by sudoedit(8). We add a few path patterns to the +" default value of 'backupskip' here, in order to prevent the creation of such +" undesired backup files. " if has#('unix') + + " Prior to v8.1.1519, Vim didn’t check patterns added to 'backupskip' for + " uniqueness, so adding the same path repeatedly resulted in duplicate strings + " in the value. This was due to the absence of the P_NODUP flag for the + " option’s definition in src/option.c in the Vim source code. If we’re using + " a version older than v8.1.1519, we’ll need to explicitly reset 'backupskip' + " to its default value before adding patterns to it, so that reloading this + " file doesn’t stack up multiple copies of any added paths. + " + " <https://github.com/vim/vim/releases/tag/v8.1.1519> + " if !has#('patch-8.1.1519') set backupskip& endif - set backupskip^=/dev/shm/*,/usr/tmp/*,/var/tmp/* + + " Typical temporary file locations + "" RAM disk, default path for password-store’s temporary files + set backupskip+=/dev/shm/* + "" Hard-coded paths for sudoedit + set backupskip+=/usr/tmp/*,/var/tmp/* + + " Per-repository temporary files for Git + "" Commit messages + set backupskip+=*.git/*_EDITMSG + "" Patch edits + set backupskip+=*.git/ADD_EDIT.patch + "" Interactive rebase manifests + set backupskip+=*.git/rebase-merge/git-rebase-todo + + " systemd user manager unit files + "" Full unit files + set backupskip+=*/systemd/user/.#?*.?*???????????????? + "" Per-unit overrides + set backupskip+=*/systemd/user/?*.?*.d/.#override.conf???????????????? + endif + " Keep swap files for file buffers in a dedicated directory, rather than the " default of writing them to the same directory as the buffer file. Add two " trailing slashes to the path to prompt Vim to use the full escaped path in @@ -424,8 +442,8 @@ endif " At some point, I may end up having to set this option along with 'spellfile' " a bit more intelligently to ensure that spell checking and dictionary " function consistently, and with reference to the same resources. For the -" moment, I’ve just added another entry referring to a directory in the user -" runtime directory, but I don’t have anything distinct to put there yet. +" moment, I’ve just added additional entries referring to the user runtime +" directory. " " In much the same way, we add an expected path to a thesaurus, for completion " with CTRL-X CTRL-T in insert mode, or with ‘t’ added to 'completeopt'. The @@ -436,15 +454,6 @@ endif " to remove the first two metadata lines from thesaurus.txt, as Vim appeared " to interpret them as part of the body data. " -" Extra checks for appending the 'dictionary' and 'thesaurus' paths need to be -" made, because the P_NDNAME property is assigned to them, which enforces -" a character blacklist in the option value. We check for the expected Vim -" error code here, and if the path offends, we just skip the setting entirely, -" rather than throwing cryptic errors at the user. None of the blacklisted -" characters are particularly wise characters to have in paths, anyway, legal -" though they may be on Unix filesystems. We can’t work around this one with -" 'isfname'; the blacklist is hard-coded. -" set dictionary^=/usr/share/dict/words if s:xdgdatahome !=# '' || !empty(s:xdgdatadirs) execute 'set dictionary^='.option#Escape(join(map( |