From f68725a198f6901f48f2353a6fad28aea1f200d7 Mon Sep 17 00:00:00 2001 From: Spotlight Date: Fri, 6 Jun 2025 13:15:20 -0500 Subject: [PATCH 1/2] Upgrade iTerm2 shell integration --- flake.lock | 12 ++++++------ home/prompt.nix | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index e03aa50..78f8b53 100644 --- a/flake.lock +++ b/flake.lock @@ -92,11 +92,11 @@ ] }, "locked": { - "lastModified": 1749178927, - "narHash": "sha256-bXcEx1aZUNm5hMLVJeuofcOrZyOiapzvQ7K36HYK3YQ=", + "lastModified": 1749221014, + "narHash": "sha256-mqrpuP/lfyDmta5hJWTwWgdF5lwdiubcGs7oRvcTZ2s=", "owner": "nix-community", "repo": "home-manager", - "rev": "91287a0e9d42570754487b7e38c6697e15a9aab2", + "rev": "96482a538e6103579d254b139759d0536177370b", "type": "github" }, "original": { @@ -127,11 +127,11 @@ ] }, "locked": { - "lastModified": 1749012745, - "narHash": "sha256-Cax/k9ZRPKqTz18vZtmqGR45pHRXM+sDvEVd4V/3NrU=", + "lastModified": 1749194393, + "narHash": "sha256-vt6hM9DNywnXXuW1qPDLzECmbDcmxhh58wpb0EEQjAo=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "fa6120c32f10bd2aac9e8c9a6e71528a9d9d823b", + "rev": "19346808c445f23b08652971be198b9df6c33edc", "type": "github" }, "original": { diff --git a/home/prompt.nix b/home/prompt.nix index 23ea1ad..75f23b6 100644 --- a/home/prompt.nix +++ b/home/prompt.nix @@ -6,8 +6,8 @@ let iterm2_shell_integration = pkgs.fetchFromGitHub { owner = "gnachman"; repo = "iTerm2-shell-integration"; - rev = "7f871233e6b83f91c1dd1ea0f18432bc1edd680c"; - hash = "sha256-yIMm3iYyolQfjMzJ36AIwl/X/xKzRc5sFDO2RxHSrbM="; + rev = "f8ef4c73f85ce68b081929f55ca9aeec983713d0"; + hash = "sha256-9tZlqvKQzg8+7R7v/pMvD84koceOtAIF2xG3sQzDc8c="; }; in { From 24336ecdf6780591f99e2717a964ec9d4560af2a Mon Sep 17 00:00:00 2001 From: Spotlight Date: Fri, 6 Jun 2025 13:22:36 -0500 Subject: [PATCH 2/2] Disable zsh shell built-in `log` This is primarily useful on Darwin, where the system logging client is also named `log`. --- home/prompt.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/prompt.nix b/home/prompt.nix index 75f23b6..69af28d 100644 --- a/home/prompt.nix +++ b/home/prompt.nix @@ -73,6 +73,10 @@ in # History search, but from beginning bindkey "^[[A" history-beginning-search-backward bindkey "^[[B" history-beginning-search-forward + + # Prefer /usr/bin/log over the zsh shell built-in. + # This is primarily for Darwin usage. + disable log ''; };