From 4d5371b92dfab8d38d05037b87c81d1a9317f684 Mon Sep 17 00:00:00 2001 From: Steffen Rademacker Date: Wed, 8 Jul 2020 19:27:44 +0200 Subject: [PATCH] =?UTF-8?q?=C2=AF\=5F(=E3=83=84)=5F/=C2=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gitconfig | 3 +++ install/software.sh | 1 - nvim/autocommands.vim | 3 +++ nvim/coc-settings.json | 34 +++++++++++++++++++++++++++------- zsh/aliases | 4 +++- zsh/functions | 33 +++++++++++++++++++++------------ zsh/zsh-completions | 2 +- zsh/zsh-syntax-highlighting | 2 +- 8 files changed, 59 insertions(+), 23 deletions(-) diff --git a/gitconfig b/gitconfig index e0a1e8ca..35764d4e 100644 --- a/gitconfig +++ b/gitconfig @@ -66,5 +66,8 @@ [push] default = simple +[pull] + rebase = false + [interactive] diffFilter = diff-highlight diff --git a/install/software.sh b/install/software.sh index af8c5a46..d2f52b28 100755 --- a/install/software.sh +++ b/install/software.sh @@ -26,7 +26,6 @@ brew cask install telegram brew cask install transmission brew cask install vlc brew cask install vmware-fusion -brew cask install zoomus # Drivers and other software brew tap homebrew/cask-fonts diff --git a/nvim/autocommands.vim b/nvim/autocommands.vim index 0db313c3..6e6fb20a 100644 --- a/nvim/autocommands.vim +++ b/nvim/autocommands.vim @@ -18,5 +18,8 @@ augroup init autocmd FileType mail setlocal comments+=nb:> autocmd FileType mail setlocal formatoptions+=awq autocmd BufNewFile,BufRead neomutt-* set ft=mail + + " special settings for json5, css and scss: better BEM + autocmd BufNewFile,BufRead *.{json5,css,scss} set iskeyword+=- augroup END diff --git a/nvim/coc-settings.json b/nvim/coc-settings.json index 10d287ba..3ca44472 100644 --- a/nvim/coc-settings.json +++ b/nvim/coc-settings.json @@ -15,12 +15,32 @@ "json", "yaml" ], - "snippets.ultisnips.directories": ["~/.config/nvim/snippets"], + "snippets.ultisnips.directories": [ + "~/.config/nvim/snippets" + ], "snippets.extends": { - "php": ["html"], - "scss": ["css"], - "jsx": ["javascript"], - "javascriptreact": ["javascript"], - "typescript": ["javascript"] - } + "php": [ + "html" + ], + "scss": [ + "css" + ], + "jsx": [ + "javascript" + ], + "javascriptreact": [ + "javascript" + ], + "typescript": [ + "javascript" + ] + }, + // whyever: this seems broken so deactivate for now + "phpls.enable": false, + "typescript.suggest.enabled": false, + "typescript.validate.enable": false, + "typescript.format.enabled": false, + "tsserver.disableAutomaticTypeAcquisition": true, + "javascript.format.enabled": false, + "javascript.validate.enable": false } diff --git a/zsh/aliases b/zsh/aliases index 6d7c14e8..71168214 100644 --- a/zsh/aliases +++ b/zsh/aliases @@ -55,8 +55,10 @@ alias ta='tmux -u attach' alias brewup='brew update && brew upgrade && brew cu -a -f -y && brew cleanup' alias upall='brewup && npm-check -gu' -# temp fix for dnsmasq-bootup +# temp fix for dnsmasq-bootup/unifi-java fuckup +# JVMRuntime adoptopenjdk-8.jdk alias dnsmasqfix='sudo brew services stop dnsmasq && sudo mkdir /usr/local/etc/dnsmasq.d && sudo brew services start dnsmasq' +alias unififix='sudo ln -s /Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk /Applications/UniFi.app/Contents/PlugIns/adoptopenjdk-8.jdk && sudo v /Applications/UniFi.app/Contents/Info.plist' # other often used stuff, mostly node/npm alias ns="npm start" diff --git a/zsh/functions b/zsh/functions index d3258a39..ed8f20dd 100644 --- a/zsh/functions +++ b/zsh/functions @@ -1,39 +1,39 @@ -function webvideo() { +webvideo () { ffmpeg -i $1 -map_metadata -1 -c:a libopus -c:v libaom-av1 -crf 34 -b:v 0 -pix_fmt yuv420p -movflags +faststart -vf "scale=trunc(iw/2)*2:trunc(ih/2)*2" -strict experimental $1.av1.mp4 ffmpeg -i $1 -map_metadata -1 -c:a libfdk_aac -c:v libx265 -crf 24 -preset veryslow -pix_fmt yuv420p -movflags +faststart -tag:v hvc1 -vf "scale=trunc(iw/2)*2:trunc(ih/2)*2" $1.hevc.mp4 ffmpeg -i $1 -map_metadata -1 -c:a libfdk_aac -c:v libx264 -crf 24 -preset veryslow -profile:v main -pix_fmt yuv420p -movflags +faststart -vf "scale=trunc(iw/2)*2:trunc(ih/2)*2" $1.h264.mp4 } -function webvideonoaudio() { +webvideonoaudio () { ffmpeg -i $1 -map_metadata -1 -an -c:v libaom-av1 -crf 34 -b:v 0 -pix_fmt yuv420p -movflags +faststart -vf "scale=trunc(iw/2)*2:trunc(ih/2)*2" -strict experimental $1.av1.mp4 ffmpeg -i $1 -map_metadata -1 -an -c:v libx265 -crf 24 -preset veryslow -pix_fmt yuv420p -movflags +faststart -tag:v hvc1 -vf "scale=trunc(iw/2)*2:trunc(ih/2)*2" $1.hevc.mp4 ffmpeg -i $1 -map_metadata -1 -an -c:v libx264 -crf 24 -preset veryslow -profile:v main -pix_fmt yuv420p -movflags +faststart -vf "scale=trunc(iw/2)*2:trunc(ih/2)*2" $1.h264.mp4 } -function webvideooptimized() { +webvideooptimized () { ffmpeg -i $1 -map_metadata -1 -c:a libfdk_aac -c:v libx264 -crf 24 -preset veryslow -profile:v main -pix_fmt yuv420p -movflags +faststart -vf "scale=1920:trunc(ow/a/2)*2" $1.h264.mp4 } -function webvideooptimizednoaudio() { +webvideooptimizednoaudio () { ffmpeg -i $1 -map_metadata -1 -an -c:v libx264 -crf 24 -preset veryslow -profile:v main -pix_fmt yuv420p -movflags +faststart -vf "scale=1920:trunc(ow/a/2)*2" $1.h264.mp4 } -function webvideooptimizednoaudiomobile() { - ffmpeg -i $1 -map_metadata -1 -an -c:v libx264 -crf 24 -preset veryslow -profile:v main -pix_fmt yuv420p -movflags +faststart -vf "scale=640:trunc(ow/a/2)*2" $1.h264.mp4 +webvideooptimizednoaudiomobile () { + ffmpeg -i $1 -map_metadata -1 -an -c:v libx264 -crf 24 -preset veryslow -profile:v main -pix_fmt yuv420p -movflags +faststart -vf "scale=720:trunc(ow/a/2)*2" $1.h264.mp4 } -function webvideoposter() { +webvideoposter () { ffmpeg -ss 00:00:02 -i $1 -frames:v 1 $1.jpg } # create and change to directory/folder -function take() { +take () { mkdir -p $1 cd $1 } # a function to get the current branch for git shortcuts etc -function current_branch() { +current_branch () { ref=$(git symbolic-ref HEAD 2> /dev/null) || \ ref=$(git rev-parse --short HEAD 2> /dev/null) || return echo ${ref#refs/heads/} @@ -51,9 +51,9 @@ fancy-ctrl-z () { } # creates an archive from given directory -mktar() { tar cvf "${1%%/}.tar" "${1%%/}"; } -mktgz() { tar cvzf "${1%%/}.tgz" "${1%%/}"; } -mkzip() { zip -r "${1%%/}" "${1%%/}"; } +mktar () { tar cvf "${1%%/}.tar" "${1%%/}"; } +mktgz () { tar cvzf "${1%%/}.tgz" "${1%%/}"; } +mkzip () { zip -r "${1%%/}" "${1%%/}"; } # easy extract extract () { @@ -77,3 +77,12 @@ extract () { echo "'$1' is not a valid file!" fi } + +wttr () { + if [[ -n "$1" ]] + then + curl "wttr.in/$1?format=v2" + else + curl "wttr.in/Leipzig?format=v2" + fi +} diff --git a/zsh/zsh-completions b/zsh/zsh-completions index 2441475f..3b247d30 160000 --- a/zsh/zsh-completions +++ b/zsh/zsh-completions @@ -1 +1 @@ -Subproject commit 2441475f5629831a0c447cd016421598a3fd04b5 +Subproject commit 3b247d3071b8f1b723f288aec10e91758a109045 diff --git a/zsh/zsh-syntax-highlighting b/zsh/zsh-syntax-highlighting index 3a4b212c..fb929edc 160000 --- a/zsh/zsh-syntax-highlighting +++ b/zsh/zsh-syntax-highlighting @@ -1 +1 @@ -Subproject commit 3a4b212c7d8263a12bef176b10737748b752a579 +Subproject commit fb929edc30192407a9298aad64f55ca1b19a464e