Merge branch 'master' into debian

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

home_external/.bash_aliases

@@ -41,7 +41,7 @@ alias start_x11_vnc="x11vnc -many -display :0 -no6 -rfbport 5900 -auth /var/run/
 
 
 commandExists() {
-   type $1 2 >& 1 > /dev/null
+   type $1 2>&1 > /dev/null
 }
 
 
@@ -68,7 +68,7 @@ doUpdateSystem() {
 
 
 updateFlatpak() {
-   if [[ ! $(commandExists flatpak) ]]; then
+   if ! $(commandExists flatpak); then
       return 1;
    fi
    noconfirm=
@@ -127,7 +127,7 @@ finds () {
 
 # sends a desktop-notification with an icon signalling an error
 notifyError () {
-   if [[ ! $(commandExists notify-send) ]]; then
+   if ! $(commandExists notify-send); then
       echo "ERROR: $1";
    else
       notify-send "$1" --icon=data-warning;
@@ -137,7 +137,7 @@ notifyError () {
 
 # sends a desktop-notification with an icon signalling a simple information
 notifyInfo () {
-   if [[ ! $(commandExists notify-send) ]]; then
+   if ! $(commandExists notify-send); then
       echo "INFO: $1";
    else
       notify-send "$1" --icon=preferences-desktop-notification;

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;
+   sudo apt update;
-   pamac remove --orphans --cascade $1;
+   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/dockerContainerAction.sh

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