diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2020-05-15 01:22:41 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2020-05-15 01:22:41 +1200 |
commit | 0a523403740f5cc8a4c37f9011bc410eb6429d0e (patch) | |
tree | b6e75679ba922813055a2b123a2bda4ac43780fe | |
parent | Merge branch 'hotfix/v8.36.1' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-8.37.0.tar.gz (sig) dotfiles-8.37.0.zip |
Merge branch 'release/v8.37.0'v8.37.0
* release/v8.37.0:
Don't put spell in cache, update spell plugin
Add Mutt config match patterns for XDG
Add some formatting preferences to Newsboat
Use consistent reload time of 10 mins for Newsboat
Add systemd notifier service
Remove disused parcimonie.service
Add target for newsboat systemd timer
Use fault-tolerant Tor for newsboat load
Keep articles in newsboat indefinitely
-rw-r--r-- | Makefile | 15 | ||||
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | newsboat/config | 15 | ||||
-rw-r--r-- | newsboat/systemd/user/reload-newsboat.service | 8 | ||||
-rw-r--r-- | newsboat/systemd/user/reload-newsboat.timer | 9 | ||||
-rw-r--r-- | systemd/parcimonie.service | 8 | ||||
-rw-r--r-- | systemd/user/notify-email@.service | 6 | ||||
-rw-r--r-- | vim/after/plugin/spellfile_local.vim | 7 | ||||
m--------- | vim/bundle/spellfile_local | 0 | ||||
-rw-r--r-- | vim/filetype.vim | 3 | ||||
-rw-r--r-- | vim/vimrc | 11 |
11 files changed, 60 insertions, 26 deletions
@@ -40,6 +40,7 @@ install-readline \ install-sh \ install-subversion \ + install-systemd \ install-terminfo \ install-tidy \ install-tmux \ @@ -492,9 +493,15 @@ install-ncmcpp: install-mpd mkdir -p -- $(HOME)/.ncmpcpp cp -p -- ncmpcpp/config $(HOME)/.ncmpcpp -install-newsboat: +install-newsboat: install-systemd mkdir -p -- $(XDG_CONFIG_HOME)/newsboat $(XDG_DATA_HOME)/newsboat cp -p -- newsboat/config $(XDG_CONFIG_HOME)/newsboat + -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 install-mysql: cp -p -- mysql/my.cnf $(HOME)/.my.cnf @@ -544,6 +551,12 @@ install-subversion: mkdir -p -- $(HOME)/.subversion cp -p -- subversion/config $(HOME)/.subversion +install-systemd: + -command -v systemctl >/dev/null 2>&1 \ + && mkdir -p -- $(XDG_CONFIG_HOME)/systemd/user \ + && cp -p -- systemd/user/* $(XDG_CONFIG_HOME)/systemd/user \ + && systemctl --user daemon-reload \ + install-terminfo: find terminfo -type f -name '*.ti' \ -exec tic -- {} \; @@ -1,2 +1,2 @@ -tejr dotfiles v8.36.1 -Tue, 12 May 2020 12:18:03 +0000 +tejr dotfiles v8.37.0 +Thu, 14 May 2020 13:22:38 +0000 diff --git a/newsboat/config b/newsboat/config index d7caf12d..43f5a135 100644 --- a/newsboat/config +++ b/newsboat/config @@ -1,14 +1,21 @@ -auto-reload yes confirm-exit yes -keep-articles-days 180 -reload-threads 5 -reload-time 30 + +auto-reload yes +reload-time 10 + +proxy-type socks5h +proxy localhost:9050 +download-retries 4 +download-timeout 60 bind-key j next bind-key k prev bind-key J next-feed bind-key K prev-feed +articlelist-format "%4i %f %D %?T?|%-17T| ?%t" +datetime-format "%F %T" + color article default default color background default default color info white color52 diff --git a/newsboat/systemd/user/reload-newsboat.service b/newsboat/systemd/user/reload-newsboat.service new file mode 100644 index 00000000..24e4117c --- /dev/null +++ b/newsboat/systemd/user/reload-newsboat.service @@ -0,0 +1,8 @@ +[Unit] +Description=fetch new Newsboat articles +OnFailure=notify-email@%n +After=tor.service +ConditionPathExists=!%h/.local/share/newsboat/cache.db.lock + +[Service] +ExecStart=newsboat -x reload diff --git a/newsboat/systemd/user/reload-newsboat.timer b/newsboat/systemd/user/reload-newsboat.timer new file mode 100644 index 00000000..6e59d66e --- /dev/null +++ b/newsboat/systemd/user/reload-newsboat.timer @@ -0,0 +1,9 @@ +[Unit] +Description=fetch new Newsboat articles + +[Timer] +OnBootSec=10m +OnUnitActiveSec=10m + +[Install] +WantedBy=timers.target diff --git a/systemd/parcimonie.service b/systemd/parcimonie.service deleted file mode 100644 index a823b216..00000000 --- a/systemd/parcimonie.service +++ /dev/null @@ -1,8 +0,0 @@ -[Service] -ExecStart=/home/tom/.local/bin/parcimonie -Restart=always -PrivateTmp=true -NoNewPrivileges=true - -[Install] -WantedBy=default.target diff --git a/systemd/user/notify-email@.service b/systemd/user/notify-email@.service new file mode 100644 index 00000000..78c95a70 --- /dev/null +++ b/systemd/user/notify-email@.service @@ -0,0 +1,6 @@ +[Unit] +Description=unit status mailer service for %i + +[Service] +Type=simple +ExecStart=sh -c 'systemctl --user status %i | mail --append="From: systemd" --append="X-systemd: %H %m %b" --subject="[systemd] %i failure" %u' diff --git a/vim/after/plugin/spellfile_local.vim b/vim/after/plugin/spellfile_local.vim new file mode 100644 index 00000000..b40736ab --- /dev/null +++ b/vim/after/plugin/spellfile_local.vim @@ -0,0 +1,7 @@ +"if xdg#['data']['home'] !=# '' +" let g:spellfile_local_dirs = [ xdg#['data']['home'] ] +" call extend( +" \ g:spellfile_local_dirs, +" \ copy(xdg#['data']['dirs']) +" \) +"endif diff --git a/vim/bundle/spellfile_local b/vim/bundle/spellfile_local -Subproject cb792a082202bba673ccf0f6f58a8ce2cf44f07 +Subproject 4fcb24eb8a331efff973585377606e6a3a018fc diff --git a/vim/filetype.vim b/vim/filetype.vim index 1e34f42c..339824f0 100644 --- a/vim/filetype.vim +++ b/vim/filetype.vim @@ -209,7 +209,8 @@ augroup filetypedetect " Mutt configuration files autocmd BufNewFile,BufRead \ Muttrc - \,*/.muttrc.d/*.rc + \,*/.muttrc.d/?*.rc + \,*/muttrc.d/?*.rc \,.muttrc \,muttrc \,/etc/Muttrc.d/* @@ -2,7 +2,7 @@ " Tom Ryder (tejr)’s Literate Vimrc " ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ " -" Last updated: Mon, 11 May 2020 09:22:45 UTC +" Last updated: Thu, 14 May 2020 08:24:17 UTC " " │ And I was lifted up in heart, and thought " │ Of all my late-shown prowess in the lists, @@ -165,15 +165,6 @@ if !empty(s:xdgconfigpaths) endif unlet s:xdgconfigpaths -" Now put the XDG cache home at the very front, so that e.g. 'spellfile' gets -" created in there rather than in the configuration directories. -" -if xdg#['cache']['home'] !=# '' - execute 'set runtimepath^='.option#Escape( - \ option#item#Escape(xdg#['cache']['home']) - \) -endif - " We need a command to reliably establish a full path, whether or not the " directories already exist. We create a wrapper for the autoloaded function " path#Create() with similar calling conventions to mkdir(), but with the ‘p’ |