From d8614e1348e25d5e5f9f90dd4fa281705fac5552 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 31 Jul 2023 03:22:13 +0900 Subject: [PATCH 1/4] Prefer command style for core feature --- Makefile.toml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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] From 8113f5b2e1fbf74cc57bb6a165ae1a2862b7ac71 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 31 Jul 2023 03:24:51 +0900 Subject: [PATCH 2/4] Reuse same value in zj alias func --- home/.local/share/homemade/bin/zj.bash | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/home/.local/share/homemade/bin/zj.bash b/home/.local/share/homemade/bin/zj.bash index 83f818a6..80e723a9 100755 --- a/home/.local/share/homemade/bin/zj.bash +++ b/home/.local/share/homemade/bin/zj.bash @@ -1,3 +1,5 @@ #!/usr/bin/env bash -zellij attach "$(basename "$PWD")" || zellij --session "$(basename "$PWD")" +name="$(basename "$PWD")" + +zellij attach "$name" || zellij --session "$name" From 7ed677731852edf108a53f6179b02d3e0c54bbc4 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 31 Jul 2023 03:27:13 +0900 Subject: [PATCH 3/4] Restrict bash tools with setopt Intentionally add CLI with -x --- home/.local/share/homemade/bin/bench_shells.bash | 2 ++ home/.local/share/homemade/bin/la.bash | 2 ++ home/.local/share/homemade/bin/updeps.bash | 2 ++ home/.local/share/homemade/bin/zj.bash | 2 ++ 4 files changed, 8 insertions(+) diff --git a/home/.local/share/homemade/bin/bench_shells.bash b/home/.local/share/homemade/bin/bench_shells.bash index a7b72270..f6e7949f 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 -euxo 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..98bffb91 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 -euxo 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..a56a21bb 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 -euxo 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 80e723a9..720061f1 100755 --- a/home/.local/share/homemade/bin/zj.bash +++ b/home/.local/share/homemade/bin/zj.bash @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -euxo pipefail + name="$(basename "$PWD")" zellij attach "$name" || zellij --session "$name" From a390dfb05cdb3cbd761efdc070bade48f17f08bd Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 31 Jul 2023 03:28:25 +0900 Subject: [PATCH 4/4] Remove x again, it looks noisy --- home/.local/share/homemade/bin/bench_shells.bash | 2 +- home/.local/share/homemade/bin/la.bash | 2 +- home/.local/share/homemade/bin/updeps.bash | 2 +- home/.local/share/homemade/bin/zj.bash | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/home/.local/share/homemade/bin/bench_shells.bash b/home/.local/share/homemade/bin/bench_shells.bash index f6e7949f..b78549a4 100755 --- a/home/.local/share/homemade/bin/bench_shells.bash +++ b/home/.local/share/homemade/bin/bench_shells.bash @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -euxo pipefail +set -euo pipefail # ~ my feeling ~ # 50ms : blazing fast! diff --git a/home/.local/share/homemade/bin/la.bash b/home/.local/share/homemade/bin/la.bash index 98bffb91..47cd81fa 100755 --- a/home/.local/share/homemade/bin/la.bash +++ b/home/.local/share/homemade/bin/la.bash @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -euxo pipefail +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 a56a21bb..8b7e3788 100755 --- a/home/.local/share/homemade/bin/updeps.bash +++ b/home/.local/share/homemade/bin/updeps.bash @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -euxo pipefail +set -euo pipefail case ${OSTYPE} in linux*) diff --git a/home/.local/share/homemade/bin/zj.bash b/home/.local/share/homemade/bin/zj.bash index 720061f1..3d7f8f68 100755 --- a/home/.local/share/homemade/bin/zj.bash +++ b/home/.local/share/homemade/bin/zj.bash @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -euxo pipefail +set -euo pipefail name="$(basename "$PWD")"