diff --git a/etc/php/7.4/conf.d/imagick.ini b/etc/php/7.4/conf.d/imagick.ini index 4d95d81..6b76da4 100644 --- a/etc/php/7.4/conf.d/imagick.ini +++ b/etc/php/7.4/conf.d/imagick.ini @@ -1 +1 @@ -extension="/usr/local/Cellar/php@7.4/7.4.22/pecl/20190902/imagick.so" +extension="/usr/local/Cellar/php@7.4/7.4.24/pecl/20190902/imagick.so" diff --git a/install/1_languages.sh b/install/1_languages.sh index ca2df44..d2ea6fe 100755 --- a/install/1_languages.sh +++ b/install/1_languages.sh @@ -2,21 +2,25 @@ # ruby brew install rbenv # restart terminal, then: -RUBY_CONFIGURE_OPTS="--with-openssl-dir=/usr/local/opt/openssl" rbenv install 3.0.1 -rbenv global 3.0.1 +RUBY_CONFIGURE_OPTS="--with-openssl-dir=/usr/local/opt/openssl" rbenv install 3.0.2 +rbenv global 3.0.2 +gem install neovim # node curl -L https://git.io/n-install | bash n v8 n v12 n lts +n latest npm install -g npm@latest +npm install -g neovim npm update -g # python # first: find out the current python3 version in homebrew # then install this version with pyenv and link it brew install pyenv # restart terminal, then: -pyenv install 3.9.6 -pyenv global 3.9.6 +pyenv install 3.9.7 +pyenv global 3.9.7 pip install --upgrade pip +pip install neovim diff --git a/install/3_vimux.sh b/install/3_vimux.sh index 0816e73..c9b8453 100755 --- a/install/3_vimux.sh +++ b/install/3_vimux.sh @@ -4,9 +4,6 @@ brew install neovim --HEAD brew install tmux # vim dependencies -gem install neovim -pip install neovim -npm install -g neovim # link config files ln -s ~/dotfiles/nvim ~/.config/nvim diff --git a/nvim/autoload/plug.vim b/nvim/autoload/plug.vim index 6a958cb..b6e4cbf 100644 --- a/nvim/autoload/plug.vim +++ b/nvim/autoload/plug.vim @@ -1208,7 +1208,8 @@ function! s:update_impl(pull, force, args) abort normal! 2G silent! redraw - let s:clone_opt = [] + " Set remote name, overriding a possible user git config's clone.defaultRemoteName + let s:clone_opt = ['--origin', 'origin'] if get(g:, 'plug_shallow', 1) call extend(s:clone_opt, ['--depth', '1']) if s:git_version_requirement(1, 7, 10) diff --git a/zsh/functions b/zsh/functions index 8dafbb5..3875d4f 100644 --- a/zsh/functions +++ b/zsh/functions @@ -66,7 +66,18 @@ webvideo () { ffmpeg -i $1 -map_metadata -1 -c:a libopus -b:a 64k -c:v librav1e -qp 110 -speed 4 -tile-columns 2 -tile-rows 2 -movflags +faststart -vf $SCALE -threads 0 $1.av1.webm } -webvideonoaudio () { +webvideomute () { + WIDTH="${2:-trunc(iw/2)*2}" + HEIGHT="trunc(ih/2)*2" + if [[ -n "$2" ]] + then + HEIGHT="trunc(ow/a/2)*2" + fi + + SCALE="scale=$WIDTH\:$HEIGHT" + + ffmpeg -i $1 -map_metadata -1 -an -c:v libx264 -crf 26 -preset slow -profile:v main -pix_fmt yuv420p -movflags +faststart -vf $SCALE -threads 0 $1.h264.mp4 + ffmpeg -i $1 -map_metadata -1 -an -c:v librav1e -qp 110 -speed 4 -tile-columns 2 -tile-rows 2 -movflags +faststart -vf $SCALE -threads 0 $1.av1.webm } webvideoposter () {