dotfiles.git

commit 9d3fdf313dc0bcc21481150564fa825a34494152

Author: Adam Evyčędo <git@apiote.xyz>

minor fixes

 .config/himitsu/config.ini | 2 +-
 .config/qalculate/qalc.cfg | 2 +-
 .config/sh/functions | 14 +++++++-------
 .config/sway/sway_startup.sh | 1 -


diff --git a/.config/himitsu/config.ini b/.config/himitsu/config.ini
index 728eab751900b5b0024f9d1b11f9aabab74a1250..3aa6583a29a7dc054219e7f2efd163495210769f 100644
--- a/.config/himitsu/config.ini
+++ b/.config/himitsu/config.ini
@@ -1,2 +1,2 @@
 [himitsud]
-prompter=hiprompt-gtk
\ No newline at end of file
+prompter=hiprompt-gtk




diff --git a/.config/qalculate/qalc.cfg b/.config/qalculate/qalc.cfg
index 375143a29441f8def94a5b961635844d380433a8..33fcbe35703b1fe3121d8a8f90cb2714b4dd1991 100644
--- a/.config/qalculate/qalc.cfg
+++ b/.config/qalculate/qalc.cfg
@@ -1,6 +1,6 @@
 
 [General]
-version=4.8.0
+version=4.8.1
 save_mode_on_exit=0
 save_definitions_on_exit=1
 clear_history_on_exit=0




diff --git a/.config/sh/functions b/.config/sh/functions
index 276fb1be7f0d6b28f1b63d08466ba1716d3fa4ba..2638522096bad06de4b11506c247c2a1e4b6f206 100644
--- a/.config/sh/functions
+++ b/.config/sh/functions
@@ -349,8 +349,7 @@
 				if [ -z "$cmd" ]; then
 					find /keybase/private/bquiet/backup/deepthought/ -type f -iname 'backup_*.tar' -mtime '+6' -exec rm {} \;
 
-					#shellcheck disable=SC2086
-					tar -cPlf "/keybase/private/bquiet/backup/deepthought/${name}.tar" backup $infraFiles $wwwFiles
+					eval "tar -cPlf /keybase/private/bquiet/backup/deepthought/${name}.tar backup $infraFiles $wwwFiles"
 				fi
 			;;
 		esac
@@ -468,7 +467,7 @@ 	fi
 }
 
 luakit() {
-	. ~/.config/sh/variables
+	. "$HOME/.config/sh/variables"
 
 	/usr/bin/luakit "$@"
 	cd ~/.local/share/luakit/ || exit 1
@@ -773,7 +772,7 @@ photosArchive() {
 	IFS=''
 
 	author="Adam Evyčędo <photos@apiote.xyz>"
-	copyright="CC-BY-SA"
+	copyright="CC BY-SA"
 
 	while [ $# -gt 0 ]
 	do
@@ -1171,7 +1170,7 @@ 				git checkout master
 				git reset --hard HEAD
 				git pull
 				# export PATH="$HOME/.go/bin/:$PATH"
-				./configure --with-pam
+				./configure --with-pam  # TODO with time
 				/usr/bin/make build
 				# doas cp ./doas /usr/local/bin/doas
 				# doas chmod 755 /usr/local/bin/doas
@@ -1196,7 +1195,7 @@
 drunk() {
 	waterInit
 
-	. ~/.config/sh/waterToken
+	. "$HOME/.config/sh/waterToken"
 
 	if [ "$1" = 'sync' ]; then
 		meID=$(sqlite3 "$HOME/.local/state/water/water.db" -noheader "select device_id from devices where device_type = 'me'" 2>/dev/null)
@@ -1261,7 +1260,7 @@ 		case "$1" in
 			glass) amount=100 ;;
 			cup) amount=250 ;;
 			Cup) amount=300 ;;
-			can) amount=300 ;;
+			can) amount=330 ;;
 			mug) amount=400 ;;
 			Mug) amount=500 ;;
 			bottle) amount=700 ;;
@@ -1342,6 +1341,7 @@   inkscape -w "$waterWidth" --export-filename=waterSign.png /media/nextcloud/me@cloud.apiote.xyz/Pictutes/IDs/logo/waterSign.svg
   waterHeight=$(ffprobe waterSign.png -show_entries stream=height -of csv=p=0 -v error -select_streams v:0)
   y=$(dc -e "$height 100 - $waterHeight - n")
   magick \( -page +0+0 "$1" \) \( -page "+100+$y" waterSign.png \) -flatten "$1.signed.jpg"
+	rm waterSign.png
 }
 
 autoBrightness() {




diff --git a/.config/sway/sway_startup.sh b/.config/sway/sway_startup.sh
index 1afee74b494bf6a6c380e7f8f900673445fa8ffd..e09190436ed6eb7ba7e886cad3fcc24ad85f666f 100755
--- a/.config/sway/sway_startup.sh
+++ b/.config/sway/sway_startup.sh
@@ -29,7 +29,6 @@ # swaymsg output HDMI-A-1 bg $(ls ~/Pictures/wallpapers/encrypt/ | sort -R | tail -1) fill
 
 pgrep mako || mako &
 
-# doas laptop_mode
 doas /usr/sbin/powertop --auto-tune
 
 swayidle -w \