diff options
| -rwxr-xr-x | dots.py | 2 | ||||
| -rw-r--r-- | git/.gitconfig.j2 (renamed from git/.gitconfig) | 4 | ||||
| -rw-r--r-- | zed/.config/zed/settings.json.j2 (renamed from zed/.config/zed/settings.json) | 2 | ||||
| -rwxr-xr-x | zsh/.config/zsh/osx/work.zsh | 6 | ||||
| -rwxr-xr-x | zsh/.config/zsh/setup/git.zsh | 8 |
5 files changed, 6 insertions, 16 deletions
@@ -155,7 +155,7 @@ def stow_dotfiles(source_dir: Path, target_dir: Path, env: Environment, clean: b stow_cmd = ["-D"] if clean else ["--no-folding"] for pkg in packages: - env.logger.info(f"running stow for {pkg.name} ₰˜݆༿") + env.logger.info(f"running stow {stow_cmd} for {pkg.name} ₰˜݆༿") run_shell_command(["stow", "-d", source_dir, "-t", target_dir, *stow_cmd, pkg.name]) return True diff --git a/git/.gitconfig b/git/.gitconfig.j2 index 575b008..015ad96 100644 --- a/git/.gitconfig +++ b/git/.gitconfig.j2 @@ -1,5 +1,7 @@ [user] - signingkey = 7BB52F7036FA7C18 + signingkey = {{ pgp.signing }} + user = {{ user.name }} + email = {{ user.email }} [commit] gpgsign = true [core] diff --git a/zed/.config/zed/settings.json b/zed/.config/zed/settings.json.j2 index 69f987f..6a11650 100644 --- a/zed/.config/zed/settings.json +++ b/zed/.config/zed/settings.json.j2 @@ -114,6 +114,7 @@ }, // -- </extensions> -- +{% if features.work_mode %} // -- <amzn_ai> -- "language_models": { "bedrock": { @@ -275,4 +276,5 @@ "version": "2" } // -- </amzn_ai> -- +{% endif %} } diff --git a/zsh/.config/zsh/osx/work.zsh b/zsh/.config/zsh/osx/work.zsh index bb1163a..6fff676 100755 --- a/zsh/.config/zsh/osx/work.zsh +++ b/zsh/.config/zsh/osx/work.zsh @@ -3,12 +3,6 @@ #-- <amzn> -- export AWS_REGION=us-west-2 -# git authorship -export GIT_AUTHOR_NAME=Elizabeth Hunt -export GIT_AUTHOR_EMAIL=lizhunt@amazon.com -export GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME -export GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL - # finch export DOCKER_HOST=unix:///Applications/Finch/lima/data/finch/sock/finch.sock diff --git a/zsh/.config/zsh/setup/git.zsh b/zsh/.config/zsh/setup/git.zsh deleted file mode 100755 index e88cafc..0000000 --- a/zsh/.config/zsh/setup/git.zsh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/zsh - -#-- <git> -- -export GIT_AUTHOR_NAME=Elizabeth Alexander Hunt -export GIT_AUTHOR_EMAIL=me@liz.coffee -export GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME -export GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL -#-- </git> -- |