aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2020-05-03 21:59:56 +1200
committerTom Ryder <tom@sanctum.geek.nz>2020-05-03 21:59:56 +1200
commitd6f98841e29ebc27e55d357fbe9159f21bb18420 (patch)
tree727552735f9c0efad3f59ac0a0e8b647251c0c15
parentReformat paragraphs in README.md (diff)
parentUpdate PGP key (diff)
downloaddotfiles-d6f98841e29ebc27e55d357fbe9159f21bb18420.tar.gz
dotfiles-d6f98841e29ebc27e55d357fbe9159f21bb18420.zip
Merge branch 'release/v8.26.0' into develop
* release/v8.26.0: Update PGP key Update dotfiles(7) manual page
-rw-r--r--VERSION4
-rw-r--r--finger/pgpkey1
-rw-r--r--man/man7/dotfiles.7df40
3 files changed, 19 insertions, 26 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
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
-
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