From 39f188c7bd427d3012b4d3331ed8ff27e8ffdac4 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 3 May 2020 04:05:04 +1200 Subject: Use a dash rather than a three-period ellipsis --- vim/vimrc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index a08a4287..29d99643 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -2,7 +2,7 @@ " Tom Ryder (tejr)’s Literate Vimrc " ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ " -" Last updated: Sat, 02 May 2020 15:15:57 UTC +" Last updated: Sat, 02 May 2020 15:52:53 UTC " " │ And I was lifted up in heart, and thought " │ Of all my late-shown prowess in the lists, @@ -924,9 +924,9 @@ endif " almost always stands out too much for my liking. " " You’d think the pattern here could be used to match the color scheme name, -" and it can be...after patch v7.4.108, when Christian Brabandt fixed it. -" Until that version, it matched against the current buffer name, so we’re -" forced to have an explicit test in the command instead. +" and it can be—after patch v7.4.108, when Christian Brabandt fixed it. Until +" that version, it matched against the current buffer name, so we’re forced to +" have an explicit test in the command instead. " " " -- cgit v1.2.3 From 833ff83ba7b6198aad26d1ba2044a7e0fbfcea0d Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 3 May 2020 15:10:19 +1200 Subject: Remove trailing slashes from default XDG basedir --- vim/autoload/xdg.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/autoload/xdg.vim b/vim/autoload/xdg.vim index 2b90f5f1..a91aaa58 100644 --- a/vim/autoload/xdg.vim +++ b/vim/autoload/xdg.vim @@ -4,7 +4,7 @@ let s:defaults = { \ 'XDG_CONFIG_HOME': '~/.config', \ 'XDG_CONFIG_DIRS': '/etc/xdg', \ 'XDG_DATA_HOME': '~/.local/share', - \ 'XDG_DATA_DIRS': '/usr/local/share/:/usr/share/', + \ 'XDG_DATA_DIRS': '/usr/local/share:/usr/share', \} let s:subdir = 'vim' -- cgit v1.2.3 From 75e67b7714fe5e58033467767f8b0c415ce068a1 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 3 May 2020 21:49:37 +1200 Subject: Update recommended path in documentation --- README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 774031a0..f8201416 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,8 @@ into a personal suite of custom Unix tools. Installation ------------ - $ git clone https://sanctum.geek.nz/code/dotfiles.git ~/.dotfiles - $ cd ~/.dotfiles + $ git clone https://sanctum.geek.nz/code/dotfiles.git ~/.local/share/dotfiles + $ cd ~/.local/share/dotfiles $ git submodule init $ git submodule update $ make @@ -56,16 +56,16 @@ The remaining files can be installed with the other `install-*` targets. Try ### Configuration To save a set of `make` targets useful for a specific user or host, you can -save them in a newline-separated file `~/.dotfiles.conf`, and install using +save them in a newline-separated file `~/.local/share/dotfiles.conf`, and install using that with the special `install-conf` target. This can include variable settings, too: $ cd - $ cat .dotfiles.conf + $ cat .local/share/dotfiles.conf install-bash install-bin EMAIL=you@example.com - $ make -C .dotfiles install-conf + $ make -C .local/share/dotfiles install-conf Tools ----- @@ -156,16 +156,16 @@ testing `BASH_VERSINFO` appropriately. A terminal session with my prompt looks something like this: ~$ ssh remote - remote:~$ cd .dotfiles - remote:~/.dotfiles(master+!)$ git status + remote:~$ cd .local/share/dotfiles + remote:~/.local/share/dotfiles(master+!)$ git status M README.md M bash/bashrc.d/prompt.bash A init - remote:~/.dotfiles(master+!)$ foobar + remote:~/.local/share/dotfiles(master+!)$ foobar foobar: command not found - remote:~/.dotfiles(master+!)<127>$ sleep 5 & + remote:~/.local/share/dotfiles(master+!)<127>$ sleep 5 & [1] 28937 - remote:~/.dotfiles(master+!){1}$ + remote:~/.local/share/dotfiles(master+!){1}$ The hostname is elided if not connected via SSH. The working directory with tilde abbreviation for `$HOME` is always shown. The rest of the prompt expands -- cgit v1.2.3 From d27aef7eda22d7b817583b0daf8ea6d83b07cf41 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 3 May 2020 21:49:54 +1200 Subject: Suggest creation of recommended path in docs --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f8201416..98cd5515 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,7 @@ into a personal suite of custom Unix tools. Installation ------------ + $ mkdir -p ~/.local/share $ git clone https://sanctum.geek.nz/code/dotfiles.git ~/.local/share/dotfiles $ cd ~/.local/share/dotfiles $ git submodule init -- cgit v1.2.3 From 6f8ec849bd50918aa0989c23780280fa1574e17a Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 3 May 2020 21:50:03 +1200 Subject: Add comment to installation dry run command --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 98cd5515..84137c2a 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Installation $ git submodule init $ git submodule update $ make - $ make -n install + $ make -n install # Check output carefully $ make install For the default `all` target, you'll need a POSIX-fearing userland, including -- cgit v1.2.3 From 791131ac8936122dfc78a74e87373800142536d3 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 3 May 2020 21:52:58 +1200 Subject: Update documentation of personal mail paths --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 84137c2a..dfa2ae7d 100644 --- a/README.md +++ b/README.md @@ -301,7 +301,7 @@ neither tilde nor `$HOME` expansion works for this. ### Mutt -My mail is kept in individual Maildirs under `~/Mail`, with `inbox` being where +My mail is kept in individual Maildirs under `~/mail`, with the system mail spool in e.g. `/var/mail/tejr` being where most unfiltered mail is sent. I use [Getmail](http://pyropus.ca/software/getmail/), [maildrop](https://www.courier-mta.org/maildrop/), and -- cgit v1.2.3 From ec497cc9aa9ccde39f3cd97b165716fe36bfce3c Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 3 May 2020 21:54:18 +1200 Subject: Remove outdated description of GnuPG config gen I lean much more on defaults now, and haven't used m4/mi5 to generate this config since I drastically pared it back in 002551c. --- README.md | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/README.md b/README.md index dfa2ae7d..91ca41b7 100644 --- a/README.md +++ b/README.md @@ -116,7 +116,7 @@ Configuration is included for: * [X11](https://www.x.org/wiki/) -- Windowing system with network transparency for Unix -The configurations for shells, GnuPG, Mutt, tmux, and Vim are the most +The configurations for shells, Mutt, tmux, and Vim are the most expansive, and most likely to be of interest. The i3 configuration is mostly changed to make window switching behave like Vim windows and tmux panes do, and there's a fair few resources defined for rxvt-unicode. @@ -291,14 +291,6 @@ These are experimental; I do not like Z shell much at the moment. The files started as a joke (`exec bash`). `zsh` shells default to having a prompt colored cyan. -### GnuPG - -The configuration for GnuPG is intended to follow [RiseUp's OpenPGP best -practices](https://riseup.net/en/security/message-security/openpgp/best-practices). -The configuration file is rebuilt using `mi5(1df)` and `make(1)` because it -requires hard-coding a path to the SKS keyserver certificate authority, and -neither tilde nor `$HOME` expansion works for this. - ### Mutt My mail is kept in individual Maildirs under `~/mail`, with the system mail spool in e.g. `/var/mail/tejr` being where -- cgit v1.2.3 From 05e616d95785bf059b87433c95b2ccd40c7d8a0a Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 3 May 2020 21:59:34 +1200 Subject: Reformat paragraphs in README.md --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 91ca41b7..dab9534e 100644 --- a/README.md +++ b/README.md @@ -57,9 +57,9 @@ The remaining files can be installed with the other `install-*` targets. Try ### Configuration To save a set of `make` targets useful for a specific user or host, you can -save them in a newline-separated file `~/.local/share/dotfiles.conf`, and install using -that with the special `install-conf` target. This can include variable -settings, too: +save them in a newline-separated file `~/.local/share/dotfiles.conf`, and +install using that with the special `install-conf` target. This can include +variable settings, too: $ cd $ cat .local/share/dotfiles.conf @@ -293,8 +293,8 @@ colored cyan. ### Mutt -My mail is kept in individual Maildirs under `~/mail`, with the system mail spool in e.g. `/var/mail/tejr` being where -most unfiltered mail is sent. I use +My mail is kept in individual Maildirs under `~/mail`, with the system mail +spool in e.g. `/var/mail/tejr` being where most unfiltered mail is sent. I use [Getmail](http://pyropus.ca/software/getmail/), [maildrop](https://www.courier-mta.org/maildrop/), and [msmtp](https://marlam.de/msmtp/); the configurations for these are not -- cgit v1.2.3 From 4be184ac5859a96070c8f1c7ef751a67c72212ad Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 3 May 2020 21:59:43 +1200 Subject: Bump VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 59c843da..fa9a8612 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -tejr dotfiles v8.25.2 -Sun, 03 May 2020 03:44:32 +0000 +tejr dotfiles v8.26.0 +Sun, 03 May 2020 09:59:43 +0000 -- cgit v1.2.3 From aa853469b23e98cdd593b2928f3e6ad3fb48b979 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 3 May 2020 21:59:46 +1200 Subject: Update dotfiles(7) manual page --- man/man7/dotfiles.7df | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/man/man7/dotfiles.7df b/man/man7/dotfiles.7df index 3e70c142..dd4c2286 100644 --- a/man/man7/dotfiles.7df +++ b/man/man7/dotfiles.7df @@ -15,12 +15,13 @@ have been added, making it into a personal suite of custom Unix tools. .IP .nf \f[C] -$\ git\ clone\ https://sanctum.geek.nz/code/dotfiles.git\ ~/.dotfiles -$\ cd\ ~/.dotfiles +$\ mkdir\ \-p\ ~/.local/share +$\ git\ clone\ https://sanctum.geek.nz/code/dotfiles.git\ ~/.local/share/dotfiles +$\ cd\ ~/.local/share/dotfiles $\ git\ submodule\ init $\ git\ submodule\ update $\ make -$\ make\ \-n\ install +$\ make\ \-n\ install\ \ #\ Check\ output\ carefully $\ make\ install \f[] .fi @@ -78,18 +79,18 @@ directory to see a list. .PP To save a set of \f[C]make\f[] targets useful for a specific user or host, you can save them in a newline\-separated file -\f[C]~/.dotfiles.conf\f[], and install using that with the special -\f[C]install\-conf\f[] target. +\f[C]~/.local/share/dotfiles.conf\f[], and install using that with the +special \f[C]install\-conf\f[] target. This can include variable settings, too: .IP .nf \f[C] $\ cd -$\ cat\ .dotfiles.conf +$\ cat\ .local/share/dotfiles.conf install\-bash install\-bin EMAIL=you\@example.com -$\ make\ \-C\ .dotfiles\ install\-conf +$\ make\ \-C\ .local/share/dotfiles\ install\-conf \f[] .fi .SS Tools @@ -174,7 +175,7 @@ Vim (https://www.vim.org/) \[en] Vi IMproved, a text editor X11 (https://www.x.org/wiki/) \[en] Windowing system with network transparency for Unix .PP -The configurations for shells, GnuPG, Mutt, tmux, and Vim are the most +The configurations for shells, Mutt, tmux, and Vim are the most expansive, and most likely to be of interest. The i3 configuration is mostly changed to make window switching behave like Vim windows and tmux panes do, and there's a fair few resources @@ -230,16 +231,16 @@ A terminal session with my prompt looks something like this: .nf \f[C] ~$\ ssh\ remote -remote:~$\ cd\ .dotfiles -remote:~/.dotfiles(master+!)$\ git\ status +remote:~$\ cd\ .local/share/dotfiles +remote:~/.local/share/dotfiles(master+!)$\ git\ status \ M\ README.md M\ \ bash/bashrc.d/prompt.bash A\ \ init -remote:~/.dotfiles(master+!)$\ foobar +remote:~/.local/share/dotfiles(master+!)$\ foobar foobar:\ command\ not\ found -remote:~/.dotfiles(master+!)<127>$\ sleep\ 5\ & +remote:~/.local/share/dotfiles(master+!)<127>$\ sleep\ 5\ & [1]\ 28937 -remote:~/.dotfiles(master+!){1}$ +remote:~/.local/share/dotfiles(master+!){1}$ \f[] .fi .PP @@ -431,18 +432,11 @@ All shells in this family default to a yellow prompt if detected. These are experimental; I do not like Z shell much at the moment. The files started as a joke (\f[C]exec\ bash\f[]). \f[C]zsh\f[] shells default to having a prompt colored cyan. -.SS GnuPG -.PP -The configuration for GnuPG is intended to follow RiseUp's OpenPGP best -practices (https://riseup.net/en/security/message-security/openpgp/best-practices). -The configuration file is rebuilt using \f[C]mi5(1df)\f[] and -\f[C]make(1)\f[] because it requires hard\-coding a path to the SKS -keyserver certificate authority, and neither tilde nor \f[C]$HOME\f[] -expansion works for this. .SS Mutt .PP -My mail is kept in individual Maildirs under \f[C]~/Mail\f[], with -\f[C]inbox\f[] being where most unfiltered mail is sent. +My mail is kept in individual Maildirs under \f[C]~/mail\f[], with the +system mail spool in e.g. +\f[C]/var/mail/tejr\f[] being where most unfiltered mail is sent. I use Getmail (http://pyropus.ca/software/getmail/), maildrop (https://www.courier-mta.org/maildrop/), and msmtp (https://marlam.de/msmtp/); the configurations for these are not -- cgit v1.2.3 From b09a32c74d68b69429ac9fe5368b18ff269d5a05 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 3 May 2020 21:59:46 +1200 Subject: Update PGP key --- finger/pgpkey | 1 - 1 file changed, 1 deletion(-) diff --git a/finger/pgpkey b/finger/pgpkey index 0d79a4b6..24a1bc66 100644 --- a/finger/pgpkey +++ b/finger/pgpkey @@ -12,4 +12,3 @@ sub rsa4096 2013-03-12 [S] [expires: 2020-07-31] 3179 90A1 4597 A1FC F82D 953A B5AF 5F89 2592 6609 sub rsa4096 2019-08-06 [A] [expires: 2020-07-31] 42AE 569D 6162 7C52 03B0 74ED D58F F1F0 7E90 9B49 - -- cgit v1.2.3