diff --git a/Makefile.toml b/Makefile.toml
index 7d72903d..c1f37a12 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -61,8 +61,11 @@ args = [
 ]
 
 [tasks.apply]
-script = [
-  "home-manager switch -f ./home/.config/home-manager/home.nix",
+command = 'home-manager'
+args = [
+  'switch',
+  '-f',
+  './home/.config/home-manager/home.nix',
 ]
 
 [tasks.enable_login_shells]
diff --git a/home/.local/share/homemade/bin/bench_shells.bash b/home/.local/share/homemade/bin/bench_shells.bash
index a7b72270..b78549a4 100755
--- a/home/.local/share/homemade/bin/bench_shells.bash
+++ b/home/.local/share/homemade/bin/bench_shells.bash
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -euo pipefail
+
 # ~ my feeling ~
 # 50ms : blazing fast!
 # 120ms : acceptable
diff --git a/home/.local/share/homemade/bin/la.bash b/home/.local/share/homemade/bin/la.bash
index c5d5cc53..47cd81fa 100755
--- a/home/.local/share/homemade/bin/la.bash
+++ b/home/.local/share/homemade/bin/la.bash
@@ -1,3 +1,5 @@
 #!/usr/bin/env bash
 
+set -euo pipefail
+
 exa --long --all --group-directories-first "$@"
diff --git a/home/.local/share/homemade/bin/updeps.bash b/home/.local/share/homemade/bin/updeps.bash
index 5857a124..8b7e3788 100755
--- a/home/.local/share/homemade/bin/updeps.bash
+++ b/home/.local/share/homemade/bin/updeps.bash
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -euo pipefail
+
 case ${OSTYPE} in
 linux*)
 	sudo apt update --yes && sudo apt upgrade --yes
diff --git a/home/.local/share/homemade/bin/zj.bash b/home/.local/share/homemade/bin/zj.bash
index 83f818a6..3d7f8f68 100755
--- a/home/.local/share/homemade/bin/zj.bash
+++ b/home/.local/share/homemade/bin/zj.bash
@@ -1,3 +1,7 @@
 #!/usr/bin/env bash
 
-zellij attach "$(basename "$PWD")" || zellij --session "$(basename "$PWD")"
+set -euo pipefail
+
+name="$(basename "$PWD")"
+
+zellij attach "$name" || zellij --session "$name"