diff --git a/Taskfile.home.yml b/Taskfile.home.yml index 9a676f8..898ded3 100644 --- a/Taskfile.home.yml +++ b/Taskfile.home.yml @@ -62,10 +62,10 @@ tasks: - git commit -m "{{.COMMIT_TITLE}}" - git push origin HEAD:refs/heads/{{.BRANCH_NAME}} - sleep 1 - - gh pr create -t "{{.COMMIT_TITLE}}" -F "{{.PR_BODY_FILE}}" -H "{{.BRANCH_NAME}}" -B "main" + - gh pr create -t "{{.COMMIT_TITLE}}" -F "{{.PR_BODY_FILE}}" -H "{{.BRANCH_NAME}}" -B "main" | tee -a /tmp/{{date "2006-01-02" now}}.log - sleep 1 - gh pr merge "{{.BRANCH_NAME}}" --auto -s - - git show + - git --no-pager show dir: "{{.USER_WORKING_DIR}}" up:gr: @@ -128,6 +128,8 @@ tasks: ignore_error: true - cmd: sed -i -E 's/^([[:space:]]*)\[rules(\.|\])/\1[lint.rules\2/' .config/ryl.toml ignore_error: true + - cmd: sed -i 's/^\[\[per-line-ignores\]\]$/[[lint.per-line-ignores]]/' .config/ryl.toml + ignore_error: true - cmd: sed -i -E 's/^([[:space:]]*)ignore([[:space:]]*=)/\1exclude\2/' .config/ryl.toml ignore_error: true dir: "{{.USER_WORKING_DIR}}" diff --git a/bash/bashrc b/bash/bashrc index 568d664..3b54cc6 100644 --- a/bash/bashrc +++ b/bash/bashrc @@ -66,11 +66,11 @@ unset color_prompt force_color_prompt export XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-$HOME/.config} # 2026-09-06 use uchi -[[ -f "$XDG_CONFIG_HOME/uchi/env" ]] && source "$XDG_CONFIG_HOME/uchi/env" -[[ -f "$XDG_CONFIG_HOME/uchi/rc" ]] && source "$XDG_CONFIG_HOME/uchi/rc" -[[ -f "$XDG_CONFIG_HOME/uchi/profile" ]] && source "$XDG_CONFIG_HOME/uchi/profile" -[[ -f "$XDG_CONFIG_HOME/uchi/alias" ]] && source "$XDG_CONFIG_HOME/uchi/alias" -[[ -f "$XDG_CONFIG_HOME/uchi/functions" ]] && source "$XDG_CONFIG_HOME/uchi/functions" +[[ -f "$XDG_CONFIG_HOME/uchi/env" ]] && source "$XDG_CONFIG_HOME/uchi/env" +[[ -f "$XDG_CONFIG_HOME/uchi/rc" ]] && source "$XDG_CONFIG_HOME/uchi/rc" +[[ -f "$XDG_CONFIG_HOME/uchi/profile" ]] && source "$XDG_CONFIG_HOME/uchi/profile" +[[ -f "$XDG_CONFIG_HOME/uchi/alias" ]] && source "$XDG_CONFIG_HOME/uchi/alias" +[[ -f "$XDG_CONFIG_HOME/uchi/function" ]] && source "$XDG_CONFIG_HOME/uchi/function" # キャッシュ先の実体がなくなったら自動で再検索できるようにする # 要は ~/.local/bin から削除したら brew や aqua などを自動で見てくれる