2 files changed, 49 insertions(+), 41 deletions(-)

M .bashrc
A .commonrc

@@ 59,6 59,9 @@ PS2='\\ ' # \\ outputs a \
 alias um='udisksctl mount -b'
 alias uu='udisksctl unmount -b'
 
+# import settings between shells
+source .commonrc
+
 ## DT Aliases
 
 # emacs


@@ 117,47 120,6 @@ alias gpg-retrieve="gpg2 --keyserver-options auto-key-retrieve --receive-keys"
 # set vi mode in the shell
 set -o vi
 
-# grab metadata with yt-dlp
-alias yt-dlp='yt-dlp --restrict-filenames' # only want ASCII characters
-alias yt-dlpi='yt-dlp --write-info-json --write-description --write-thumbnail' # writes all video metadata
-alias yt-dlpic='yt-dlpi --write-comments' # also writes comments
-alias yt-dlpa='yt-dlp --write-description --write-thumbnail' # doesn't write info
-alias yt-dlpac='yt-dlpa --write-comments'
-alias yt-dlpd='yt-dlp --write-description' # only writes description
-alias yt-dlpdc='yt-dlpd --write-comments'
-alias yt-dlpt='yt-dlp --write-thumbnail' # only writes thumbnail
-alias yt-dlptc='yt-dlpt --write-comments'
-alias ytf='yt-dlp -F'
-
-# mpv aliases
-#
-# This coverts 25fps PAL video to 24fps film speed, and corrects the pitch.
-# Useful when playing a UK DVD originally made for film.
-# 24/25=0.96
-alias mpal='mpv --speed=0.96 --no-audio-pitch-correction'
-# This does the same in reverse, just to hear what PAL speed sounds like.
-# 25/24=~1.0416
-alias nonpal='mpv --speed=1.0416 --no-audio-pitch-correction'
-# Source: https://github.com/mpv-player/mpv/issues/7792
-#
-# This converts a non-4:3 video into 4:3.
-alias mpv43="mpv --video-aspect-override=4:3"
-# And a non-16:9 video into 16:9.
-alias mpv169="mpv --video-aspect-override=16:9"
-#
-# And the rest of the aliases, combining the functions together.
-alias mpal43="mpal --video-aspect-override=4:3"
-alias mpal169="mpal --video-aspect-override=16:9"
-alias nonpal43="nonpal --video-aspect-override=4:3"
-alias nonpal169="nonpal --video-aspect-override=16:9"
-
-# dfgit for dotfiles
-alias dfgit='git --git-dir=$HOME/.dfgit --work-tree=$HOME'
-alias edfgit='git --git-dir=$HOME/.edfgit --work-tree=$HOME'
-
 # local variables
 export wwwsrc=~/src/www
 export scrs=~/scripts/rsync
-
-# terminal rickroll
-alias rick='csl https://raw.githubusercontent.com/keroserene/rickrollrc/master/roll.sh | bash'

@@ 0,0 1,46 @@
+# .commonrc, for what should be shared between shells
+
+# grab metadata with yt-dlp
+alias yt-dlp='yt-dlp --restrict-filenames' # only want ASCII characters
+alias yt-dlpi='yt-dlp --write-info-json --write-description --write-thumbnail' # writes all video metadata
+alias yt-dlpic='yt-dlpi --write-comments' # also writes comments
+alias yt-dlpa='yt-dlp --write-description --write-thumbnail' # doesn't write info
+alias yt-dlpac='yt-dlpa --write-comments'
+alias yt-dlpd='yt-dlp --write-description' # only writes description
+alias yt-dlpdc='yt-dlpd --write-comments'
+alias yt-dlpt='yt-dlp --write-thumbnail' # only writes thumbnail
+alias yt-dlptc='yt-dlpt --write-comments'
+alias ytf='yt-dlp -F'
+
+# mpv aliases
+#
+# This coverts 25fps PAL video to 24fps film speed, and corrects the pitch.
+# Useful when playing a UK DVD originally made for film.
+# 24/25=0.96
+alias mpal='mpv --speed=0.96 --no-audio-pitch-correction'
+# This does the same in reverse, just to hear what PAL speed sounds like.
+# 25/24=~1.0416
+alias nonpal='mpv --speed=1.0416 --no-audio-pitch-correction'
+# Source: https://github.com/mpv-player/mpv/issues/7792
+#
+# This converts a non-4:3 video into 4:3.
+alias mpv43="mpv --video-aspect-override=4:3"
+# And a non-16:9 video into 16:9.
+alias mpv169="mpv --video-aspect-override=16:9"
+#
+# And the rest of the aliases, combining the functions together.
+alias mpal43="mpal --video-aspect-override=4:3"
+alias mpal169="mpal --video-aspect-override=16:9"
+alias nonpal43="nonpal --video-aspect-override=4:3"
+alias nonpal169="nonpal --video-aspect-override=16:9"
+
+# dfgit for dotfiles
+alias dfgit='git --git-dir=$HOME/.dfgit --work-tree=$HOME'
+alias edfgit='git --git-dir=$HOME/.edfgit --work-tree=$HOME'
+
+# some aliases
+alias ffrec="ffmpeg -f alsa -i default"
+alias ffmic="ffplay -f alsa -i default"
+
+# terminal rickroll
+alias rick='csl https://raw.githubusercontent.com/keroserene/rickrollrc/master/roll.sh | bash'