From c881a79dea2195b83b67e69772774aba295cc07c Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 26 Jul 2021 15:03:05 +1200 Subject: Switch to lossless WEBP (converted) for scrots --- X/sxhkdrc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/X/sxhkdrc b/X/sxhkdrc index 5299df73..2577e5ba 100644 --- a/X/sxhkdrc +++ b/X/sxhkdrc @@ -32,11 +32,13 @@ super + v urxvtcd -e "$VISUAL" super + shift + s - sleep 0.25 && scrot \ - --freeze --select \ - --exec 'xclip -selection clipboard -target image/png $f ; \ - mkdir -p -- "$$HOME"/screenshots/%Y-%m-%d && \ - mv -- $f "$$HOME"/screenshots' + sleep 0.25 && scrot --freeze --select \ + --exec 'xclip -selection clipboard -target image/png $f && \ + dir=$$HOME/screenshots/%Y-%m-%d && \ + mkdir --parents -- "$dir" && \ + convert -- $f -define webp:lossless=true \ + "$$dir"/%Y-%m-%d_$wx$h.webp && \ + rm -- $f' super + slash i3lock --color=#000000 --image "$HOME"/.local/share/i3/lock.png --nofork -- cgit v1.2.3 From 67cd084b837dde9ecc735eb32df396e382186c89 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 26 Jul 2021 15:04:58 +1200 Subject: Revert "Remove i3 workspace labels for now" This reverts commit 8f8006a38b7aaf641d73596e8f5697254615db1e. --- i3/config | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/i3/config b/i3/config index bc795967..eff17a21 100644 --- a/i3/config +++ b/i3/config @@ -56,22 +56,22 @@ bindsym $mod+a focus parent bindsym $mod+z focus child # Mod+ 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+ 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 -- cgit v1.2.3 From 541110f11c98a4ee5f9cc47e80a025f465b67fa3 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 26 Jul 2021 15:06:57 +1200 Subject: Restore title bars to i3 windows --- i3/config | 3 --- 1 file changed, 3 deletions(-) diff --git a/i3/config b/i3/config index eff17a21..f43679e8 100644 --- a/i3/config +++ b/i3/config @@ -4,9 +4,6 @@ set $mod Mod4 # Use Mouse+$mod to drag floating windows to their wanted position 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 -- cgit v1.2.3 From 6bfbc6b8d95fcf9f2653264b50ac41113182d9fa Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 26 Jul 2021 15:41:26 +1200 Subject: Add hour/minute/second timestamp to scrot files --- X/sxhkdrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/X/sxhkdrc b/X/sxhkdrc index 2577e5ba..67f72103 100644 --- a/X/sxhkdrc +++ b/X/sxhkdrc @@ -37,7 +37,7 @@ super + shift + s dir=$$HOME/screenshots/%Y-%m-%d && \ mkdir --parents -- "$dir" && \ convert -- $f -define webp:lossless=true \ - "$$dir"/%Y-%m-%d_$wx$h.webp && \ + "$$dir"/%Y-%m-%d_%H%M%S_$wx$h.webp && \ rm -- $f' super + slash -- cgit v1.2.3 From 947f746c82cadb270a92229972c25865fb59b7f0 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Fri, 30 Jul 2021 14:33:28 +1200 Subject: Correct mis-escaped dollar sign in scrot script --- X/sxhkdrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/X/sxhkdrc b/X/sxhkdrc index 67f72103..c277855b 100644 --- a/X/sxhkdrc +++ b/X/sxhkdrc @@ -35,7 +35,7 @@ super + shift + s sleep 0.25 && scrot --freeze --select \ --exec 'xclip -selection clipboard -target image/png $f && \ dir=$$HOME/screenshots/%Y-%m-%d && \ - mkdir --parents -- "$dir" && \ + mkdir --parents -- "$$dir" && \ convert -- $f -define webp:lossless=true \ "$$dir"/%Y-%m-%d_%H%M%S_$wx$h.webp && \ rm -- $f' -- cgit v1.2.3 From 273e8d6ca05ce9f392f94299e29278b899cdc6f6 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Fri, 30 Jul 2021 14:33:42 +1200 Subject: Add a basic system-wide push-to-talk --- X/sxhkdrc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/X/sxhkdrc b/X/sxhkdrc index c277855b..cdead7d7 100644 --- a/X/sxhkdrc +++ b/X/sxhkdrc @@ -54,3 +54,9 @@ XF86AudioLowerVolume XF86Calculator urxvtcd -e bcq + +Control_R + pactl set-source-mute alsa_input.usb-GeneralPlus_USB_Audio_Device-00.mono-fallback off + +@Control_R + pactl set-source-mute alsa_input.usb-GeneralPlus_USB_Audio_Device-00.mono-fallback on -- cgit v1.2.3 From 0ff44daad915557cb56809882d3bb77df733415c Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Fri, 30 Jul 2021 17:14:12 +1200 Subject: Revert "Add a basic system-wide push-to-talk" This reverts commit c6a98e23d0a07ad49eb2b396d1b0b40e2791638e. --- X/sxhkdrc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/X/sxhkdrc b/X/sxhkdrc index cdead7d7..c277855b 100644 --- a/X/sxhkdrc +++ b/X/sxhkdrc @@ -54,9 +54,3 @@ XF86AudioLowerVolume XF86Calculator urxvtcd -e bcq - -Control_R - pactl set-source-mute alsa_input.usb-GeneralPlus_USB_Audio_Device-00.mono-fallback off - -@Control_R - pactl set-source-mute alsa_input.usb-GeneralPlus_USB_Audio_Device-00.mono-fallback on -- cgit v1.2.3 From 287a3c52d90daf8dce09cdbf694d252345427f8a Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 16 Aug 2021 09:34:18 +1200 Subject: Bump VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index b1e27a5c..1c140db5 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -tejr dotfiles v11.7.0 -Sun, 15 Aug 2021 10:12:44 +0000 +tejr dotfiles v11.8.0 +Sun, 15 Aug 2021 21:34:18 +0000 -- cgit v1.2.3 From b92e4451d09e47e2d52ff4cfcf796b7f5143d964 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Tue, 17 Aug 2021 11:57:03 +1200 Subject: Switch to newsboat-dtach system service method --- Makefile | 5 ++--- newsboat/systemd/user/newsboat.service | 11 +++++++++++ newsboat/systemd/user/reload-newsboat.service | 11 ----------- newsboat/systemd/user/reload-newsboat.timer | 10 ---------- 4 files changed, 13 insertions(+), 24 deletions(-) create mode 100644 newsboat/systemd/user/newsboat.service delete mode 100644 newsboat/systemd/user/reload-newsboat.service delete mode 100644 newsboat/systemd/user/reload-newsboat.timer diff --git a/Makefile b/Makefile index fe20d2df..ca3fe473 100644 --- a/Makefile +++ b/Makefile @@ -502,9 +502,8 @@ install-newsboat: install-systemd -command -v systemctl >/dev/null 2>&1 \ && mkdir -p -- $(XDG_CONFIG_HOME)/systemd/user \ && cp -p -- newsboat/systemd/user/* $(XDG_CONFIG_HOME)/systemd/user \ - && systemctl --user daemon-reload \ - && systemctl --user start reload-newsboat.timer \ - && systemctl --user enable reload-newsboat.timer + && systemctl --user enable newsboat.service \ + && systemctl --user start newsboat.service install-mysql: cp -p -- mysql/my.cnf $(HOME)/.my.cnf diff --git a/newsboat/systemd/user/newsboat.service b/newsboat/systemd/user/newsboat.service new file mode 100644 index 00000000..645843e6 --- /dev/null +++ b/newsboat/systemd/user/newsboat.service @@ -0,0 +1,11 @@ +[Unit] +Description=Newsboat news reader +OnFailure=notify-email@%n + +[Service] +Environment=TERM=screen-256color +ExecStart=/usr/bin/dtach -N %t/newsboat.socket /usr/bin/newsboat --log-file=%L/newsboat/%p.log --log-level=2 +Restart=always + +[Install] +WantedBy=default.target diff --git a/newsboat/systemd/user/reload-newsboat.service b/newsboat/systemd/user/reload-newsboat.service deleted file mode 100644 index ce53c472..00000000 --- a/newsboat/systemd/user/reload-newsboat.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=fetch new Newsboat articles -OnFailure=notify-email@%n -ConditionPathExists=!%h/.local/share/newsboat/cache.db.lock - -[Service] -Type=oneshot -LogsDirectory=newsboat -LogsDirectoryMode=0700 -ExecStart=newsboat --execute=reload --log-file=%L/newsboat/%p.log --log-level=2 -TimeoutStartSec=5m diff --git a/newsboat/systemd/user/reload-newsboat.timer b/newsboat/systemd/user/reload-newsboat.timer deleted file mode 100644 index c3c0cb00..00000000 --- a/newsboat/systemd/user/reload-newsboat.timer +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=fetch new Newsboat articles schedule - -[Timer] -OnBootSec=10m -OnUnitActiveSec=10m -RandomizedDelaySec=2m - -[Install] -WantedBy=timers.target -- cgit v1.2.3 From 173dc15b8913baf37397b547cc8d7fb7b714a178 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Tue, 16 Nov 2021 10:58:03 +1300 Subject: Use consistent punctuation in vimrc comments --- vim/vimrc | 134 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index 0424fca2..9b916564 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -2,7 +2,7 @@ " Tom Ryder (tejr)’s Literate Vimrc " ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ " -" Last updated: Thu, 19 Nov 2020 07:55:42 UTC +" Last updated: Mon 15 Nov 2021 21:57:49 UTC " " │ And I was lifted up in heart, and thought " │ Of all my late-shown prowess in the lists, @@ -33,11 +33,11 @@ " " :g/\m^$\|^\s*"/d " -" This file should be saved as ‘vimrc’—note no leading period—in the user +" This file should be saved as `vimrc`—note no leading period—in the user " runtime directory. On GNU/Linux, Mac OS X, and BSD, that directory is -" ‘~/.vim’. On Windows, it’s ‘~/vimfiles’. It requires Vim v7.0.0 or newer, +" `~/.vim`. On Windows, it’s `~/vimfiles`. It requires Vim v7.0.0 or newer, " including the +eval feature, and with the 'compatible' option turned off. -" That's to allow line continuations. The vimrc stub at ~/.vimrc (Unix) or +" That’s to allow line continuations. The vimrc stub at ~/.vimrc (Unix) or " ~/_vimrc (Windows) checks that these conditions are met before loading this " file. " @@ -59,15 +59,15 @@ " " Which encoding to use? The answer is the UTF-8 encoding for Unicode, " wherever possible. On POSIX-fearing operating systems, I define the primary -" locale environment variable $LANG to ‘en_NZ.UTF-8’. This informs Vim’s +" locale environment variable $LANG to `en_NZ.UTF-8`. This informs Vim’s " choice of internal character encoding. In the absence of such a setting, -" 'encoding' defaults to ‘latin1’ (ISO-8859-1) in most circumstances. Since -" this is almost never what I want, even if I haven't said so explicitly by +" 'encoding' defaults to `latin1` (ISO-8859-1) in most circumstances. Since +" this is almost never what I want, even if I haven’t said so explicitly by " exporting $LANG, we’ll fall back to UTF-8 instead. " " However, we need to test that the +multi_byte feature is available before -" doing any of this, because it was a compile-time feature that wasn't even -" enabled by default in Vim v7.0. Its status as an optional feature wasn't +" doing any of this, because it was a compile-time feature that wasn’t even +" enabled by default in Vim v7.0. Its status as an optional feature wasn’t " removed until v8.1.0733. " " @@ -87,7 +87,7 @@ endif " " One of the first things we’ll need to be able to do is split the value of " 'runtimepath' into its constituent paths. Correctly splitting the values of -" comma-separated Vim options is surprisingly complicated. It's not as simple +" comma-separated Vim options is surprisingly complicated. It’s not as simple " as just splitting on commas, or even unescaped commas; a more accurate " definition of the delimiter is: " @@ -109,13 +109,13 @@ endif " to read the source code for the ad-hoc tokenizer in copy_option_part() in " src/misc2.c in Vim’s source code. " -" Vim, I do love you, but sometimes you're really weird. +" Vim, I do love you, but sometimes you’re really weird. " " We fold all that mess away into an autoloaded function option#Split(); see " vim/autoload/option.vim. Provided a 'runtimepath' is actually set, using " the list returned from that function, we define an environment variable " MYVIM—to complement MYVIMRC—for ~/.vim or ~/vimfiles, by retrieving the -" first value from the 'runtimepath'. We'll use this later on in the file to +" first value from the 'runtimepath'. We’ll use this later on in the file to " comprehensively match expected paths for vimrc files. " if &runtimepath ==# '' @@ -123,17 +123,17 @@ if &runtimepath ==# '' endif let $MYVIM = option#Split(&runtimepath)[0] -" The next components of the runtime directory that we'll set up here will +" The next components of the runtime directory that we’ll set up here will " make use of the user’s configured XDG base directories: " " " -" Note that this isn't an attempt to shoehorn all of Vim into the XDG mold; -" all of this distribution's files are still expected to be installed into -" $MYVIM, per the above. We're just leaning on XDG’s conventions to provide +" Note that this isn’t an attempt to shoehorn all of Vim into the XDG mold; +" all of this distribution’s files are still expected to be installed into +" $MYVIM, per the above. We’re just leaning on XDG’s conventions to provide " separate locations for cache files and other configuration. " -" We'll start by retrieving the list of valid paths for configuration from +" We’ll start by retrieving the list of valid paths for configuration from " both the XDG_CONFIG_HOME and XDG_CONFIG_DIRS variables, or from their " defaults, using autoloaded xdg# functions. " @@ -151,8 +151,8 @@ if has('unix') endif " We put XDG_CONFIG_HOME at the front of the 'runtimepath' list with insert(), -" provided it isn't empty, which is what the function returns when the -" configured path isn't absolute. This is per the standard's dictum: +" provided it isn’t empty, which is what the function returns when the +" configured path isn’t absolute. This is per the standard’s dictum: " " │ All paths set in these environment variables must be absolute. If an " │ implementation encounters a relative path in any of these variables it @@ -187,9 +187,9 @@ endif " write its own history to the default viminfo path instead. " " This is the portable way to specify the path to the viminfo file, as an -" addendum of the path to the 'viminfo' option with an ‘n’ prefix. Vim +" addendum of the path to the 'viminfo' option with an `n` prefix. Vim " v8.1.716 introduced a way to set this with an option named 'viminfofile', -" but I don't see a reason to use that. +" but I don’t see a reason to use that. " if exists('s:xdgcachehome') && s:xdgcachehome !=# '' if !isdirectory(s:xdgcachehome) @@ -204,7 +204,7 @@ endif " 50 entries for command and search history is pretty stingy. The documented " maximum value for this option is 10000. I used that for a while, but " eventually found that on lower-powered machines, keeping this much command -" history slowed Vim startup down a bit much for my liking, so I've scaled +" history slowed Vim startup down a bit much for my liking, so I’ve scaled " this back to a more conservative 300. If I end up missing useful commands, " I might try switching this on available memory instead. " @@ -227,7 +227,7 @@ set history=300 " this trailing slashes hint for a long time before 'backupdir' caught up to " them. The 'directory' option for swap files has supported it at least as " far back as v5.8.0 (2001), and 'undodir' appears to have supported it since -" its creation in v7.2.438. Even though ‘:help 'backupdir'’ didn’t say so, +" its creation in v7.2.438. Even though `:help 'backupdir'` didn’t say so, " people assumed it would work the same way, when in fact Vim simply ignored " it until v8.1.0251. " @@ -335,7 +335,7 @@ endif " Set up a directory for files generated by :mkview. To date, I think I have " used this twice in my life, but may as well be consistent with the other -" directories of this type. This isn't a comma-separated list like the others +" directories of this type. This isn’t a comma-separated list like the others " ('backupdir', 'directory', 'spell', 'undodir') " if exists('s:xdgcachehome') && s:xdgcachehome !=# '' && has('mksession') @@ -352,28 +352,28 @@ endif " filetype plugin indent on -" There are a couple of contexts in which it's useful to reload filetypes for -" the current buffer, quietly doing nothing if filetypes aren't enabled. -" We'll set up a user command named :ReloadFileType to do this, with +" There are a couple of contexts in which it’s useful to reload filetypes for +" the current buffer, quietly doing nothing if filetypes aren’t enabled. +" We’ll set up a user command named :ReloadFileType to do this, with " an autoloaded function backing it. " command! -bar ReloadFileType \ call reload#FileType() -" We'll also define a :ReloadVimrc command. This may seem like overkill, at +" We’ll also define a :ReloadVimrc command. This may seem like overkill, at " first. Surely just `:source $MYVIMRC` would be good enough? " " The problem is there are potential side effects to the current buffer when " the vimrc is reloaded. The global :set commands for some options may " trample over different buffer-local settings that were specified by filetype -" and indent plugins. To ensure these local values are reinstated, we'll +" and indent plugins. To ensure these local values are reinstated, we’ll " define the new command wrapper around an autoloaded function that itself " issues a :ReloadFileType command after the vimrc file is sourced. " command! -bar ReloadVimrc \ call reload#Vimrc() -" We'll now create or reset a group of automatic command hooks specific to +" We’ll now create or reset a group of automatic command hooks specific to " matters related to reloading the vimrc itself, or maintaining and managing " options set within it. " @@ -390,7 +390,7 @@ autocmd vimrc BufWritePost $MYVIMRC,$MYVIM/vimrc \ ReloadVimrc " If Vim is new enough (v7.0.187) to support the ##SourceCmd event for -" automatic command hooks, we'll also apply a hook for that event to catch +" automatic command hooks, we’ll also apply a hook for that event to catch " invocations of :source of either vimrc file, and translate that into " reloading the stub vimrc. " @@ -410,7 +410,7 @@ set spelllang=en_nz " Spell checking includes optional support for catching lower case letters at " the start of sentences, and defines a pattern in 'spellcapcheck' for the end " of a sentence. The default is pretty good, but with two-spacing with -" 'cpoptions' including ‘J’ and 'formatoptions' including ‘p’ as set later in +" 'cpoptions' including `J` and 'formatoptions' including `p` as set later in " this file, we can be less ambiguous in this pattern. We require two " consecutive spaces, a newline, a carriage return, or a tab to mark the end " of a sentence. This means that we could make abbreviations like “i.e. @@ -430,7 +430,7 @@ if exists('+spelloptions') endif " For word completion in insert mode with CTRL-X CTRL-K, or if 'complete' -" includes the ‘k’ flag, the 'dictionary' option specifies the path to the +" includes the `k` flag, the 'dictionary' option specifies the path to the " system word list. This makes the dictionary completion work consistently, " even if 'spell' isn’t set at the time to coax it into using 'spellfile'. " @@ -457,9 +457,9 @@ if exists('s:xdgdatahome') && s:xdgdatahome !=# '' endif " In much the same way as 'dictionary', we add an expected path to -" a thesaurus, for completion with CTRL-X CTRL-T in insert mode, or with ‘t’ +" a thesaurus, for completion with CTRL-X CTRL-T in insert mode, or with `t` " added to 'completeopt'. The thesaurus data isn’t installed as part of the -" default ‘install-vim’ target in tejr’s dotfiles, but a decent one can be +" default `install-vim` target in tejr’s dotfiles, but a decent one can be " retrieved from my website at . " I got this from the link in the :help for 'thesaurus' in v8.1. It’s from " WordNet and MyThes-1. I had to remove the first two metadata lines from @@ -501,7 +501,7 @@ endif " " The default value for the 'path' option is similar, in that it has an aged " default; this option specifies directories in which project files and -" includes can be unearthed by navigation commands like 'gf'. Specifically, +" includes can be unearthed by navigation commands like `gf`. Specifically, " its default value comprises /usr/include, which is another C default. Let’s " get rid of that, too. " @@ -531,8 +531,8 @@ set linebreak " … U+2026 HORIZONTAL ELLIPSIS " " Note that we test for the presence of a multi-byte encoding with a special -" feature from ‘:help feature-list’, as recommended by ‘:help encoding’. -" Checking that ‘&encoding ==# 'utf-8'’ is not quite the same thing, though +" feature from `:help feature-list`, as recommended by `:help encoding`. +" Checking that `&encoding ==# 'utf-8'` is not quite the same thing, though " it’s unlikely I’ll ever use a different Unicode encoding by choice. " if has('multi_byte_encoding') @@ -571,7 +571,7 @@ set confirm " if it’s going to be followed by another key code, despite this being how the " function keys and Meta/Alt modifier are implemented for many terminal types. " Otherwise, if I press Escape, there’s an annoying delay before 'showmode' -" stops showing '--INSERT--'. +" stops showing `--INSERT--`. " " This breaks the function keys and the Meta/Alt modifier in insert mode in " most or maybe all of the terminals I use, but I don’t want those keys in @@ -585,15 +585,15 @@ set noesckeys set foldlevel=256 " Automatic text wrapping options using flags in the 'formatoptions' option -" begin here. I rely on the filetype plugins to set the ‘t’ and ‘c’ flags for +" begin here. I rely on the filetype plugins to set the `t` and `c` flags for " this option to configure whether text or comments should be wrapped, as " appropriate for the document type or language, and so I don’t mess with " either of those flags here. " If a line is already longer than 'textwidth' would otherwise limit when " editing of that line begins in insert mode, don’t suddenly automatically -" wrap it; I’ll break it apart myself with a command like ‘gq’. This doesn’t -" seem to stop paragraph reformatting with ‘a’, if that’s set. +" wrap it; I’ll break it apart myself with a command like `gq`. This doesn’t +" seem to stop paragraph reformatting with `a`, if that’s set. " set formatoptions+=l @@ -608,8 +608,8 @@ set formatoptions+=1 " If the filetype plugins have correctly described what the comment syntax for " the buffer’s language looks like, it makes sense to use that to figure out " how to join lines within comments without redundant comment syntax cropping -" up. For example, with this set, joining lines in this very comment with ‘J’ -" would remove the leading ‘"’ characters. +" up. For example, with this set, joining lines in this very comment with `J` +" would remove the leading `"` characters. " " This 'formatoptions' flag wasn’t added until v7.3.541. Because we can’t " test for the availability of option flags directly, we resort to a version @@ -629,13 +629,13 @@ endif " " " -" Consequently, we specify that sentence objects for the purposes of the ‘s’ -" text object, the ‘(’ and ‘)’ sentence motions, and formatting with the 'gq' +" Consequently, we specify that sentence objects for the purposes of the `s` +" text object, the `(` and `)` sentence motions, and formatting with the 'gq' " command must be separated by *two* spaces. One space does not suffice. " " My defection to the two-spacers is also the reason I now leave 'joinspaces' " set, per its default, so that two spaces are inserted when consecutive -" sentences separated by a line break are joined onto one line by the ‘J’ +" sentences separated by a line break are joined onto one line by the `J` " command. " set cpoptions+=J @@ -653,7 +653,7 @@ set cpoptions+=J " preserves the semantics of that same period for subsequent reformatting; its " single-space won’t get lost. " -" So, getting back to our 'formatoptions' settings, that is what the ‘p’ flag +" So, getting back to our 'formatoptions' settings, that is what the `p` flag " does. I wrote the patch that added it, after becoming envious of an " analogous feature during an ill-fated foray into GNU Emacs usage. " @@ -667,7 +667,7 @@ endif " 'guioptions' option to prevent the menu.vim runtime file from being loaded. " It doesn’t do any harm, but I never use it, and it’s easy to turn it off. " -" The documentation for this flag in ‘:help 'go-M'’ includes a note saying the +" The documentation for this flag in `:help 'go-M'` includes a note saying the " flag should be set here, rather that in the GUI-specific gvimrc file, as one " might otherwise think. " @@ -740,7 +740,7 @@ set listchars+=nbsp:+ " Non-breaking spaces " precedes: Signals presence of unwrapped text to screen left " « U+00BB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK " -" Failing that, ‘<’ and ‘>’ will do the trick. +" Failing that, `<` and `>` will do the trick. " if has('multi_byte_encoding') set listchars+=extends:»,precedes:« @@ -790,7 +790,7 @@ set sessionoptions-=options " No global options or mappings " set noshowcmd -" The ‘I’ flag for the 'shortmess' option prevents the display of the Vim +" The `I` flag for the 'shortmess' option prevents the display of the Vim " startup screen with version information, :help hints, and donation " suggestion. After I registered Vim and donated to Uganda per the screen’s " plea, I didn’t feel bad about turning this off anymore. Even with this @@ -813,7 +813,7 @@ set splitbelow splitright " Vim has an internal list of terminal types that support using smoother " terminal redrawing, and for which 'ttyfast' is normally set, described in -" ‘:help 'ttyfast'’. That list includes most of the terminals I use, but +" `:help 'ttyfast'`. That list includes most of the terminals I use, but " there are a couple more for which the 'ttyfast' option should apply: the " windows terminal emulator PuTTY, and the terminal multiplexer tmux, both of " which I use heavily. @@ -843,7 +843,7 @@ set virtualedit+=block " I can’t recall a time that Vim’s error beeping or flashing was actually " useful to me, and so we turn it off in the manner that the manual instructs -" in ‘:help 'visualbell'’. This enables visual rather than audio error bells, +" in `:help 'visualbell'`. This enables visual rather than audio error bells, " but in the same breath, blanks the terminal attribute that would be used to " trigger such screen blinking, indirectly disabling the bell altogether. " @@ -912,18 +912,18 @@ set wildignore=*~,#*#,*.7z,.DS_Store,.git,.hg,.svn,*.a,*.adf,*.asc,*.au,*.aup " Allow me to type a path to complete on the Ex command line in all-lowercase, " and transform the consequent completion to match the appropriate case, like -" the Readline setting ‘completion-ignore-case’ can be used for GNU Bash. +" the Readline setting `completion-ignore-case` can be used for GNU Bash. " " When completing filenames on the command line, choose completions without " regard to case, allowing me the ease of typing a partial path in " all-lowercase. This is very similar to the Readline setting -" ‘completion-ignore-case’ used for Bash. +" `completion-ignore-case` used for Bash. " " The 'wildignorecase' option is not related to the similarly-named " 'wildignore' option, nor to the +wildmenu feature. " " We need to check that the 'wildignorecase' option exists before we set it, -" because it wasn't added to Vim until v7.3.72: +" because it wasn’t added to Vim until v7.3.72: " " " @@ -973,7 +973,7 @@ endif autocmd vimrc ColorScheme * \ call colorscheme#UpdateCursorline(g:colors_name, ['sahara']) -" Use 'dark' as my default value for 'background', in the absence of an +" Use `dark` as my default value for 'background', in the absence of an " environment variable COLORFGBG or a response in v:termrbgresp that would set " it specifically. " @@ -1047,7 +1047,7 @@ nnoremap " I often can’t remember (or guess) digraph codes, and want to look up how to " compose a specific character that I can name, at least in part. The table -" in ‘:help digraph-table’ is what to use for that situation, and it solves +" in `:help digraph-table` is what to use for that situation, and it solves " the problem, but I didn’t like the overhead of repeated lookups therein. " " Steve Losh has a solution I liked where a double-tap of CTRL-K in insert @@ -1095,7 +1095,7 @@ nnoremap \ :nohlsearch " The insert mode wrapper for normal CTRL-L uses i_CTRL-O to issue a single -" normal mode command. We intentionally use ‘:normal’ rather than ‘:normal!’ +" normal mode command. We intentionally use `:normal` rather than `:normal!` " so that the mapping works recursively. I tried using with :imap " for this, but it didn’t work. Maybe i_CTRL-O doesn’t respect mappings. " I couldn’t find any documentation about it. @@ -1105,13 +1105,13 @@ inoremap " We use :vmap here rather than :xmap to have the mapping applied for select " mode as well as visual mode. This is because CTRL-L doesn’t reflect -" a printable character, and so we don't shadow anything by making it work, +" a printable character, and so we don’t shadow anything by making it work, " even though I don’t actually use select mode directly very much. " vmap \ gv -" By default, the very-useful normal mode command ‘&’ that repeats the +" By default, the very-useful normal mode command `&` that repeats the " previous :substitute command doesn’t preserve the flags from that " substitution. I’d prefer it to do so, like the :&& command does, and it’s " easily remapped for both normal and visual mode, so let’s just do it. @@ -1121,7 +1121,7 @@ noremap & ounmap & sunmap & -" I really like using the ‘!’ command in normal mode as an operator to filter +" I really like using the `!` command in normal mode as an operator to filter " text through a shell command. It always bugged me a little that there " didn’t seem to be an analogue for a motion to filter text through an " internal command like :sort, so I wrote one. @@ -1260,7 +1260,7 @@ nnoremap f " I often have to switch between US English and NZ English. The latter is " almost exactly the same as UK English in most locales, although we use " dollars rather than pounds. This is mostly so I remember things like -" excluding or including the ‘u’ in words like ‘favourite’, depending on the +" excluding or including the `u` in words like `favourite`, depending on the " target audience. I generally use US English for international audiences. " nnoremap z @@ -1295,7 +1295,7 @@ nmap b " the name of an option, and the second is the flag within it that should be " toggled on or off. -"" Leader,a toggles 'formatoptions' ‘a’ auto-flowing flag +"" Leader,a toggles 'formatoptions' `a` auto-flowing flag nnoremap a \ :ToggleFlagLocal formatoptions a "" Leader,L toggles 'colorcolumn' showing the first column beyond 'textwidth' @@ -1407,7 +1407,7 @@ nnoremap j \ :buffers:buffer " Leader,o hacks up the list of old files from viminfo just long enough to -" ensure that :browse :oldfiles fits in a screen, avoiding an Enter or ‘q’ +" ensure that :browse :oldfiles fits in a screen, avoiding an Enter or `q` " keystroke before entering the number. This one is handy followed by " ,\ to jump back to the last remembered position in that file, since " by definition viminfo remembers that mark, too. @@ -1534,7 +1534,7 @@ ounmap 7 sunmap 7 "" Leader,*/8 is "sticky star": "" - Set search string to word under cursor -"" - Show search highlighting if it's enabled +"" - Show search highlighting if it’s enabled "" - Don't move the cursor nnoremap * \ :let @/ = expand('') let &hlsearch = &hlsearch @@ -1547,7 +1547,7 @@ nnoremap ` nnoremap ~ \ :vertical ScratchBuffer -" There's no digraph for ZERO WIDTH SPACE (U+200B), which I often need to work +" There’s no digraph for ZERO WIDTH SPACE (U+200B), which I often need to work " around word boundary problems in tagging people on the Fediverse. " digraphs zs 8203 -- cgit v1.2.3 From 70e9e99a46ac55da3b23eda1a8dbab6ba94099f1 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Tue, 16 Nov 2021 11:08:56 +1300 Subject: Ignore SC2296 for a subtlety of ksh93 > In ksh/shrc.d/ksh.sh line 25: > ( test -n "${.sh.version}" ) 2>/dev/null || return > ^---------^ SC2296 (error): Parameter expansions can't start with .. Double check syntax. > > > In ksh/shrc.d/ksh.sh line 28: > KSH_VERSION=${.sh.version} > ^---------^ SC2296 (error): Parameter expansions can't start with .. Double check syntax. --- ksh/shrc.d/ksh.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ksh/shrc.d/ksh.sh b/ksh/shrc.d/ksh.sh index 9e032756..f074c832 100644 --- a/ksh/shrc.d/ksh.sh +++ b/ksh/shrc.d/ksh.sh @@ -21,10 +21,11 @@ if [ -z "$KSH_VERSION" ] ; then # Test whether we have content in the .sh.version variable. Suppress # errors and run it in a subshell to work around parsing error precedence. - # shellcheck disable=SC2234 + # shellcheck disable=SC2234,SC2296 ( test -n "${.sh.version}" ) 2>/dev/null || return # If that peculiarly named variable was set, then that's our KSH_VERSION + # shellcheck disable=SC2296 KSH_VERSION=${.sh.version} fi -- cgit v1.2.3 From ed59635fc295a09aa8f4794acc89ba9e1212d765 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Tue, 16 Nov 2021 11:13:19 +1300 Subject: Ignore a file inclusion warning --- X/xinitrc | 1 + 1 file changed, 1 insertion(+) diff --git a/X/xinitrc b/X/xinitrc index e86cac4d..b5041f8c 100644 --- a/X/xinitrc +++ b/X/xinitrc @@ -1,4 +1,5 @@ # If a file ~/.xrandrrc exists for monitor setup, source that first +# shellcheck disable=SC1091 [ -e "$HOME"/.xrandrrc ] && . "$HOME"/.xrandrrc # Read X resources -- cgit v1.2.3 From fa60cf7bb456783dec1cae670126996f2ff33e5c Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Tue, 16 Nov 2021 11:16:26 +1300 Subject: Remove actual plmu program I removed the manual page in 0703204, but didn't actually remove the program... --- bin/plmu | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100755 bin/plmu diff --git a/bin/plmu b/bin/plmu deleted file mode 100755 index bac2e434..00000000 --- a/bin/plmu +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# Upgrade plenv modules with cpanm(1) - -# Set up exceptions file if it exists -def="$HOME"/.plenv/non-cpanm-modules -if [ -e "$def" ] ; then - ef=$def -else - ef=/dev/null -fi - -# Check that exceptions file is sorted -if ! LC_COLLATE=C sort -c -- "$ef" ; then - printf >&2 '%s not sorted\n' "$ef" - exit 1 -fi - -# Get the list of modules; sort them in case our current locale disagrees on -# the existing sorting -plenv list-modules | LC_COLLATE=C sort | - -# Exclude any modules in ~/.plenv/non-cpanm-modules if it exists -LC_COLLATE=C comm -23 -- - "$ef" | - -# Read that list of modules to upgrade and upgrade them one by one -while read -r module ; do - cpanm --notest --quiet -- "$module" -done -- cgit v1.2.3 From 04021c21c3a71e153572909ff60e49a6cb5029e7 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Tue, 16 Nov 2021 11:18:21 +1300 Subject: Bump VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 1c140db5..4b83de4c 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -tejr dotfiles v11.8.0 -Sun, 15 Aug 2021 21:34:18 +0000 +tejr dotfiles v11.9.0 +Mon, 15 Nov 2021 22:18:21 +0000 -- cgit v1.2.3