Merge branch 'master' of github.com:Jab2870/dotfiles

2017-11-15 09:12:55 +00:00 · 2017-11-15 09:12:55 +00:00 · baa8c59d74
commit baa8c59d74
parent bea0d1a64d 6949c1b273
6 changed files with 704 additions and 2 deletions
--- a/config/oh-my-zsh/aliases.zsh
+++ b/config/oh-my-zsh/aliases.zsh
@ -119,5 +119,8 @@ alias lc="colorls -r"

 alias open="$TERMINAL & disown"

+#audiable to mp3
+alias aa2mp3='ffmpeg -f concat -safe 0 -i <(for f in *.aa; do echo "file '"'"'$(pwd)/$f'"'"'";done) output.mp3'
+
 # Fix Typos
 alias cim="vim"
--- a/config/vim
+++ b/config/vim
@ -1 +1 @@
-Subproject commit 80042f404d193ed1919d845bee56faee78312190
+Subproject commit 20137dafd8536d5f5af872bbc51e72bed8fb81a2