diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2020-04-27 21:31:29 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2020-04-27 21:31:29 +1200 |
commit | 7db9340efc3fb228347aeeeae603cf45ed5290ed (patch) | |
tree | 913fdaee660cef9e5598e3c380d97d834c48af9d | |
parent | Merge branch 'hotfix/v8.20.5' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-7db9340efc3fb228347aeeeae603cf45ed5290ed.tar.gz dotfiles-7db9340efc3fb228347aeeeae603cf45ed5290ed.zip |
Merge branch 'release/v8.21.0'v8.21.0
* release/v8.21.0:
Set systemctl editor to vi rather than ed
Fix a few spelling and punctuation errors
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | sh/profile.d/systemd.sh | 4 | ||||
-rw-r--r-- | vim/vimrc | 18 |
3 files changed, 15 insertions, 11 deletions
@@ -1,2 +1,2 @@ -tejr dotfiles v8.20.5 -Sun, 26 Apr 2020 05:23:07 +0000 +tejr dotfiles v8.21.0 +Mon, 27 Apr 2020 09:31:25 +0000 diff --git a/sh/profile.d/systemd.sh b/sh/profile.d/systemd.sh new file mode 100644 index 00000000..3c8bf04c --- /dev/null +++ b/sh/profile.d/systemd.sh @@ -0,0 +1,4 @@ +# If systemctl is installed, use $VISUAL as its editor, not $EDITOR +command -v systemctl >/dev/null 2>&1 || exit +SYSTEMD_EDITOR=$VISUAL +export SYSTEMD_EDITOR @@ -50,11 +50,11 @@ " here, too. " " On *nix, I define the primary locale environment variable $LANG, almost -" always specifying a multibyte locale. This informs Vim’s choice of internal -" character encoding, but the default for the 'encoding' option in the absence -" of a valid $LANG is ‘latin1’. Since this is almost never what I want, we’ll -" manually choose the UTF-8 encoding for Unicode in the absence of any other -" explicit specification. +" always specifying a multi-byte locale. This informs Vim’s choice of +" internal character encoding, but the default for the 'encoding' option in +" the absence of a valid $LANG is ‘latin1’. Since this is almost never what +" I want, we’ll manually choose the UTF-8 encoding for Unicode in the absence +" of any other explicit specification. " if &encoding ==# 'latin1' && !exists('$LANG') set encoding=utf-8 @@ -535,7 +535,7 @@ set foldlevel=256 " 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 +" 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 @@ -962,7 +962,7 @@ endif " extent possible, and avoid “doing more” in insert mode besides merely " inserting text as it’s typed. " -" * Avoid key chords with Ctrl in favor of leader keys. +" * Avoid key chords with CTRL in favor of leader keys. " " * Never use Alt/Meta key chords; the terminal support for them is just too " confusing and flaky. @@ -1244,7 +1244,7 @@ nnoremap <Leader>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 <Leader>z @@ -1493,7 +1493,7 @@ sunmap <Leader>r nnoremap <Leader>! \ :<Up><Home><S-Right>!<CR> nmap <Leader>1 <Leader>! -"" Leader,#/3 switches the current buffer to the next altenate filetype +"" Leader,#/3 switches the current buffer to the next alternate filetype nmap <Leader># <Plug>(AlternateFileType) nmap <Leader>3 <Leader># "" Leader,$/4 gives me my fortune |