diff --git a/home/.vim/ftdetect/filetypes.vim b/home/.vim/ftdetect/filetypes.vim index d732eef..f0a7e6b 100644 --- a/home/.vim/ftdetect/filetypes.vim +++ b/home/.vim/ftdetect/filetypes.vim @@ -7,6 +7,8 @@ autocmd Filetype cpp setlocal ts=4 sw=4 sts=4 expandtab autocmd Filetype c setlocal ts=4 sw=4 sts=4 expandtab autocmd Filetype css setlocal ts=2 sw=2 sts=2 expandtab autocmd Filetype dart setlocal ts=2 sw=2 sts=2 expandtab +autocmd Filetype dockerfile setlocal ts=4 sw=4 sts=4 expandtab +autocmd Filetype dot setlocal ts=2 sw=2 sts=2 expandtab autocmd Filetype elm setlocal ts=2 sw=2 sts=2 expandtab autocmd Filetype go setlocal ts=4 sw=4 sts=4 autocmd Filetype html setlocal ts=2 sw=2 sts=2 expandtab diff --git a/home/.vimrc b/home/.vimrc index 97afcc2..eb77e8a 100644 --- a/home/.vimrc +++ b/home/.vimrc @@ -17,6 +17,7 @@ Plugin 'moll/vim-node' Plugin 'ElmCast/elm-vim' Plugin 'posva/vim-vue' Plugin 'Glench/Vim-Jinja2-Syntax' +Plugin 'wannesm/wmgraphviz.vim' "" END VUNDLE PLUGINS call vundle#end() filetype plugin indent on diff --git a/home/.zshrc.docker b/home/.zshrc.docker index 8286a7f..5f54739 100755 --- a/home/.zshrc.docker +++ b/home/.zshrc.docker @@ -30,3 +30,13 @@ function docker-gimp() { --device /dev/dri \ r.jalr.de/sbruder/docker-gimp $files } + +function vobsub2srt() { + docker run \ + --rm \ + -v \ + $PWD:/data \ + sbruder/vobsub2srt \ + --blacklist '„“”|’/\`_~<>' \ + $@ +} diff --git a/home/.zshrc.local b/home/.zshrc.local index 0230d50..9edfa5b 100644 --- a/home/.zshrc.local +++ b/home/.zshrc.local @@ -1,7 +1,7 @@ # Programming languages ## Go -export GOPATH="$HOME/opt/go" +export GOPATH="$HOME/go" PATH="$PATH:$GOPATH/bin" ## Node @@ -10,10 +10,6 @@ PATH="$PATH:/home/simon/opt/node/bin" ## Python (pip) PATH="$PATH:/home/simon/.local/bin" -## Dart - -PATH="$PATH:/home/simon/opt/dart-sdk/bin" - ## Lua PATH="$PATH:$HOME/.luarocks/bin/" @@ -144,11 +140,12 @@ unalias ag # Program aliases/env ## Aliases for programs -alias atom="/home/simon/opt/atom/atom" alias tearstop="compton --backend=glx" -alias vobsub2srt="docker run -v $PWD:/data --rm -it vobsub2srt vobsub2srt" alias apktool="java -jar ~/opt/apktool_2.3.1.jar" alias mpvhdr="mpv --tone-mapping=hable" +alias rls="/bin/ls --color=auto" +alias exa="exa --git" +alias ls="exa" ## Environment variables export HVSC_BASE="$HOME/Dokumente/sound/HVSC/" @@ -161,9 +158,8 @@ source ~/.zshrc.docker ## drone ci function drone-add-registry() { ( - source ~/.drone-env - drone secret add --name docker_username --value simon "$1" - drone secret add --name docker_password --value "$DRONE_CI_PASSWORD" "$1" + drone secret add --name docker_username --value sbruder "$1" + drone secret add --name docker_password --value "$(pass show devops/docker|head -n 1)" "$1" ) }