dotfiles.git

diff --git a/.config/sh/aliases b/.config/sh/aliases
index 669debf4cfbaaeb54ce63277115f8e93370dfd11..4da7666404ed7c3a72a0c83af50b60f5e6ad6759 100644
--- a/.config/sh/aliases
+++ b/.config/sh/aliases
@@ -13,13 +13,12 @@ alias ag="ag -U"
 alias sshp='ssh -o PasswordAuthentication=yes -o PreferredAuthentications=keyboard-interactive,password -o PubkeyAuthentication=no'
 
 # doas
-alias connmanctl="doas connmanctl"
-alias laptop_mode="doas laptop_mode"
-alias rfkill="doas rfkill"
+alias connmanctl="doas /usr/bin/connmanctl"
+alias rfkill="doas /usr/sbin/rfkill"
 
 # alternatives
 alias make="echo 'using bmake…'; bmake -j 8 -B"
-alias Make="/usr/bin/make -j 8"
+alias gmake="/usr/bin/make -j 8"
 
 # boxxy
 #alias gramps="boxxy -l none gramps"




diff --git a/.config/sh/functions b/.config/sh/functions
index 7da492ddf2ebbb5b92411a914ded42882c735fe2..a21bef3d72c12eae7c2382c1c8f8b763e597a5ef 100644
--- a/.config/sh/functions
+++ b/.config/sh/functions
@@ -1,5 +1,28 @@
 #!/bin/sh
 
+apk_leaf() {
+	# printf "Packages that can be dropped: \n\n"
+
+	# while read -r package; do
+	# 	deps="$(
+	# 		/sbin/apk info -r "$package" | grep . | tail -n+2 \
+	# 			| sed -e 's/-\([^-]\)*-r\(.\)*$//' -e 's/^/	/'
+	# 	)"
+	# 	if printf "%s" "$deps" | grep -q .; then
+	# 		echo "$package"
+	# 		echo "$deps"
+	# 	fi
+	# done < /etc/apk/world
+
+	printf "\nPackages that no one want: \n\n"
+
+	while read -r package; do
+		if /sbin/apk info -r "$package" | wc -l | grep -q 2; then
+			echo "$package"
+		fi
+	done < /etc/apk/world
+}
+
 # PS1>
 abbreviate_aliases() {
 	# alias must not end with / ; must be sorted like exceptions—more specific (longer) first
@@ -220,8 +243,10 @@ 	"
 
 }
 
-beginswith() { case $2 in "$1"*) true;; *) false;; esac; }
-endswith() { case $2 in *"$1") true;; *) false;; esac; }
+beginswith() { case $2 in
+	"$1"*) true;; *) false;; esac; }
+endswith() { case $2 in
+	*"$1") true;; *) false;; esac; }
 
 screenshot() {
 	slurp | grim -g - - | cwebp -lossless -o "$HOME/Pictures/screen_$(date +%Y-%m-%dT%H:%M:%S).webp" -- -




diff --git a/.config/sway/config b/.config/sway/config
index b39f55c9a4a30f7310cd80b6b30c17295348cfe8..1f028a1a0df9c71608bdd512aa4ab13a944f8925 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -1,6 +1,6 @@
 set $mod Mod4
 
-# xwayland disable
+xwayland disable
 
 input "2:14:ETPS/2_Elantech_Touchpad" {
     tap enabled




diff --git a/.local/bin/bar_network b/.local/bin/bar_network
index 10b337b98301a5fea1203f5224f544427358de99..e197ad2120614770145e2c8daedbf4388af7c0bf 100755
--- a/.local/bin/bar_network
+++ b/.local/bin/bar_network
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 render () {
-	services=$(connmanctl services)
+	services=$(doas connmanctl services)
 	if echo "$services" | grep -E '(O|R) ' > /dev/null
 	then
 		printf "<span color='#1c9867'>█</span>"
@@ -13,7 +13,7 @@ 	then
 		printf "<span color='#1c9867'>▒</span>"
 	fi
 
-	if [ "$(connmanctl technologies | grep -A1 wif | grep Powered | cut -d '=' -f 2 | tr -d ' ')" = 'True' ]
+	if [ "$(doas connmanctl technologies | grep -A1 wif | grep Powered | cut -d '=' -f 2 | tr -d ' ')" = 'True' ]
 	then
 		printf "<span color='#1c9867'>░</span>"
 	fi




diff --git a/.local/bin/mntblk b/.local/bin/mntblk
index 1fe75076a9262507e6d6a104b128d81111a7ae0e..7f7f1f8bb8744579786131926e41770ca99a8b1b 100755
--- a/.local/bin/mntblk
+++ b/.local/bin/mntblk
@@ -48,8 +48,8 @@ fi
 
 udisksctl "$action" -b "$path"
 
-if [ "$action" = 'unmount' ] && ! [ "$1" = '-s' ] && ! echo "$disk" | grep -q 'mmcblk'
+if [ "$action" = 'unmount' ] && ! [ "$1" = '-s' ]
 then
-	echo "Powering off $path"
-	udisksctl power-off -b "$path"
+	echo "Ejecting $path"
+	doas eject "$path"
 fi




diff --git a/.local/bin/network_backup b/.local/bin/network_backup
index d5892752d6fad87f874852843a55733d14dff6ca..9ca949ef9bffc1a198b7a1b700d19af45992f77f 100755
--- a/.local/bin/network_backup
+++ b/.local/bin/network_backup
@@ -50,6 +50,7 @@     shouldBackupNow && (
       notify-send -i backup 'Running daily backup'
       backup daily
       notify-send -i backup 'Finished daily backup'
+      date '+%s' >~/.cache/lastBackup
     )
   fi
 done




diff --git a/.local/bin/workspace b/.local/bin/workspace
index ee66a3c6f68f81d5d6c6eeabdac9d9dca634e768..3a411a8df33035739534433d66e98be3afc16c18 100755
--- a/.local/bin/workspace
+++ b/.local/bin/workspace
@@ -8,8 +8,7 @@ else
 	wallpaper="$HOME/Pictures/wallpapers/$(hostname).webp"
 fi
 
-swayPID=$(pgrep swaybg)
+killall swaybg
 swaybg -i "$wallpaper" -m fill >/dev/null 2>&1 &
-nanosleep 100000000
-kill "$swayPID"
+#nanosleep 100000000
 swaymsg workspace "$1"