From e0deadf5cdcd4a3183748b82e53c2dfc896346b8 Mon Sep 17 00:00:00 2001 From: Alice Gaudon Date: Fri, 28 May 2021 11:29:20 +0200 Subject: [PATCH] Update config.fish --- .config/fish/config.fish | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 2957b7c..204dd0d 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -1,3 +1,4 @@ +set fish_greeting '' #set -x XDG_CURRENT_DESKTOP=kde if test ! $DISPLAY && test $XDG_VTNR -eq 1 @@ -8,13 +9,15 @@ end # LANG set -x LANG en_US.UTF-8 - # PATH -set -x PATH "$PATH:"(ruby -e 'puts Gem.user_dir')"/bin" # Ruby +#set -x PATH "$PATH:"(ruby -e 'puts Gem.user_dir')"/bin" # Ruby set -x PATH "$PATH:$HOME/.composer/vendor/bin" # Composer set -x PATH "$HOME/dev/android/platform-tools:$HOME/dev/android/bin:$PATH" # Android platform tools set -x PATH "$PATH:$HOME/.rvm/bin" # Ruby rvm - +set -x PATH "$HOME/.node_modules/bin:$PATH" +set -x PATH "node_modules/.bin:$PATH" +set -x npm_config_prefix ~/.node_modules +set -x NODE_PATH ~/.node_modules/lib/node_modules # Editor set -x EDITOR micro @@ -22,9 +25,8 @@ set -x VISUAL $EDITOR ## Aliases ## -alias l='ls -la' +alias l='ls -la --group-directories-first' alias dotgit='git --git-dir=$HOME/dotfiles/ --work-tree=$HOME' -alias authy="/usr/bin/electron4 --app /usr/lib/authy/app.asar" alias syslog="sudo journalctl -f | ccze -A" function journal -w 'systemctl status' @@ -48,10 +50,16 @@ function convert-tomp4 end function convert-todavinci - set name "$1" - shift - - ffmpeg -i "$name" "$argv" -q:v 1 -q:a 1 -map 0 -c:v mpeg4 -c:a pcm_s24le "$name.davinci.mov" + echo "> $argv[2].davinci.mov" + + set rate "" + set args $argv[3..-1] + if test $argv[3] = "-r" + set rate -r $argv[4] + set args $argv[5..-1] + end + + ffmpeg $rate -i "$argv[1]" $args -q:v 1 -q:a 1 -map 0 -c:v mpeg4 -c:a pcm_s24le "$argv[2].davinci.mov" end # Example: `pngs-to-mov "%04d" 60 render` renders images with format 0000.png at 60 fps to render.mov