diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2023-01-16 13:06:16 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2023-01-16 13:06:16 +1300 |
commit | 49d022923be64c662fcb73a7dde93c87f2750d40 (patch) | |
tree | c128e004d44336dab172c904bb43391760bb42a8 | |
parent | Merge branch 'release/v12.23.0' (diff) | |
parent | Update dotfiles(7) manual page (diff) | |
download | dotfiles-49d022923be64c662fcb73a7dde93c87f2750d40.tar.gz dotfiles-49d022923be64c662fcb73a7dde93c87f2750d40.zip |
Merge branch 'release/v12.24.0'v12.24.0
* release/v12.24.0:
Update dotfiles(7) manual page
Prevent mpv from auto sub file searching
Stop versioning yt-dlp config
Update vimrc comment to reflect new behavior
Set shebang for muttrc.d/src at build time
Remove executable bit from some shell scripts
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | Makefile | 8 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r--[-rwxr-xr-x] | bin/dmenu_pass.sh | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | bin/gscr.sh | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | bin/msc.sh | 0 | ||||
-rw-r--r-- | man/man7/dotfiles.7df | 3 | ||||
-rw-r--r-- | mpv/mpv.conf | 3 | ||||
-rw-r--r--[-rwxr-xr-x] | mutt/muttrc.d/src.sh (renamed from mutt/muttrc.d/src) | 2 | ||||
-rw-r--r-- | vim/vimrc.stub | 7 | ||||
-rw-r--r-- | yt-dlp/config | 5 |
12 files changed, 11 insertions, 24 deletions
@@ -186,6 +186,7 @@ /include/mktd.m4 /less/less /mutt/filters/markdown-to-html +/mutt/muttrc.d/src /tmux/bin/tmux /urxvt/ext/select /x/xsession @@ -58,7 +58,6 @@ install-x \ install-xfce \ install-xsession \ - install-yt-dlp \ install-zsh \ check \ check-bash \ @@ -302,6 +301,7 @@ clean distclean: include/mktd.m4 \ less/less \ mutt/filters/markdown-to-html \ + mutt/muttrc.d/src \ tmux/bin/tmux \ urxvt/ext/select \ x/xsession @@ -494,7 +494,7 @@ install-mpv: $(XDG_DATA_HOME)/mpv/screenshots cp -p -- mpv/mpv.conf $(XDG_CONFIG_HOME)/mpv -install-mutt: install-gnupg install-mail mutt/filters/markdown-to-html +install-mutt: install-gnupg install-mail mutt/filters/markdown-to-html mutt/muttrc.d/src mkdir -p -- \ $(XDG_CONFIG_HOME)/mutt \ $(XDG_CONFIG_HOME)/mutt/muttrc.d \ @@ -685,10 +685,6 @@ install-xfce: install-x install-xsession: x/xsession check-xsession install-x cp -p -- x/xsession $(HOME)/.xsession -install-yt-dlp install-youtube-dl: - mkdir -p -- $(XDG_CONFIG_HOME)/yt-dlp - cp -p -- yt-dlp/config $(XDG_CONFIG_HOME)/yt-dlp - install-zsh: check-zsh install-sh mkdir -p -- $(HOME)/.zshrc.d cp -p -- zsh/profile.d/zsh.sh $(HOME)/.profile.d @@ -112,8 +112,6 @@ Configuration is included for: - [Vim](https://www.vim.org/)---Vi IMproved, a text editor - [X11](https://www.x.org/wiki/)---Windowing system with network transparency for Unix -- [yt-dlp](https://github.com/yt-dlp/yt-dlp)---Download manager for video - hosting websites There is also some slightly customized support for multi-version environment management for three major scripting languages: @@ -1,2 +1,2 @@ -tejr dotfiles v12.23.0 -Tue, 20 Sep 2022 11:01:07 +0000 +tejr dotfiles v12.24.0 +Mon, 16 Jan 2023 00:06:13 +0000 diff --git a/bin/dmenu_pass.sh b/bin/dmenu_pass.sh index 2969cd16..2969cd16 100755..100644 --- a/bin/dmenu_pass.sh +++ b/bin/dmenu_pass.sh diff --git a/bin/gscr.sh b/bin/gscr.sh index 26eafb12..26eafb12 100755..100644 --- a/bin/gscr.sh +++ b/bin/gscr.sh diff --git a/bin/msc.sh b/bin/msc.sh index 051f104a..051f104a 100755..100644 --- a/bin/msc.sh +++ b/bin/msc.sh diff --git a/man/man7/dotfiles.7df b/man/man7/dotfiles.7df index 16366c51..61d7cef6 100644 --- a/man/man7/dotfiles.7df +++ b/man/man7/dotfiles.7df @@ -173,9 +173,6 @@ Vim (https://www.vim.org/)\[em]Vi IMproved, a text editor .IP \[bu] 2 X11 (https://www.x.org/wiki/)\[em]Windowing system with network transparency for Unix -.IP \[bu] 2 -yt-dlp (https://github.com/yt-dlp/yt-dlp)\[em]Download manager for video -hosting websites .PP There is also some slightly customized support for multi-version environment management for three major scripting languages: diff --git a/mpv/mpv.conf b/mpv/mpv.conf index d1624a79..ca68ade7 100644 --- a/mpv/mpv.conf +++ b/mpv/mpv.conf @@ -22,3 +22,6 @@ screenshot-format="png" # ~/.local/share/mpv/screenshots/Red Dwarf S01E01.mkv/mpv_Red Dwarf S01E01.mkv_00:08:20.461_0001.png # screenshot-template="%f/mpv_%f_%P_%04n" + +# Don't try to find external subtitles for me; I'll specify if I want them. +sub-auto=no diff --git a/mutt/muttrc.d/src b/mutt/muttrc.d/src.sh index 47cb2df1..60e0c566 100755..100644 --- a/mutt/muttrc.d/src +++ b/mutt/muttrc.d/src.sh @@ -1,5 +1,3 @@ -#!/bin/sh - # Build groups from address lists for rc in "$HOME"/.config/mutt/muttrc.d/groups/*.list ; do [ -e "$rc" ] || continue diff --git a/vim/vimrc.stub b/vim/vimrc.stub index 23a90608..92c53dfb 100644 --- a/vim/vimrc.stub +++ b/vim/vimrc.stub @@ -1,10 +1,9 @@ " We have a big, important decision to make here. " " Check that we're not running in 'compatible' mode, nor that the environment -" calls for the same, that we're running Vim v7.0.0 or newer, and that we -" haven't been invoked as just plain `vi`. If it's all clear, we can load the -" main vimrc file from ~/.vim/vimrc to use Vim in all of its incompatible -" glory, and then stop sourcing the rest of this file. +" calls for the same, and that we're running Vim v7.0.0 or newer. If it's all +" clear, we can load the main vimrc file from ~/.vim/vimrc to use Vim in all +" of its incompatible glory, and then stop sourcing the rest of this file. " if !&compatible && !exists('$POSIXLY_CORRECT') if v:version >= 700 diff --git a/yt-dlp/config b/yt-dlp/config deleted file mode 100644 index ae2162f5..00000000 --- a/yt-dlp/config +++ /dev/null @@ -1,5 +0,0 @@ -# Get WebM if we can, but keep going if not ---format 'bestvideo[ext=webm]+bestaudio[ext=webm]/best' - -# Save into the ~/download directory ---output ~/download/%(title)s-%(id)s.%(ext)s |