Merge branch 'master' into debian

improved automatic updates via executeAndNotify to enable fire-and-forget

distributeHome.sh

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-shopt -s dotglob
-cp -lrf ./home_external/* $HOME/

distributeRoot.sh

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-shopt -s dotglob
-sudo cp -lrf ./root_external/* /

home_external/.bash_aliases

@@ -5,25 +5,20 @@ if [ "$TERM" == 'xterm-kitty' ]; then
    alias diff='kitty +kitten diff'
 fi
 
-COMMON_RSYNC='--info=ALL --recursive --delay-updates --human-readable --links --hard-links --perms'
-export RSDEF="$COMMON_RSYNC --checksum"
-export RSBKP="$RSDEF --times --group --owner --delete"
-export RSMOV="$RSDEF --remove-source-files"
-export RSUPD="$COMMON_RSYNC --update --times"
-export RSCPY="$COMMON_RSYNC --ignore-times"
+DEFAULT_RSYNC='--info=ALL --recursive --delay-updates --human-readable --links --hard-links --perms'
 
 alias l='ls -l -v --all --human-readable --classify --group-directories-first' # -lvahF --group-directories-first
 alias lt=='l --time-style=long-iso'
 alias r='reset'
 alias ..='cd ..'
 alias refresh_bashrc='. ~/.bashrc' # alternatively: 'source ~/.bashrc'
-alias rsync_default="rsync $RSDEF"
+alias rsync_default="rsync $DEFAULT_RSYNC --checksum"
 # source /usr/share/bash-completion/completions/rsync
 # complete -F _rsync rsync_default
-alias rsync_backup="rsync $RSBKP"
-alias rsync_move="rsync $RSMOV"
-alias rsync_update="rsync $RSUPD"
-alias rsync_copy="rsync $RSCPY"
+alias rsync_backup="rsync $DEFAULT_RSYNC --checksum --times --group --owner --delete"
+alias rsync_move="rsync $DEFAULT_RSYNC --checksum --remove-source-files"
+alias rsync_update="rsync $DEFAULT_RSYNC --update --times"
+alias rsync_copy="rsync $DEFAULT_RSYNC --ignore-times"
 alias copy_link='cp --no-dereference --recursive --preserve=all --link' # not --force to make it optional
 alias off='systemctl poweroff'
 alias nnn='nnn -dHrR'

home_external/.bash_aliases_branched

@@ -4,13 +4,18 @@
 updatePackages() {
    noconfirm=
    if [[ $1 == "-y" ]]; then
-      noconfirm="--no-confirm";
+      noconfirm="--assume-yes"
    fi
-   executeAndNotify "doUpdatePackages $noconfirm" "packages updated" "package update failed";
+   full=
+   if [[ $2 == "--full" ]]; then
+      full="full-"
+   fi
+   executeAndNotify "doUpdatePackages $noconfirm $full" "system updated" "system update failed";
 }
 
 
 doUpdatePackages() {
-   pamac update $1;
-   pamac remove --orphans --cascade $1;
+   sudo apt update;
+   sudo apt ${2}upgrade $1;
+   sudo apt autoremove $1;
 }

home_external/.config/nano/nanorc

@@ -89,7 +89,7 @@ set linenumbers
 set matchbrackets "(<[{)>]}"
 
 ## Suppress title bar and show file name and editor state at the bottom.
-set minibar
+# set minibar
 
 ## Enable mouse support, if available for your system.  When enabled,
 ## mouse clicks can be used to place the cursor, set the mark (with a

home_external/.config/rofi/config.rasi

@@ -139,13 +139,13 @@ configuration {
 /*	me-select-entry: "MousePrimary";*/
 /*	me-accept-entry: "MouseDPrimary";*/
 /*	me-accept-custom: "Control+MouseDPrimary";*/
-  timeout {
+/*  timeout {
       action: "kb-cancel";
       delay:  0;
   }
   filebrowser {
       directories-first: true;
       sorting-method:    "name";
-  }
+  }*/
 }
 @theme "/usr/share/rofi/themes/Arc-Dark.rasi"

scripts/archive_and_compress.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 source=$1
 destinationPart=${1%/}; # cut off trailing "/"
-# tar cfv "$destinationPart.tar" "$source" && xz "$destinationPart.tar";
-tar c -I"xz -v" -vf "$destinationPart.tar.xz" "$source"
+# tar cfv $destinationPart.tar $source && xz $destinationPart.tar;
+tar c -I"xz -v" -vf $destinationPart.tar.xz $source

scripts/backup_edi.sh

@@ -32,7 +32,7 @@ backupRootDirectory /etc/docker/daemon.json $BACKUP_DIR_ROOT/docker/
 ### upload backup ###
 #####################
 
-if [[ "$1" == "--noupload" ]]; then
+if [[ $# > 0 && "$1" == "--noupload" ]]; then
    exit 0;
 fi
 

scripts/decompress_and_unarchive.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 source=$1;
 # archive=${source%.xz}; # cut off trailing ".xz"
-# unxz "$source" && tar xfv "$archive"
-tar x -I"unxz -v" -vf "$source"
+# unxz $source && tar xfv $archive
+tar x -I"unxz -v" -vf $source

scripts/dockerContainerAction.sh

@@ -16,7 +16,7 @@ upDownContainers() {
          continue;
       fi
       cd $subdir;
-      docker-compose $@;
+      docker compose $@;
    done
 }