Update Gentoo

2 files changed, 23 insertions, 9 deletions

diff --git a/Gentoo/root/.bashrc b/Gentoo/root/.bashrc
index 4771ca7..0de11aa 100644
--- a/Gentoo/root/.bashrc
+++ b/Gentoo/root/.bashrc
@@ -9,22 +9,28 @@ export HISTCONTROL=ignorespace:erasedups
 shopt -s checkwinsize
 
 alias esync='/usr/bin/eix-sync'
+alias invoke='/root/.venvs/invoke/bin/invoke'
+alias cstart_archlinux='/root/.venvs/invoke/bin/invoke container-start --name=archlinux-container'
+alias cstop_archlinux='/root/.venvs/invoke/bin/invoke container-stop --name=archlinux-container'
+alias cstart_fedora='/root/.venvs/invoke/bin/invoke container-start --name=fedora-container'
+alias cstop_fedora='/root/.venvs/invoke/bin/invoke container-stop --name=fedora-container'
 
-export PASSPHRASE="foo"
+##export GPG_TTY=$(tty)
+##export PORTAGE_GPG_DIR="/root/.gnupg"
 
-alias fduplicity_regular='/usr/bin/duplicity full --name blackmore_regular_backup --include-filelist /mnt/edisk/Backups/duplicity/regular_backup.txt --exclude / --archive-dir /mnt/edisk/Backups/duplicity/archive --tempdir /mnt/edisk/Backups/duplicity/tmp --encrypt-sign-key DE0FFF2DD08D3B081361419A0072FA441022AD16 --log-file /var/log/duplicity.log --verbosity notice --volsize 500 / rsync://ssync@sagabox//mnt/cpool1/data/ssync/data/backups/Blackmore/'
-alias iduplicity_regular='/usr/bin/duplicity incremental --name blackmore_regular_backup --include-filelist /mnt/edisk/Backups/duplicity/regular_backup.txt --exclude / --archive-dir /mnt/edisk/Backups/duplicity/archive --tempdir /mnt/edisk/Backups/duplicity/tmp --encrypt-sign-key DE0FFF2DD08D3B081361419A0072FA441022AD16 --log-file /var/log/duplicity.log --verbosity notice --volsize 500 / rsync://ssync@sagabox//mnt/cpool1/data/ssync/data/backups/Blackmore/'
+alias fduplicity_regular='/usr/bin/duplicity full --name blackmore_regular_backup --exclude-filelist /mnt/edisk/Backups/duplicity/regular_backup_ex.txt --include-filelist /mnt/edisk/Backups/duplicity/regular_backup.txt --exclude / --archive-dir /mnt/edisk/Backups/duplicity/archive --tempdir /mnt/edisk/Backups/duplicity/tmp --encrypt-sign-key DE0FFF2DD08D3B081361419A0072FA441022AD16 --log-file /var/log/duplicity.log --verbosity notice --volsize 500 / rsync://ssync@sagabox//mnt/cpool1/data/ssync/data/backups/Blackmore/'
+alias iduplicity_regular='/usr/bin/duplicity incremental --name blackmore_regular_backup --exclude-filelist /mnt/edisk/Backups/duplicity/regular_backup_ex.txt --include-filelist /mnt/edisk/Backups/duplicity/regular_backup.txt --exclude / --archive-dir /mnt/edisk/Backups/duplicity/archive --tempdir /mnt/edisk/Backups/duplicity/tmp --encrypt-sign-key DE0FFF2DD08D3B081361419A0072FA441022AD16 --log-file /var/log/duplicity.log --verbosity notice --volsize 500 / rsync://ssync@sagabox//mnt/cpool1/data/ssync/data/backups/Blackmore/'
 
-alias fduplicity_remote='/usr/bin/duplicity full --name blackmore_remote_backup --include-filelist /mnt/edisk/Backups/duplicity/remote_backup.txt --exclude / --archive-dir /mnt/edisk/Backups/duplicity/archive --tempdir /mnt/edisk/Backups/duplicity/tmp --encrypt-sign-key DE0FFF2DD08D3B081361419A0072FA441022AD16 --log-file /var/log/duplicity.log --verbosity notice --volsize 500 / rsync://ssync@sagabox//mnt/cpool1/data/ssync/data/remote_backups/Blackmore/'
-alias iduplicity_remote='/usr/bin/duplicity incremental --name blackmore_remote_backup --include-filelist /mnt/edisk/Backups/duplicity/remote_backup.txt --exclude / --archive-dir /mnt/edisk/Backups/duplicity/archive --tempdir /mnt/edisk/Backups/duplicity/tmp --encrypt-sign-key DE0FFF2DD08D3B081361419A0072FA441022AD16 --log-file /var/log/duplicity.log --verbosity notice --volsize 500 / rsync://ssync@sagabox//mnt/cpool1/data/ssync/data/remote_backups/Blackmore/'
+alias fduplicity_remote='/usr/bin/duplicity full --name blackmore_remote_backup --exclude-filelist /mnt/edisk/Backups/duplicity/remote_backup_ex.txt --include-filelist /mnt/edisk/Backups/duplicity/remote_backup.txt --exclude / --archive-dir /mnt/edisk/Backups/duplicity/archive --tempdir /mnt/edisk/Backups/duplicity/tmp --encrypt-sign-key DE0FFF2DD08D3B081361419A0072FA441022AD16 --log-file /var/log/duplicity.log --verbosity notice --volsize 500 / rsync://ssync@sagabox//mnt/cpool1/data/ssync/data/remote_backups/Blackmore/'
+alias iduplicity_remote='/usr/bin/duplicity incremental --name blackmore_remote_backup --exclude-filelist /mnt/edisk/Backups/duplicity/remote_backup_ex.txt --include-filelist /mnt/edisk/Backups/duplicity/remote_backup.txt --exclude / --archive-dir /mnt/edisk/Backups/duplicity/archive --tempdir /mnt/edisk/Backups/duplicity/tmp --encrypt-sign-key DE0FFF2DD08D3B081361419A0072FA441022AD16 --log-file /var/log/duplicity.log --verbosity notice --volsize 500 / rsync://ssync@sagabox//mnt/cpool1/data/ssync/data/remote_backups/Blackmore/'
 
 alias dstatus='/usr/bin/duplicity collection-status --name blackmore_regular_backup --archive-dir /mnt/edisk/Backups/duplicity/archive --tempdir /mnt/edisk/Backups/duplicity/tmp --encrypt-sign-key DE0FFF2DD08D3B081361419A0072FA441022AD16 rsync://ssync@sagabox//mnt/cpool1/data/ssync/data/backups/Blackmore/'
 alias drstatus='/usr/bin/duplicity collection-status --name blackmore_remote_backup --archive-dir /mnt/edisk/Backups/duplicity/archive --tempdir /mnt/edisk/Backups/duplicity/tmp --encrypt-sign-key DE0FFF2DD08D3B081361419A0072FA441022AD16 rsync://ssync@sagabox//mnt/cpool1/data/ssync/data/remote_backups/Blackmore/'
 
-alias dremove='/usr/bin/duplicity remove-all-but-n-full 1 --name blackmore_regular_backup --archive-dir /mnt/edisk/Backups/duplicity/archive --tempdir /mnt/edisk/Backups/duplicity/tmp --encrypt-sign-key DE0FFF2DD08D3B081361419A0072FA441022AD16 rsync://ssync@sagabox//mnt/cpool1/data/ssync/data/backups/Blackmore/'
-alias drremove='/usr/bin/duplicity remove-all-but-n-full 1 --name blackmore_remote_backup --archive-dir /mnt/edisk/Backups/duplicity/archive --tempdir /mnt/edisk/Backups/duplicity/tmp --encrypt-sign-key DE0FFF2DD08D3B081361419A0072FA441022AD16 rsync://ssync@sagabox//mnt/cpool1/data/ssync/data/remote_backups/Blackmore/'
+alias dremove='/usr/bin/duplicity remove-all-but-n-full 2 --name blackmore_regular_backup --archive-dir /mnt/edisk/Backups/duplicity/archive --tempdir /mnt/edisk/Backups/duplicity/tmp --encrypt-sign-key DE0FFF2DD08D3B081361419A0072FA441022AD16 rsync://ssync@sagabox//mnt/cpool1/data/ssync/data/backups/Blackmore/'
+alias drremove='/usr/bin/duplicity remove-all-but-n-full 2 --name blackmore_remote_backup --archive-dir /mnt/edisk/Backups/duplicity/archive --tempdir /mnt/edisk/Backups/duplicity/tmp --encrypt-sign-key DE0FFF2DD08D3B081361419A0072FA441022AD16 rsync://ssync@sagabox//mnt/cpool1/data/ssync/data/remote_backups/Blackmore/'
 
-alias youtube-dl='/usr/bin/youtube-dl -f best -o "%(title)s.%(ext)s"'
+alias yt-dlp='/usr/bin/yt-dlp -f best -o "%(title)s.%(ext)s"'
 
 # Source global definitions
 ##if [ -f /etc/bashrc ]; then
diff --git a/Gentoo/user/.bashrc b/Gentoo/user/.bashrc
index d9e7c29..e2b4609 100644
--- a/Gentoo/user/.bashrc
+++ b/Gentoo/user/.bashrc
@@ -13,11 +13,16 @@ if [[ $- != *i* ]] ; then
 fi
 
 
+. /etc/profile.d/vte-2.91.sh
 source /home/sgs/.git-prompt.sh
 
 ##PS1="[\u@\[\033[0;32m\]\h\[\033[0;37m\] \w]\\$ "; export PS1
 export PS1='[\u@\[\033[00;32m\]\h\[\033[00m\] \w$(__git_ps1 " (%s)")]\\$ '
 
+if [ -n "$ETOOLKIT_PROMPT" ]; then
+export PS1="$ETOOLKIT_PROMPT$PS1"
+fi
+
 # check the window size after each command and, if necessary,
 # update the values of LINES and COLUMNS.
 ## shopt -s checkwinsize
@@ -37,6 +42,7 @@ alias youtube-dl='/usr/bin/youtube-dl -f best -o "%(title)s.%(ext)s"'
 
 ##alias lgdm='/usr/libexec/lightdm/gdmflexiserver -l'
 alias lgdm='/usr/bin/dm-tool switch-to-user videouser'
+alias tgdm='/usr/bin/dm-tool switch-to-user testuser'
 alias zgdm='/usr/bin/dm-tool switch-to-user zuzanna'
 alias aoslo='curl -4 wttr.in/Oslo'
 #####################
@@ -87,15 +93,17 @@ alias dclone='xrandr --output HDMI-1 --mode 2560x1440 --output DVI-D-1 --mode 25
 
 ## Programming ##
 export PYTHONPATH=~/.pythonpath
+##export PATH=~/.bin:$PATH
 alias eminicms='source /home/sgs/development/venvs/django_markwhat/bin/activate'
 alias ppsql='psql -h db.pichove.org'
 #################
 
 export FLASK_DEBUG=1
 export FLASK_ENV=development
+export FLASK_SKIP_DOTENV=1
 # export FLASK_APP=utils.py
 
 #export TERM=xterm-256color
 # export TERMCAP=
-alias invoke='/home/sgs/development/venvs/venvInvoke/bin/invoke'
+alias invoke='/home/sgs/development/venvs/invoke/bin/invoke'
 # cvlc -vvv alsa://hw:1,0 --sout '#transcode{vcodec=none,acodec=mpga,ab=128,channels=2,samplerate=44100,scodec=none}:rtp{dst=10.0.1.16,port=1234,sdp=rtsp://10.0.1.16:8001/test.sdp}'