replace 'syncthing' with 'immich'

scripts/hdparm/hdparm.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env zsh
+
+# author:	Daniel Sommer <daniel.sommer@velvettear.de>
+# license:	MIT
+
+# exit on error
+set -e
+
+# check permissions
+[[ "$EUID" != 0 ]] && printf "error: permission denied!\n" >&2 && exit 1
+
+# check if script exists
+script="$(dirname $(realpath "$0"))/$(hostname).sh"
+[[ ! -x "$script" ]] && printf "error: script '"$script"' does not exist or is not executable!\n" >&2 && exit 1
+
+# execute script
+printf ">> executing script '"$script"'...\n"
+. "$script"

scripts/hdparm/j5040.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env zsh
+
+# author:	Daniel Sommer <daniel.sommer@velvettear.de>
+# license:	MIT
+
+hdparm -S 1 -y /dev/sdc
+hdparm -S 1 -y /dev/sdd

scripts/merge.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env zsh
+
+# author:	Daniel Sommer <daniel.sommer@velvettear.de>
+# license:	MIT
+
+# merge files from two folders and cleanup the source
+
+# get and check variables
+[[ -z "$1" ]] && printf "error: no source directory specified!\n" >&2 && exit 1
+[[ -z "$2" ]] && printf "error: no destination directory specified!\n" >&2 && exit 1
+source="$(realpath $1)"
+destination="$(realpath $2)"
+
+[[ ! -d "$source" ]] && printf "error: source '"$source"' is not a valid or existing directory!\n" >&2 && exit 1
+[[ ! -d "$destination" ]] && printf "error: destination '"$destination"' is not a valid or existing directory!\n" >&2 && exit 1
+
+printf ">> merging directory '"$source"' into '"$destination"' with rsync...\n"
+
+rsync -avh --remove-source-files --progress "$source/" "$destination"
+find "$source" -mindepth 1 -type d -empty -delete
+
+printf ">> merge finished after "$SECONDS" seconds!\n"

scripts/notify.sh

@@ -55,4 +55,4 @@ echo "pw: $password"
 echo "url: $url"
 echo "args: ${args[@]}"
 
-curl -u $user:$password "${args[@]}" $url
+curl -s -u $user:$password "${args[@]}" $url

scripts/powertop/j5040.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env zsh
+
+# author:	Daniel Sommer <daniel.sommer@velvettear.de>
+# license:	MIT
+
+echo '0' > '/proc/sys/kernel/nmi_watchdog'; 
+echo '1500' > '/proc/sys/vm/dirty_writeback_centisecs'; 
+echo 'disabled' > '/sys/bus/usb/devices/2-3/power/wakeup';
+echo 'disabled' > '/sys/bus/usb/devices/2-4/power/wakeup';

scripts/powertop/n100.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env zsh
+
+# author:	Daniel Sommer <daniel.sommer@velvettear.de>
+# license:	MIT
+
+echo '0' > '/proc/sys/kernel/nmi_watchdog'; 
+echo '1500' > '/proc/sys/vm/dirty_writeback_centisecs'; 
+echo 'auto' > '/sys/bus/usb/devices/3-7.3/power/control'; 

scripts/powertop/powertop.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env zsh
+
+# author:	Daniel Sommer <daniel.sommer@velvettear.de>
+# license:	MIT
+
+# exit on error
+set -e
+
+# check permissions
+[[ "$EUID" != 0 ]] && printf "error: permission denied!\n" >&2 && exit 1
+
+# check if script exists
+script="$(dirname $(realpath "$0"))/$(hostname).sh"
+[[ ! -x "$script" ]] && printf "error: script '"$script"' does not exist or is not executable!\n" >&2 && exit 1
+
+# execute script
+printf ">> executing script '"$script"'...\n"
+. "$script"

scripts/restic/backup.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env zsh
+
+# author:	Daniel Sommer <daniel.sommer@velvettear.de>
+# license:	MIT
+
+# check if we're running in a subshell, forbid direct execution
+[[ "$ZSH_EVAL_CONTEXT" == "toplevel" ]] && printf "error: direct execution of this script is forbidden!\n" >&2 && exit 1
+
+# get the "home" directory
+home="$(dirname $(realpath "$0"))"
+
+# check if .env file exists and source it
+env="$home/$(hostname).env"
+[[ ! -r "$env" ]] && printf "error: config file '"$env"' does not exist!\n" >&2 && exit 1
+source "$env"
+		
+# check if backup directories are defined
+[[ -z "$RESTIC_DIRECTORIES" ]] && printf "error: config file '"$env"' does not define any backup directories!\n" >&2 && exit 1
+
+printf ">> starting restic backup to repository '"$RESTIC_REPOSITORY"'...\n"
+
+# execute "pre" action if defined
+[[ -n "$RESTIC_BACKUP_PRE" ]] && eval "$RESTIC_BACKUP_PRE"
+
+for directory in ${RESTIC_DIRECTORIES[@]}; do
+	seconds="$SECONDS"
+	printf "\n> backing up '"$directory"'...\n"
+	sudo --preserve-env -u "$RESTIC_USER" restic backup --verbose --no-scan --retry-lock 3h "$directory"
+	printf "> backup of '"$directory"' finished after "$(( $SECONDS - $seconds ))" seconds!\n"
+done
+
+# execute "post" action if defined
+[[ -n "$RESTIC_BACKUP_POST" ]] && eval "$RESTIC_BACKUP_POST"
+
+printf "\n>> restic backup finished after "$SECONDS" seconds!\n"

scripts/restic/j5040.env

@@ -0,0 +1,15 @@
+#!/usr/bin/env zsh
+
+# author:	Daniel Sommer <daniel.sommer@velvettear.de>
+# license:	MIT
+
+# define title and icon for the notification
+export RESTIC_NTFY_TITLE="$(hostname)"
+export RESTIC_NTFY_ICON="green_circle"
+
+# define directories to backup
+export RESTIC_DIRECTORIES=(
+	"/etc"
+	"/root"
+	"/home/velvettear"
+)

scripts/restic/j5040.sh

@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-# author:	Daniel Sommer <daniel.sommer@velvettear.de>
-# license:	MIT
-
-[[ "$EUID" != 0 ]] && printf "error: permission denied!\n" >&2 && exit 1
-
-directories=(
-	"/etc"
-)
-
-printf ">> starting restic backup...\n"
-
-for directory in ${directories[@]}; do
-	seconds="$SECONDS"
-	printf "> backing up '"$directory"'...\n"
-	restic backup --verbose --no-scan --retry-lock 3h "$directory"
-	printf "> backup of '"$directory"' finished after "$(( $SECONDS - $seconds ))" seconds!\n"
-done
-
-printf ">> restic backup finished after "$SECONDS" seconds!\n"

scripts/restic/n100.env

@@ -0,0 +1,15 @@
+#!/usr/bin/env zsh
+
+# author:	Daniel Sommer <daniel.sommer@velvettear.de>
+# license:	MIT
+
+# define title and icon for the notification
+export RESTIC_NTFY_TITLE="$(hostname)"
+export RESTIC_NTFY_ICON="green_circle"
+
+# define directories to backup
+export RESTIC_DIRECTORIES=(
+	"/etc"
+	"/root"
+	"/home/velvettear"
+)

scripts/restic/n100.sh

@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-# author:	Daniel Sommer <daniel.sommer@velvettear.de>
-# license:	MIT
-
-[[ "$EUID" != 0 ]] && printf "error: permission denied!\n" >&2 && exit 1
-
-directories=(
-	"/etc"
-	"/mnt/storage/audiobooks"
-	"/mnt/storage/comics"
-	"/mnt/storage/documents"
-	"/mnt/storage/ebooks"
-	"/mnt/storage/images"
-	"/mnt/storage/music"
-	"/mnt/storage/software"
-	"/mnt/storage/syncthing"
-	"/mnt/storage/videos"
-)
-
-printf ">> starting restic backup...\n"
-
-for directory in ${directories[@]}; do
-	seconds="$SECONDS"
-	printf "\n> backing up '"$directory"'...\n"
-	restic backup --verbose --no-scan --retry-lock 3h "$directory"
-	printf "> backup of '"$directory"' finished after "$(( $SECONDS - $seconds ))" seconds!\n"
-done
-
-printf ">> restic backup finished after "$SECONDS" seconds!\n"

scripts/restic/prune.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env zsh
+
+# author:	Daniel Sommer <daniel.sommer@velvettear.de>
+# license:	MIT
+
+# check if we're running in a subshell, forbid direct execution
+[[ "$ZSH_EVAL_CONTEXT" == "toplevel" ]] && printf "error: direct execution of this script is forbidden!\n" >&2 && exit 1
+
+# define title and icon for the notification
+export RESTIC_NTFY_TITLE="prune"
+export RESTIC_NTFY_ICON="red_circle"
+
+printf ">> pruning repository '"$RESTIC_REPOSITORY"'...\n\n"
+
+# execute "pre" action if defined
+[[ -n "$RESTIC_PRUNE_PRE" ]] && eval "$RESTIC_PRUNE_PRE"
+
+sudo --preserve-env -u "$RESTIC_USER" restic forget --keep-daily 7 --keep-weekly 1 --keep-monthly 1 --prune --retry-lock 3h
+
+# execute "post" action if defined
+[[ -n "$RESTIC_PRUNE_POST" ]] && eval "$RESTIC_PRUNE_POST"
+
+printf "\n>> repository pruned after "$SECONDS" seconds!\n"

scripts/restic/restic.env

@@ -0,0 +1,35 @@
+#!/usr/bin/env zsh
+
+# author:	Daniel Sommer <daniel.sommer@velvettear.de>
+# license:	MIT
+
+# define user
+export RESTIC_USER="restic"
+
+# override default repository
+export RESTIC_REPOSITORY="/mnt/restic"
+
+# define pre and post backup actions
+export RESTIC_BACKUP_PRE="printf '\n> mounting remote storage...\n' && mount -t nfs -o vers=4,soft,noatime,nolock,retrans=1,timeo=10 192.168.100.1:/mnt/storage /mnt/n100"
+export RESTIC_BACKUP_POST="printf '\n> unmounting remote storage...\n' && umount /mnt/n100"
+
+# define pre and post prune actions
+export RESTIC_PRUNE_PRE=""
+export RESTIC_PRUNE_POST="printf '\n> fixing ownership of repository...\n' && chown -R restic:restic $RESTIC_REPOSITORY"
+
+# define title and icon for the notification
+export RESTIC_NTFY_TITLE="storage"
+export RESTIC_NTFY_ICON="yellow_circle"
+
+# define backup directories
+export RESTIC_DIRECTORIES=(
+	"/mnt/n100/audiobooks"
+	"/mnt/n100/comics"
+	"/mnt/n100/documents"
+	"/mnt/n100/ebooks"
+	"/mnt/n100/images"
+	"/mnt/n100/music"
+	"/mnt/n100/software"
+	"/mnt/n100/immich"
+	"/mnt/n100/videos"
+)

scripts/restic/restic.sh

@@ -1,32 +1,48 @@
-#!/usr/bin/env bash
+#!/usr/bin/env zsh
 
 # author:	Daniel Sommer <daniel.sommer@velvettear.de>
 # license:	MIT
 
 # exit on error
+set -e
 
 # check permissions
 [[ "$EUID" != 0 ]] && printf "error: permission denied!\n" >&2 && exit 1
 
+# check which action to execute
+[[ -n "$1" ]] && action="$1" || action="backup"
+
 # check if script exists
-script="$(dirname $(realpath "$0"))/$(hostname).sh"
+script="$(dirname $(realpath "$0"))/$action.sh"
 [[ ! -x "$script" ]] && printf "error: script '"$script"' does not exist or is not executable!\n" >&2 && exit 1
 
-# get hostname
-host="$(hostname)"
-[[ -z "$host" ]] && host="$HOST"
+# get the "home" directory
+home="$(dirname $(realpath "$0"))"
 
 # setup restic
+export RESTIC_USER="$(whoami)"
 export RESTIC_REPOSITORY="rest:http://192.168.100.101:8000"
 export RESTIC_PASSWORD="\$Velvet90"
 export RESTIC_COMPRESSION="max"
 export RESTIC_CACHE_DIR="/var/cache/restic"
+export RESTIC_LOG="/var/log/restic-$action.log"
 
-# setup log file
-log="/var/log/restic-"$(hostname)".log"
+# check if .env file exists and source it
+env="$home/$(hostname).env"
+[[ -r "$env" ]] && source "$env"
+
+# set default values for the notification if undefined
+[[ -z "$RESTIC_NTFY_TITLE" ]] && RESTIC_NTFY_TITLE="$(hostname)"
+[[ -z "$RESTIC_NTFY_ICON" ]] && RESTIC_NTFY_ICON="white_circle"
+
+# execute "pre" action if defined
+[[ -n "$RESTIC_ACTION_PRE" ]] && eval "$RESTIC_ACTION_PRE"
 
 # source / execute restic script
-source "$script" 2>&1 | tee "$log"
+source "$script" > >(tee "$RESTIC_LOG") 2>&1
 
-# send a notification when finished
-/home/velvettear/.dots/scripts/notify.sh "backups" "$log" --title "$host" --icon "green_circle"
+# execute "post" action if defined
+[[ -n "$RESTIC_ACTION_POST" ]] && eval "$RESTIC_ACTION_POST"
+
+# send a notification
+/home/velvettear/.dots/scripts/notify.sh "restic" "$RESTIC_LOG" --title "$RESTIC_NTFY_TITLE" --icon "$RESTIC_NTFY_ICON" > /dev/null

scripts/update.sh

@@ -42,11 +42,10 @@ printf ""$font_colored"> removing orphaned packages..."$font_default"\n"
 printf ""$font_colored"> removing \"no valid subscription\" message..."$font_default"\n"
 sed -i.bak "s/data.status.* !== 'ACTIVE'/false/I" /usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js
 
+if [[ "$(which restic &> /dev/null)" ]]; then
 	printf ""$font_colored"> updating restic..."$font_default"\n"
 	restic self-update
-
-#printf ""$font_colored"> installing dark theme..."$font_default"\n"
-#bash <(curl -s https://raw.githubusercontent.com/Weilbyte/PVEDiscordDark/master/PVEDiscordDark.sh ) install
+fi
 
 printf ""$font_colored_bold">> system updated finished after "$SECONDS" seconds!"$font_default"\n"
 

systemd/cpupower@.service

@@ -0,0 +1,9 @@
+[Unit]
+Description=set cpu governor to %i
+
+[Service]
+Type=oneshot
+ExecStart=cpupower frequency-set -g %i
+
+[Install]
+WantedBy=multi-user.target

systemd/hdparm.service

@@ -0,0 +1,9 @@
+[Unit]
+Description=put various drives in standby mode and set their spin-down timer
+
+[Service]
+Type=oneshot
+ExecStart=/home/velvettear/.dots/scripts/hdparm/hdparm.sh
+
+[Install]
+WantedBy=multi-user.target

systemd/powertop.service

@@ -0,0 +1,9 @@
+[Unit]
+Description=enable various powersaving modes
+
+[Service]
+Type=oneshot
+ExecStart=/home/velvettear/.dots/scripts/powertop/powertop.sh
+
+[Install]
+WantedBy=multi-user.target

systemd/prepare-fs.service

@@ -5,7 +5,7 @@ Before=nginx.service
 
 [Service]
 Type=oneshot
-ExecStart=/etc/velvettear/scripts/prepare-fs.sh
+ExecStart=/home/velvettear/.dots/scripts/prepare-fs.sh
 
 [Install]
 WantedBy=multi-user.target

systemd/restic/restic.service

@@ -4,7 +4,6 @@ Description=restic backup
 [Service]
 Type=oneshot
 ExecStart=/home/velvettear/.dots/scripts/restic/restic.sh
-ExecStartPost=/home/velvettear/.dots/scripts/notify.sh "backups" "/var/log/restic-%i.log" --title "%i" --icon "green_circle"
 
 [Install]
 WantedBy=multi-user.target

zsh/zprofile

@@ -69,3 +69,4 @@ alias vim="nvim"
 
 # scripts
 alias update="sudo $VELVETTEAR_DOTS/scripts/update.sh"
+alias merge="$VELVETTEAR_DOTS/scripts/merge.sh"

zsh/zshrc

@@ -3,6 +3,8 @@
 # author:	Daniel Sommer <daniel.sommer@velvettear.de>
 # license:	MIT
 
+# share zsh history
+setopt SHARE_HISTORY
+
 # exit if user is not root
 [[ "$EUID" != "0" ]] && return
-echo "LOGIN AS ROOT"