diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2021-07-26 14:15:37 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2021-07-26 14:15:37 +1200 |
commit | 5388d8f6d2e8b7b578b57850089b303cf6d85c30 (patch) | |
tree | 89e774d3cf500de430bcdde9d5a52b5234cda8f1 | |
parent | Merge branch 'release/v11.5.0' (diff) | |
parent | Update dotfiles(7) manual page (diff) | |
download | dotfiles-5388d8f6d2e8b7b578b57850089b303cf6d85c30.tar.gz dotfiles-5388d8f6d2e8b7b578b57850089b303cf6d85c30.zip |
Merge branch 'release/v11.6.0'v11.6.0
* release/v11.6.0:
Update dotfiles(7) manual page
Add a date directory level for screenshots
Update expected path to i3 lock image
Add options terminator to scrot command for sxhkd
Revert "Try an even shorter sleep before snapping"
Try an even shorter sleep before snapping
Adjust command line breaks for better legibility
Remove implied -i from xclip call
Break up long line in X/sxhkdrc
Add a short sleep before window snapping
Use a Unicode-aware font for i3wm
Use ~/.fehbg background if it's set
Use consistent line breaks for Muttrc settings
Revert "Set font for rxvt-unicode to include Symbola"
Set font for rxvt-unicode to include Symbola
Add youtube-dl config
Add clipboard copy to scrot screen snap
Remove i3 workspace labels for now
Add scrot screenshot sampler to sxhkd config
-rw-r--r-- | Makefile | 5 | ||||
-rw-r--r-- | README.md | 1 | ||||
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | X/sxhkdrc | 9 | ||||
-rw-r--r-- | X/xinitrc.d/background.sh | 7 | ||||
-rw-r--r-- | X/xinitrc.d/xrbg.sh | 2 | ||||
-rw-r--r-- | i3/config | 23 | ||||
-rw-r--r-- | man/man7/dotfiles.7df | 3 | ||||
-rw-r--r-- | mutt/muttrc | 8 | ||||
-rw-r--r-- | youtube-dl/config | 5 |
10 files changed, 48 insertions, 19 deletions
@@ -52,6 +52,7 @@ install-vint \ install-wget \ install-x \ + install-youtube-dl \ install-zsh \ check \ check-bash \ @@ -636,6 +637,10 @@ install-x: check-xinit cp -p -- X/Xresources $(HOME)/.Xresources cp -p -- X/Xresources.d/* $(HOME)/.Xresources.d +install-youtube-dl: + mkdir -p -- $(XDG_CONFIG_HOME)/youtube-dl + cp -p -- youtube-dl/config $(XDG_CONFIG_HOME)/youtube-dl + install-zsh: check-zsh install-sh mkdir -p -- $(HOME)/.zshrc.d cp -p -- zsh/profile.d/*.sh $(HOME)/.profile.d @@ -113,6 +113,7 @@ 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 +- [youtube-dl](https://youtube-dl.org/)---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 v11.5.0 -Fri, 02 Jul 2021 01:33:15 +0000 +tejr dotfiles v11.6.0 +Mon, 26 Jul 2021 02:15:34 +0000 @@ -31,8 +31,15 @@ super + p 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' + super + slash - i3lock --color=#000000 --image ~/.i3/lock.png --nofork + i3lock --color=#000000 --image "$HOME"/.local/share/i3/lock.png --nofork XF86AudioMute amixer -q sset Master toggle diff --git a/X/xinitrc.d/background.sh b/X/xinitrc.d/background.sh new file mode 100644 index 00000000..85a40889 --- /dev/null +++ b/X/xinitrc.d/background.sh @@ -0,0 +1,7 @@ +# If there's a ~/.fehbg, just run that; otherwise, try to apply a random +# background image, if the relevant dir exists +if [ -e "$HOME"/.fehbg ] ; then + sh -- "$HOME"/.fehbg +elif [ -d "${XBACKGROUNDS:-"$HOME"/.xbackgrounds}" ] ; then + xrbg +fi diff --git a/X/xinitrc.d/xrbg.sh b/X/xinitrc.d/xrbg.sh deleted file mode 100644 index 0e4ec278..00000000 --- a/X/xinitrc.d/xrbg.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Apply a random background image -xrbg @@ -10,6 +10,9 @@ new_window 1pixel # If the window is the only one on the workspace, forego the borders hide_edge_borders smart +# Use a Unicode-capable font that should be available +font pango:Liberation Mono 8 + # Mod+Shift+r restarts i3wm bindsym $mod+Shift+r restart @@ -53,22 +56,22 @@ bindsym $mod+a focus parent bindsym $mod+z focus child # Mod+<n> switches to a workspace -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+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+6 workspace 6 bindsym $mod+7 workspace 7 bindsym $mod+8 workspace 8 bindsym $mod+9 workspace 9 # Mod+Shift+<n> moves a container to a workspace -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+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+6 move container to workspace 6 bindsym $mod+Shift+7 move container to workspace 7 bindsym $mod+Shift+8 move container to workspace 8 diff --git a/man/man7/dotfiles.7df b/man/man7/dotfiles.7df index f542c888..9b2cf0da 100644 --- a/man/man7/dotfiles.7df +++ b/man/man7/dotfiles.7df @@ -173,6 +173,9 @@ 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 +youtube-dl (https://youtube-dl.org/)\[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/mutt/muttrc b/mutt/muttrc index 504ce9a9..2a3dca8b 100644 --- a/mutt/muttrc +++ b/mutt/muttrc @@ -47,8 +47,8 @@ set header_cache \ # I really want is to be able to run the same commands again even after I quit # Mutt. We can afford to keep 2^8 of these, since it's the future and all. # -set history_file = \ - ~/.cache/mutt/history +set history_file \ + = ~/.cache/mutt/history set history = 256 set save_history = $history @@ -64,8 +64,8 @@ set index_format = '%4C %Z %{%b %d %Y} %-15.15L (%?l?%4l&%4c?) %?H?[%H] ?%s' # Set a custom mailcap, rather than leaning on the system's # -set mailcap_path = \ - ~/.config/mutt/mailcap +set mailcap_path \ + = ~/.config/mutt/mailcap # When displaying messages with multiple alternatives for display, prefer any # plain text one, but failing that, fall back to enriched text (hey, it could diff --git a/youtube-dl/config b/youtube-dl/config new file mode 100644 index 00000000..ae2162f5 --- /dev/null +++ b/youtube-dl/config @@ -0,0 +1,5 @@ +# 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 |