From 783a8be80f2981a74bfe6f4477dd4bd717073ed0 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 27 May 2021 15:18:11 +1200 Subject: Update PGP key fingerprint --- finger/pgpkey | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/finger/pgpkey b/finger/pgpkey index c2635f73..84b019e8 100644 --- a/finger/pgpkey +++ b/finger/pgpkey @@ -1,4 +1,4 @@ -pub rsa4096 2013-03-12 [SC] [expires: 2021-06-18] +pub rsa4096 2013-03-12 [SC] [expires: 2021-08-25] FA09 C06E 1B67 0CD0 B2F5 DE60 C142 86EA 77BB 8872 uid [ultimate] Thomas Ryder (tyrmored, tejr) uid [ultimate] Thomas Ryder @@ -6,6 +6,7 @@ uid [ultimate] Thomas Ryder uid [ultimate] Thomas Ryder (TEJR) uid [ultimate] Thomas Ryder uid [ultimate] Thomas Ryder -sub rsa4096 2013-03-12 [E] [expires: 2021-06-18] -sub rsa4096 2013-03-12 [S] [expires: 2021-06-18] -sub rsa4096 2019-08-06 [A] [expires: 2021-06-18] +sub rsa4096 2013-03-12 [E] [expires: 2021-08-25] +sub rsa4096 2013-03-12 [S] [expires: 2021-08-25] +sub rsa4096 2019-08-06 [A] [expires: 2021-08-25] + -- cgit v1.2.3 From d3f9809fccdfc60998b8fd0f7eec86f5fd8de367 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Fri, 25 Jun 2021 18:59:46 +1200 Subject: Allow dashes in `keep` items --- bash/bashrc.d/keep.bash | 4 ++-- ksh/kshrc.d/keep.ksh | 4 ++-- zsh/zshrc.d/keep.zsh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bash/bashrc.d/keep.bash b/bash/bashrc.d/keep.bash index 2e2424a3..26a84f5b 100644 --- a/bash/bashrc.d/keep.bash +++ b/bash/bashrc.d/keep.bash @@ -89,8 +89,8 @@ EOF case $name in # NAME must start with letters or an underscore, and contain no - # characters besides letters, numbers, or underscores - *[!a-zA-Z0-9_]*|[!a-zA-Z_]*) + # characters besides letters, numbers, underscores, or dashes + [!a-zA-Z_]*|*[!a-zA-Z0-9_-]*) printf 'bash: %s: %s not a valid NAME\n' \ "${FUNCNAME[0]}" "$name" >&2 ((errors++)) diff --git a/ksh/kshrc.d/keep.ksh b/ksh/kshrc.d/keep.ksh index f61a7a4d..861e1b2b 100644 --- a/ksh/kshrc.d/keep.ksh +++ b/ksh/kshrc.d/keep.ksh @@ -100,8 +100,8 @@ EOF case $name in # NAME must start with letters or an underscore, and contain no - # characters besides letters, numbers, or underscores - *[!a-zA-Z0-9_]*|[!a-zA-Z_]*) + # characters besides letters, numbers, underscores, or dashes + [!a-zA-Z_]*|*[!a-zA-Z0-9_-]*) printf 'ksh: %s: %s not a valid NAME\n' \ "$self" "$name" >&2 ((errors++)) diff --git a/zsh/zshrc.d/keep.zsh b/zsh/zshrc.d/keep.zsh index 8a2b9449..36d2f57d 100644 --- a/zsh/zshrc.d/keep.zsh +++ b/zsh/zshrc.d/keep.zsh @@ -89,8 +89,8 @@ EOF case $name in # NAME must start with letters or an underscore, and contain no - # characters besides letters, numbers, or underscores - *[!a-zA-Z0-9_]*|[!a-zA-Z_]*) + # characters besides letters, numbers, underscores, or dashes + [!a-zA-Z_]*|*[!a-zA-Z0-9_-]*) printf 'zsh: %s: %s not a valid NAME\n' \ "${FUNCNAME[0]}" "$name" >&2 ((errors++)) -- cgit v1.2.3 From 7cb2fd22c96f3458601e2413a6bfb6600ad92731 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 27 Jun 2021 13:20:12 +1200 Subject: Reduce log level for newsboat reload task --- newsboat/systemd/user/reload-newsboat.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/newsboat/systemd/user/reload-newsboat.service b/newsboat/systemd/user/reload-newsboat.service index f495e67b..ce53c472 100644 --- a/newsboat/systemd/user/reload-newsboat.service +++ b/newsboat/systemd/user/reload-newsboat.service @@ -7,5 +7,5 @@ ConditionPathExists=!%h/.local/share/newsboat/cache.db.lock Type=oneshot LogsDirectory=newsboat LogsDirectoryMode=0700 -ExecStart=newsboat --execute=reload --log-file=%L/newsboat/%p.log --log-level=5 +ExecStart=newsboat --execute=reload --log-file=%L/newsboat/%p.log --log-level=2 TimeoutStartSec=5m -- cgit v1.2.3 From 36037fb6f79b8ba0c0605d0e006faffbe3a3ef21 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Tue, 29 Jun 2021 22:33:00 +1200 Subject: Correct Xresources Makefile installation --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e7256214..4ad78788 100644 --- a/Makefile +++ b/Makefile @@ -634,7 +634,7 @@ install-x: check-xinit cp -p -- X/xinitrc $(HOME)/.xinitrc cp -p -- X/xinitrc.d/*.sh $(HOME)/.xinitrc.d cp -p -- X/Xresources $(HOME)/.Xresources - cp -p -- X/Xresources.d/*.sh $(HOME)/.Xresources.d + cp -p -- X/Xresources.d/* $(HOME)/.Xresources.d install-zsh: check-zsh install-sh mkdir -p -- $(HOME)/.zshrc.d -- cgit v1.2.3 From a8445cf9f3c719061a27e1396dcdc562c6e453ed Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 30 Jun 2021 14:38:42 +1200 Subject: Update PGP key --- finger/pgpkey | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/finger/pgpkey b/finger/pgpkey index 84b019e8..4c751313 100644 --- a/finger/pgpkey +++ b/finger/pgpkey @@ -1,4 +1,4 @@ -pub rsa4096 2013-03-12 [SC] [expires: 2021-08-25] +pub rsa4096 2013-03-12 [SC] [expires: 2022-06-30] FA09 C06E 1B67 0CD0 B2F5 DE60 C142 86EA 77BB 8872 uid [ultimate] Thomas Ryder (tyrmored, tejr) uid [ultimate] Thomas Ryder @@ -6,7 +6,7 @@ uid [ultimate] Thomas Ryder uid [ultimate] Thomas Ryder (TEJR) uid [ultimate] Thomas Ryder uid [ultimate] Thomas Ryder -sub rsa4096 2013-03-12 [E] [expires: 2021-08-25] -sub rsa4096 2013-03-12 [S] [expires: 2021-08-25] -sub rsa4096 2019-08-06 [A] [expires: 2021-08-25] +sub rsa4096 2013-03-12 [E] [expires: 2022-06-30] +sub rsa4096 2013-03-12 [S] [expires: 2022-06-30] +sub rsa4096 2019-08-06 [A] [expires: 2022-06-30] -- cgit v1.2.3 From 3f555c70b0bbc50af190ebbd355dc181b8043398 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 30 Jun 2021 21:27:03 +1200 Subject: Use different recommended path for checkout --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index e1379d19..5381ed9f 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,9 @@ 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 + $ mkdir -p ~/.local/src + $ git clone https://sanctum.geek.nz/code/dotfiles.git ~/.local/src/dotfiles + $ cd ~/.local/src/dotfiles $ git submodule init $ git submodule update $ make @@ -66,7 +66,7 @@ settings for the `Makefile`, too: install-bash install-bin EMAIL=you@example.com - $ make -C .local/share/dotfiles install-conf + $ make -C .local/src/dotfiles install-conf Tools ----- @@ -167,16 +167,16 @@ These are set only after testing `BASH_VERSINFO` appropriately. A terminal session with my prompt looks something like this: ~$ ssh remote - remote:~$ cd .local/share/dotfiles - remote:~/.local/share/dotfiles(master+!)$ git status + remote:~$ cd .local/src/dotfiles + remote:~/.local/src/dotfiles(master+!)$ git status M README.md M bash/bashrc.d/prompt.bash A init - remote:~/.local/share/dotfiles(master+!)$ foobar + remote:~/.local/src/dotfiles(master+!)$ foobar foobar: command not found - remote:~/.local/share/dotfiles(master+!)<127>$ sleep 5 & + remote:~/.local/src/dotfiles(master+!)<127>$ sleep 5 & [1] 28937 - remote:~/.local/share/dotfiles(master+!){1}$ + remote:~/.local/src/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 201863af0717f430f36534c178fb74e872f9d53f Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 30 Jun 2021 21:29:53 +1200 Subject: Define `hide_edge_borders` in i3 config --- i3/config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/i3/config b/i3/config index 0840f1c8..072a6980 100644 --- a/i3/config +++ b/i3/config @@ -7,6 +7,9 @@ floating_modifier $mod # No title bar new_window 1pixel +# If the window is the only one on the workspace, forego the borders +hide_edge_borders smart + # Mod+Shift+r restarts i3wm bindsym $mod+Shift+r restart -- cgit v1.2.3 From 210d478cd2db508b083bf3c0b3048f9e35fce602 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Fri, 2 Jul 2021 13:33:06 +1200 Subject: Update submodule URLs --- .gitmodules | 74 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/.gitmodules b/.gitmodules index e892cefb..4a63f718 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,116 +1,116 @@ # Vim plugins [submodule "vim/bundle/alternate_filetypes"] path = vim/bundle/alternate_filetypes - url = https://sanctum.geek.nz/code/vim-alternate-filetypes.git + url = https://dev.sanctum.geek.nz/code/vim-alternate-filetypes.git [submodule "vim/bundle/big_file_options"] path = vim/bundle/big_file_options - url = https://sanctum.geek.nz/code/vim-big-file-options.git + url = https://dev.sanctum.geek.nz/code/vim-big-file-options.git [submodule "vim/bundle/colon_operator"] path = vim/bundle/colon_operator - url = https://sanctum.geek.nz/code/vim-colon-operator.git + url = https://dev.sanctum.geek.nz/code/vim-colon-operator.git [submodule "vim/bundle/copy_linebreak"] path = vim/bundle/copy_linebreak - url = https://sanctum.geek.nz/code/vim-copy-linebreak.git + url = https://dev.sanctum.geek.nz/code/vim-copy-linebreak.git [submodule "vim/bundle/cursorline_current"] path = vim/bundle/cursorline_current - url = https://sanctum.geek.nz/code/vim-cursorline-current.git + url = https://dev.sanctum.geek.nz/code/vim-cursorline-current.git [submodule "vim/bundle/detect_indent"] path = vim/bundle/detect_indent - url = https://sanctum.geek.nz/code/vim-detect-indent.git + url = https://dev.sanctum.geek.nz/code/vim-detect-indent.git [submodule "vim/bundle/digraph_search"] path = vim/bundle/digraph_search - url = https://sanctum.geek.nz/code/vim-digraph-search.git + url = https://dev.sanctum.geek.nz/code/vim-digraph-search.git [submodule "vim/bundle/equalalways_resized"] path = vim/bundle/equalalways_resized - url = https://sanctum.geek.nz/code/vim-equalalways-resized.git + url = https://dev.sanctum.geek.nz/code/vim-equalalways-resized.git [submodule "vim/bundle/foldlevelstart_stdin"] path = vim/bundle/foldlevelstart_stdin - url = https://sanctum.geek.nz/code/vim-foldlevelstart-stdin.git + url = https://dev.sanctum.geek.nz/code/vim-foldlevelstart-stdin.git [submodule "vim/bundle/insert_cancel"] path = vim/bundle/insert_cancel - url = https://sanctum.geek.nz/code/vim-insert-cancel.git + url = https://dev.sanctum.geek.nz/code/vim-insert-cancel.git [submodule "vim/bundle/insert_suspend_hlsearch"] path = vim/bundle/insert_suspend_hlsearch - url = https://sanctum.geek.nz/code/vim-insert-suspend-hlsearch.git + url = https://dev.sanctum.geek.nz/code/vim-insert-suspend-hlsearch.git [submodule "vim/bundle/insert_timeout"] path = vim/bundle/insert_timeout - url = https://sanctum.geek.nz/code/vim-insert-timeout.git + url = https://dev.sanctum.geek.nz/code/vim-insert-timeout.git [submodule "vim/bundle/keep_position"] path = vim/bundle/keep_position - url = https://sanctum.geek.nz/code/vim-keep-position.git + url = https://dev.sanctum.geek.nz/code/vim-keep-position.git [submodule "vim/bundle/paste_insert"] path = vim/bundle/paste_insert - url = https://sanctum.geek.nz/code/vim-paste-insert.git + url = https://dev.sanctum.geek.nz/code/vim-paste-insert.git [submodule "vim/bundle/put_blank_lines"] path = vim/bundle/put_blank_lines - url = https://sanctum.geek.nz/code/vim-put-blank-lines.git + url = https://dev.sanctum.geek.nz/code/vim-put-blank-lines.git [submodule "vim/bundle/put_date"] path = vim/bundle/put_date - url = https://sanctum.geek.nz/code/vim-put-date.git + url = https://dev.sanctum.geek.nz/code/vim-put-date.git [submodule "vim/bundle/quickfix_auto_open"] path = vim/bundle/quickfix_auto_open - url = https://sanctum.geek.nz/code/vim-quickfix-auto-open.git + url = https://dev.sanctum.geek.nz/code/vim-quickfix-auto-open.git [submodule "vim/bundle/redact_pass"] path = vim/bundle/redact_pass - url = https://sanctum.geek.nz/code/vim-redact-pass.git + url = https://dev.sanctum.geek.nz/code/vim-redact-pass.git [submodule "vim/bundle/regex_escape"] path = vim/bundle/regex_escape - url = https://sanctum.geek.nz/code/vim-regex-escape.git + url = https://dev.sanctum.geek.nz/code/vim-regex-escape.git [submodule "vim/bundle/replace_operator"] path = vim/bundle/replace_operator - url = https://sanctum.geek.nz/code/vim-replace-operator.git + url = https://dev.sanctum.geek.nz/code/vim-replace-operator.git [submodule "vim/bundle/scratch_buffer"] path = vim/bundle/scratch_buffer - url = https://sanctum.geek.nz/code/vim-scratch-buffer.git + url = https://dev.sanctum.geek.nz/code/vim-scratch-buffer.git [submodule "vim/bundle/select_old_files"] path = vim/bundle/select_old_files - url = https://sanctum.geek.nz/code/vim-select-old-files.git + url = https://dev.sanctum.geek.nz/code/vim-select-old-files.git [submodule "vim/bundle/shebang_change_filetype"] path = vim/bundle/shebang_change_filetype - url = https://sanctum.geek.nz/code/vim-shebang-change-filetype.git + url = https://dev.sanctum.geek.nz/code/vim-shebang-change-filetype.git [submodule "vim/bundle/shebang_create_exec"] path = vim/bundle/shebang_create_exec - url = https://sanctum.geek.nz/code/vim-shebang-create-exec.git + url = https://dev.sanctum.geek.nz/code/vim-shebang-create-exec.git [submodule "vim/bundle/spellfile_local"] path = vim/bundle/spellfile_local - url = https://sanctum.geek.nz/code/vim-spellfile-local.git + url = https://dev.sanctum.geek.nz/code/vim-spellfile-local.git [submodule "vim/bundle/squeeze_repeat_blanks"] path = vim/bundle/squeeze_repeat_blanks - url = https://sanctum.geek.nz/code/vim-squeeze-repeat-blanks.git + url = https://dev.sanctum.geek.nz/code/vim-squeeze-repeat-blanks.git [submodule "vim/bundle/strip_trailing_whitespace"] path = vim/bundle/strip_trailing_whitespace - url = https://sanctum.geek.nz/code/vim-strip-trailing-whitespace.git + url = https://dev.sanctum.geek.nz/code/vim-strip-trailing-whitespace.git [submodule "vim/bundle/toggle_flags"] path = vim/bundle/toggle_flags - url = https://sanctum.geek.nz/code/vim-toggle-flags.git + url = https://dev.sanctum.geek.nz/code/vim-toggle-flags.git [submodule "vim/bundle/undofileskip"] path = vim/bundle/undofileskip - url = https://sanctum.geek.nz/code/vim-undofileskip.git + url = https://dev.sanctum.geek.nz/code/vim-undofileskip.git [submodule "vim/bundle/vertical_region"] path = vim/bundle/vertical_region - url = https://sanctum.geek.nz/code/vim-vertical-region.git + url = https://dev.sanctum.geek.nz/code/vim-vertical-region.git [submodule "vim/bundle/vimrc_reload_filetype"] path = vim/bundle/vimrc_reload_filetype - url = https://sanctum.geek.nz/code/vim-vimrc-reload-filetype.git + url = https://dev.sanctum.geek.nz/code/vim-vimrc-reload-filetype.git [submodule "vim/bundle/write_mkpath"] path = vim/bundle/write_mkpath - url = https://sanctum.geek.nz/code/vim-write-mkpath.git + url = https://dev.sanctum.geek.nz/code/vim-write-mkpath.git # Vim filetype plugins [submodule "vim/bundle/diff_prune"] path = vim/bundle/diff_prune - url = https://sanctum.geek.nz/code/vim-diff-prune.git + url = https://dev.sanctum.geek.nz/code/vim-diff-prune.git [submodule "vim/bundle/make_target"] path = vim/bundle/make_target - url = https://sanctum.geek.nz/code/vim-make-target.git + url = https://dev.sanctum.geek.nz/code/vim-make-target.git [submodule "vim/bundle/perl_version_bump"] path = vim/bundle/perl_version_bump - url = https://sanctum.geek.nz/code/vim-perl-version-bump.git + url = https://dev.sanctum.geek.nz/code/vim-perl-version-bump.git # Vim colorschemes [submodule "vim/bundle/juvenile"] path = vim/bundle/juvenile - url = https://sanctum.geek.nz/code/vim-juvenile.git + url = https://dev.sanctum.geek.nz/code/vim-juvenile.git [submodule "vim/bundle/sahara"] path = vim/bundle/sahara - url = https://sanctum.geek.nz/code/vim-sahara.git + url = https://dev.sanctum.geek.nz/code/vim-sahara.git -- cgit v1.2.3 From 2a71be88c9f676b1fd5a54342d96696eeedb9de6 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Fri, 2 Jul 2021 13:33:15 +1200 Subject: Bump VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 39293bf0..606e95e2 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -tejr dotfiles v11.4.0 -Mon, 10 May 2021 01:46:30 +0000 +tejr dotfiles v11.5.0 +Fri, 02 Jul 2021 01:33:15 +0000 -- cgit v1.2.3 From 5fbe96906f7abbaae0120c4bdc24672b09c38d77 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Fri, 2 Jul 2021 13:33:19 +1200 Subject: Update dotfiles(7) manual page --- man/man7/dotfiles.7df | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/man/man7/dotfiles.7df b/man/man7/dotfiles.7df index c48fbdac..f542c888 100644 --- a/man/man7/dotfiles.7df +++ b/man/man7/dotfiles.7df @@ -15,9 +15,9 @@ added over time, making it into a personal suite of custom Unix tools. .IP .nf \f[C] -$ mkdir -p \[ti]/.local/share -$ git clone https://sanctum.geek.nz/code/dotfiles.git \[ti]/.local/share/dotfiles -$ cd \[ti]/.local/share/dotfiles +$ mkdir -p \[ti]/.local/src +$ git clone https://sanctum.geek.nz/code/dotfiles.git \[ti]/.local/src/dotfiles +$ cd \[ti]/.local/src/dotfiles $ git submodule init $ git submodule update $ make @@ -91,7 +91,7 @@ $ cat .config/dotfiles/config install-bash install-bin EMAIL=you\[at]example.com -$ make -C .local/share/dotfiles install-conf +$ make -C .local/src/dotfiles install-conf \f[R] .fi .SS Tools @@ -241,16 +241,16 @@ A terminal session with my prompt looks something like this: .nf \f[C] \[ti]$ ssh remote -remote:\[ti]$ cd .local/share/dotfiles -remote:\[ti]/.local/share/dotfiles(master+!)$ git status +remote:\[ti]$ cd .local/src/dotfiles +remote:\[ti]/.local/src/dotfiles(master+!)$ git status M README.md M bash/bashrc.d/prompt.bash A init -remote:\[ti]/.local/share/dotfiles(master+!)$ foobar +remote:\[ti]/.local/src/dotfiles(master+!)$ foobar foobar: command not found -remote:\[ti]/.local/share/dotfiles(master+!)<127>$ sleep 5 & +remote:\[ti]/.local/src/dotfiles(master+!)<127>$ sleep 5 & [1] 28937 -remote:\[ti]/.local/share/dotfiles(master+!){1}$ +remote:\[ti]/.local/src/dotfiles(master+!){1}$ \f[R] .fi .PP -- cgit v1.2.3 From 9e95f7f30402c23f977dec536363f43e230d1616 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Fri, 2 Jul 2021 13:33:19 +1200 Subject: Update PGP key --- finger/pgpkey | 1 - 1 file changed, 1 deletion(-) diff --git a/finger/pgpkey b/finger/pgpkey index 4c751313..3aa2c35e 100644 --- a/finger/pgpkey +++ b/finger/pgpkey @@ -9,4 +9,3 @@ uid [ultimate] Thomas Ryder sub rsa4096 2013-03-12 [E] [expires: 2022-06-30] sub rsa4096 2013-03-12 [S] [expires: 2022-06-30] sub rsa4096 2019-08-06 [A] [expires: 2022-06-30] - -- cgit v1.2.3