aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-07-13 16:43:34 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-07-13 16:43:34 +1200
commit0b833f971422d82c2c000751f1a62409ad859a50 (patch)
treed06eb3e50ce07f3080a381f0570e9693f70b017d
parentMerge branch 'release/v6.55.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-0b833f971422d82c2c000751f1a62409ad859a50.tar.gz
dotfiles-0b833f971422d82c2c000751f1a62409ad859a50.zip
Merge branch 'release/v6.56.0'v6.56.0
* release/v6.56.0: Reduce GnuPG config considerably Name my i3 workspaces Update paste_insert.vim to v1.0.1 Extend td(1df) to edit multiple files
-rw-r--r--.gitignore2
-rw-r--r--ISSUES.md1
-rw-r--r--Makefile15
-rw-r--r--VERSION4
-rw-r--r--bin/td.sh18
-rw-r--r--gnupg/gpg.conf5
-rw-r--r--gnupg/gpg.conf.mi548
-rw-r--r--i3/config20
-rw-r--r--man/man1/td.1df7
m---------vim/bundle/paste_insert0
10 files changed, 32 insertions, 88 deletions
diff --git a/.gitignore b/.gitignore
index 825395b3..9e71ad86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -174,7 +174,5 @@
/git/template/hooks/pre-commit
/git/template/hooks/prepare-commit-msg
/git/template/hooks/post-update
-/gnupg/gpg.conf
-/gnupg/gpg.conf.m4
/include/mktd.m4
/urxvt/ext/select
diff --git a/ISSUES.md b/ISSUES.md
index cd6228ea..103c3a98 100644
--- a/ISSUES.md
+++ b/ISSUES.md
@@ -30,4 +30,3 @@ Known issues
pushed upstream.
* The `_text_filenames` completion handler for Bash won't work on files with
newlines in their names. Can it be made to?
-* A paste operation, maybe TextChanged, should probably end a pending paste
diff --git a/Makefile b/Makefile
index d9ca626c..e6fd8d70 100644
--- a/Makefile
+++ b/Makefile
@@ -269,7 +269,7 @@ GIT_TEMPLATE_HOOKS = git/template/hooks/post-update \
git/template/hooks/pre-commit \
git/template/hooks/prepare-commit-msg
-all: $(BINS) git/gitconfig $(GIT_TEMPLATE_HOOKS) gnupg/gpg.conf
+all: $(BINS) git/gitconfig $(GIT_TEMPLATE_HOOKS)
clean distclean:
rm -f -- \
@@ -282,8 +282,6 @@ clean distclean:
dillo/dillorc.m4 \
git/gitconfig \
git/gitconfig.m4 \
- gnupg/gpg.conf \
- gnupg/gpg.conf.m4 \
include/mktd.m4 \
urxvt/ext/select \
vim/dist/*
@@ -338,15 +336,6 @@ git/gitconfig: git/gitconfig.m4
-D SENDMAIL=$(SENDMAIL) \
git/gitconfig.m4 > $@
-KEYSERVER = hkps://hkps.pool.sks-keyservers.net
-KEYID_FORMAT = none
-
-gnupg/gpg.conf: gnupg/gpg.conf.m4
- m4 \
- -D KEYSERVER=$(KEYSERVER) \
- -D KEYID_FORMAT=$(KEYID_FORMAT) \
- gnupg/gpg.conf.m4 > $@
-
MAILDIR = $(HOME)/Mail
install: install-bin \
@@ -433,7 +422,7 @@ install-git: git/gitconfig $(GIT_TEMPLATE_HOOKS)
$(HOME)/.git-template"$${1#git/template}"' \
_ {} \;
-install-gnupg: gnupg/gpg.conf
+install-gnupg:
mkdir -m 0700 -p -- $(HOME)/.gnupg
cp -p -- gnupg/*.conf $(HOME)/.gnupg
diff --git a/VERSION b/VERSION
index 068877c9..43a7863c 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v6.55.0
-Thu, 11 Jul 2019 03:10:27 +0000
+tejr dotfiles v6.56.0
+Sat, 13 Jul 2019 04:43:32 +0000
diff --git a/bin/td.sh b/bin/td.sh
index ef0be618..a5a4ab30 100644
--- a/bin/td.sh
+++ b/bin/td.sh
@@ -2,7 +2,6 @@
# Specify the path and file
dir=${TODO_DIR:-"$HOME"/Todo}
-file=${1:-"${TODO_NAME:-todo}"}
# If the directory doesn't exist, create it
[ -d "$dir" ] || mkdir -p -- "$dir" || exit
@@ -17,15 +16,16 @@ if ! command -v isgr >/dev/null 2>&1 ; then
fi
isgr || git init --quiet || exit
-# If the to-do file doesn't exist yet, create it
-[ -e "$file" ] || touch -- "$file" || exit
+if [ "$#" -eq 0 ] ; then
+ set -- "${TODO_NAME:-todo}"
+fi
-# Launch an appropriate editor to edit that file
-"${VISUAL:-"${EDITOR:-ed}"}" "$file"
+# Launch an appropriate editor to edit those files
+"${VISUAL:-"${EDITOR:-ed}"}" "$@"
-# Add the file to the changeset
-git add -- "$file"
+# Add those files to the changeset
+git add -- "$@"
-# If there are changes to commit, commit them
-git diff-index --quiet HEAD 2>/dev/null ||
+# If there are changes to those files to commit, commit them
+git diff-index --quiet HEAD "$@" 2>/dev/null ||
git commit --message 'Changed by td(1df)' --quiet
diff --git a/gnupg/gpg.conf b/gnupg/gpg.conf
new file mode 100644
index 00000000..1ef5e858
--- /dev/null
+++ b/gnupg/gpg.conf
@@ -0,0 +1,5 @@
+# Suppress the copyright message
+no-greeting
+
+# Use the GPG agent for key management and decryption
+use-agent
diff --git a/gnupg/gpg.conf.mi5 b/gnupg/gpg.conf.mi5
deleted file mode 100644
index 97726d20..00000000
--- a/gnupg/gpg.conf.mi5
+++ /dev/null
@@ -1,48 +0,0 @@
-# Retrieve certs automatically if possible
-auto-key-locate cert pka
-
-# Use SHA512 as the hash when making key signatures
-cert-digest-algo SHA512
-
-# Specify the hash algorithms to be used for new keys as available
-default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed
-
-# In the absence of any other recipient, encrypt messages for myself
-default-recipient-self
-
-# Show complete dates and use proper column separation for --with-colon listing
-# mode
-fixed-list-mode
-
-# Use only fingerprints as key IDs
-keyid-format <% KEYID_FORMAT %>
-
-# Use a pool of servers which support HKPS (encrypted key retrieval)
-keyserver <% KEYSERVER %>
-
-# Retrieve keys automatically; check the keyserver port cert; use whichever
-# server is proffered from the pool
-keyserver-options auto-key-retrieve no-honor-keyserver-url
-
-# Include trust/validity for UIDs in listings
-list-options show-uid-validity
-
-# Suppress the copyright message
-no-greeting
-
-# Use SHA512 as my message digest, overriding GnuPG's efforts to use the lowest
-# common denominator in hashing algorithms
-personal-digest-preferences SHA512
-
-# Suppress a lot of output; sometimes I add --verbose to undo this
-quiet
-
-# Use the GPG agent for key management and decryption
-use-agent
-
-# Include trust/validity for UIDs when verifying signatures
-verify-options pka-lookups show-uid-validity
-
-# Assume "yes" is the answer to most questions, that is, don't keep asking me
-# to confirm something I've asked to be done
-yes
diff --git a/i3/config b/i3/config
index 2b190998..be00e590 100644
--- a/i3/config
+++ b/i3/config
@@ -50,22 +50,22 @@ bindsym $mod+a focus parent
bindsym $mod+z focus child
# Mod+<n> switches to a workspace
-bindsym $mod+1 workspace 1
-bindsym $mod+2 workspace 2
-bindsym $mod+3 workspace 3
-bindsym $mod+4 workspace 4
-bindsym $mod+5 workspace 5
+bindsym $mod+1 workspace 1:main
+bindsym $mod+2 workspace 2:home
+bindsym $mod+3 workspace 3:work
+bindsym $mod+4 workspace 4:soc
+bindsym $mod+5 workspace 5:tor
bindsym $mod+6 workspace 6
bindsym $mod+7 workspace 7
bindsym $mod+8 workspace 8
bindsym $mod+9 workspace 9
# Mod+Shift+<n> moves a container to a workspace
-bindsym $mod+Shift+1 move container to workspace 1
-bindsym $mod+Shift+2 move container to workspace 2
-bindsym $mod+Shift+3 move container to workspace 3
-bindsym $mod+Shift+4 move container to workspace 4
-bindsym $mod+Shift+5 move container to workspace 5
+bindsym $mod+Shift+1 move container to workspace 1:main
+bindsym $mod+Shift+2 move container to workspace 2:home
+bindsym $mod+Shift+3 move container to workspace 3:work
+bindsym $mod+Shift+4 move container to workspace 4:soc
+bindsym $mod+Shift+5 move container to workspace 5:tor
bindsym $mod+Shift+6 move container to workspace 6
bindsym $mod+Shift+7 move container to workspace 7
bindsym $mod+Shift+8 move container to workspace 8
diff --git a/man/man1/td.1df b/man/man1/td.1df
index df1ff82f..86d463cb 100644
--- a/man/man1/td.1df
+++ b/man/man1/td.1df
@@ -1,12 +1,13 @@
-.TH TD 1df "June 2016" "Manual page for td"
+.TH TD 1df "July 2019" "Manual page for td"
.SH NAME
.B td
\- manage to-do files
.SH SYNOPSIS
-.B td [FILENAME]
+.B td [FILENAME...]
.SH DESCRIPTION
Edit to-do files in ~/Todo, defaulting to a file just named "todo",
-automatically maintaining a changelog via git(1).
+automatically maintaining a changelog via git(1). Multiple filenames are
+accepted.
.SH SEE ALSO
git(1)
.SH AUTHOR
diff --git a/vim/bundle/paste_insert b/vim/bundle/paste_insert
-Subproject 3aa186ae48096ff1de1aa608832d40e87791809
+Subproject 0365dd11c050f885050cd6dd22405c81aba5f46