Merge branch 'master' into debian

This reverts commit 4c09537776.

home_external/.bash_aliases

@@ -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/.bashrc

@@ -2,7 +2,7 @@
 # see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
 # for examples
 
-set -o pipefail
+# set -o pipefail
 # set -u
 
 # If not running interactively, don't do anything

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"

home_external/.config/wezterm/.wezterm.lua

@@ -1,116 +0,0 @@
--- Pull in the wezterm API
-local wezterm = require 'wezterm'
-local act = wezterm.action
-local mux = wezterm.mux
-
--- This will hold the configuration.
-local config = wezterm.config_builder()
-
--- This is where you actually apply your config choices
-
--- For example, changing the color scheme:
-config.color_scheme = 'AdventureTime'
--- config.font = wezterm.font 'JetBrains Mono' -- also the default
-config.font = wezterm.font 'Fira Code'
-config.font_size = 12.0 -- also the default
-
--- Spawn a git bash shell
-config.default_prog = { 'C:/Program Files/Git/bin/bash.exe' , '--cd-to-home' }
-
--- cursor shape and behaviour
-config.default_cursor_style = 'BlinkingBar'
-config.animation_fps = 1
-config.cursor_blink_ease_in = 'Constant'
-config.cursor_blink_ease_out = 'Constant'
-
-config.enable_kitty_keyboard = true
-
--- window appearance
-config.enable_scroll_bar = true
-config.window_padding = {
-  left = 0,
-  right = 0,
-  top = 0,
-  bottom = 0,
-}
--- config.initial_rows = 50;
-
---[[wezterm.on('gui-startup', function(cmd)
-  local tab, pane, window = mux.spawn_window(cmd or {})
-  -- Create a split occupying the right 1/3 of the screen
-  local loading_bar_pane = pane:split {
-     direction = 'Bottom',
-     size = 0.06,
-  }
-  -- go to JavaUtils-Directory and prepare command
-  loading_bar_pane:send_text 'cd JavaUtils/zeitlaeufer/target\njava de.szimnau.WorkLoadingBar'
-  -- optionally: clear before preparing command
-  -- loading_bar_pane:send_text 'cd JavaUtils/zeitlaeufer/target\nc\njava de.szimnau.WorkLoadingBar'
-end)]]
-
-config.keys = {
-  -- This will create a new horizontal split and run your default program inside it
-  {
-    key = 'E',
-    mods = 'CTRL|SHIFT',
-    action = act.SplitHorizontal { domain = 'CurrentPaneDomain' },
-  },
-  -- This will create a new vertical split and run your default program inside it
-  {
-    key = 'O',
-    mods = 'CTRL|SHIFT',
-    action = act.SplitVertical { domain = 'CurrentPaneDomain' },
-  },
-  -- resize the current split
-  {
-    key = 'UpArrow',
-    mods = 'CTRL|SHIFT',
-    action = act.AdjustPaneSize { 'Up', 1 },
-  },
-  {
-    key = 'DownArrow',
-    mods = 'CTRL|SHIFT',
-    action = act.AdjustPaneSize { 'Down', 1 },
-  },
-  { 
-    key = 'LeftArrow',
-    mods = 'CTRL|SHIFT',
-    action = act.AdjustPaneSize { 'Left', 1 } 
-  },
-  {
-    key = 'RightArrow',
-    mods = 'CTRL|SHIFT',
-    action = act.AdjustPaneSize { 'Right', 1 },
-  },
-  -- move around the splits
-  {
-    key = 'UpArrow',
-    mods = 'ALT',
-    action = act.ActivatePaneDirection 'Up',
-  },
-  {
-    key = 'DownArrow',
-    mods = 'ALT',
-    action = act.ActivatePaneDirection 'Down',
-  },
-  {
-    key = 'LeftArrow',
-    mods = 'ALT',
-    action = act.ActivatePaneDirection 'Left',
-  },
-  {
-    key = 'RightArrow',
-    mods = 'ALT',
-    action = act.ActivatePaneDirection 'Right',
-  },
-  -- makes pane take up all available space in the tab, hiding all other panes
-  {
-    key = 'X',
-    mods = 'CTRL|SHIFT',
-    action = wezterm.action.TogglePaneZoomState,
-  },
-}
-
-
--- and finally, return the configuration to wezterm
-return config

scripts/backup_edi.sh

@@ -32,10 +32,10 @@ backupRootDirectory /etc/docker/daemon.json $BACKUP_DIR_ROOT/docker/
 ### upload backup ###
 #####################
 
-if [[ "$1" == "--noupload" ]]; then
+if [[ $# > 0 && "$1" == "--noupload" ]]; then
    exit 0;
 fi
 
-sd rsync_backup -e "ssh -i /home/edi/.ssh/id_ed25519" --filter="P /home/docker" /sync/backup/ fabian@garrus:/citadel/backup/edi/
+sd rsync_backup -e "ssh -i /home/edi/.ssh/id_ed25519" /sync/backup/ fabian@garrus:/citadel/backup/edi/
 sd rsync_backup -e "ssh -i /home/edi/.ssh/id_ed25519" /home/edi/docker/ fabian@garrus:/citadel/backup/edi/home/docker/
 echo "Note: remember to keep /citadel in sync!"

scripts/backup_shepard.sh

@@ -20,7 +20,7 @@ backupDirectory $HOME/.ssh/ $BACKUP_DIR_HOME/.ssh/
 ### upload backup ###
 #####################
 
-if [[ "$1" == "--noupload" ]]; then
+if [[ $# > 0 && "$1" == "--noupload" ]]; then
    exit 0;
 fi
 

scripts/dockerContainerAction.sh

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

scripts/downContainers.sh

@@ -4,4 +4,4 @@ set -euo pipefail
 source /sync/scripts/dockerContainerAction.sh
 
 # FIXME!!! implement possibility to pass down directory
-upDownContainers down
+upDownContainers down $@

scripts/escapeFilenames.sh

@@ -13,6 +13,7 @@ replacements['(']='_';
 replacements[')']='_';
 replacements['[']='_';
 replacements[']']='_';
+replacements[',']='_';
 while [[ $# > 0 ]]; do
    replacements["$1"]="$2";
    shift 2;

scripts/postTreatmentAudible.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+/sync/scripts/escapeFilenames.sh . _
+for d in *; do
+   cd "$d";
+   /sync/scripts/escapeFilenames.sh Chapter Kapitel
+   /sync/scripts/reencode_m4a.sh -map;
+   rm *.m4a;
+   mv * "../${d}_reencode";
+   cd ..;
+   rmdir "$d"
+   mv "${d}_reencode" "$d";
+done

scripts/pullContainers.sh

@@ -4,4 +4,4 @@ set -euo pipefail
 source /sync/scripts/dockerContainerAction.sh
 
 # FIXME!!! implement possibility to pass down directory
-upDownContainers pull
+upDownContainers pull $@

scripts/reencode_m4a.sh

@@ -6,15 +6,15 @@ map=
 vbr=
 while [[ $# > 0 ]]; do
    case $1 in
-      -map) map='-map 0:0';                          shift;;
+      -map) map='-map 0:a';                          shift;;
-      -vbr) vbr='aac_at -profile:a aac_he -b:a 64k'; shift;;
+      -vbr) vbr='aac -profile:a aac_he -b:a 64k';    shift;;
       *   )                                          break ;; # Anything else stops command line processing.
    esac
 done
 
 # if no variable bitrate, just copy audio
 if [[ -z $vbr ]]; then
-   map="$map copy"
+   vbr="copy"
 fi
 
 # ensure existence of destination folder

scripts/upContainers.sh

@@ -4,4 +4,4 @@ set -euo pipefail
 source /sync/scripts/dockerContainerAction.sh
 
 # FIXME!!! implement possibility to pass down directory
-upDownContainers up -d
+upDownContainers up -d $@