From c9abc619cfccb3758358328772b47b1311ac11db Mon Sep 17 00:00:00 2001
From: Petr Nyc <jet.jetpac@gmail.com>
Date: Mon, 20 Feb 2023 15:39:17 +0100
Subject: [PATCH] iterm/tmux: shortcuts for moving between panes

---
 .gitconfig                                    | 12 ++++++++
 .zshenv                                       |  2 +-
 .../DynamicProfiles/dynamic_profile.json      | 30 +++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/.gitconfig b/.gitconfig
index 2e36af0..ad71a9e 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -12,9 +12,21 @@
 	ci   = commit
 	st   = status
 	sglog  = log --oneline --decorate --graph --all
+	lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset %Cblue<%an>%Creset' --abbrev-commit --date=relative
 	co     = checkout
 	out    = log --branches --not --remotes
 	vimdiff = difftool -y -t vimdiff
+
+	# tricks from https://www.durdn.com/blog/2012/11/22/must-have-git-aliases-advanced-examples/
+
+	# show vimdiff of the commit, for all files in the commit
+	diffc = "!f() { git diff ${1}^1 ${1}; }; f"
+	vimdiffc = "!f() { git vimdiff ${1}^1 ${1}; }; f"
+
+	# show diff for file in the commit
+	diffcf = "!f() { git diff ${1}^1 ${1} -- $2; }; f"
+	vimdiffcf = "!f() { git vimdiff ${1}^1 ${1} -- $2; }; f"
+
 [user]
 	name = Petr Nyc
 	email = jet.jetpac@gmail.com
diff --git a/.zshenv b/.zshenv
index 0ec6bee..4e4e7ba 100644
--- a/.zshenv
+++ b/.zshenv
@@ -2,7 +2,7 @@ set -o vi
 
 export LC_ALL=en_US.UTF-8
 
-export PATH=/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Users/jetpac/work/flutter/bin:$HOME/.rd/bin
+export PATH=/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Users/jetpac/work/flutter/bin:$HOME/.rd/bin:$HOME/bin
 
 alias oe='open /Applications/Emacs.app'
 alias config='/usr/bin/git --git-dir=$HOME/.cfg/.git/ --work-tree=$HOME'
diff --git a/Library/Application Support/iTerm2/DynamicProfiles/dynamic_profile.json b/Library/Application Support/iTerm2/DynamicProfiles/dynamic_profile.json
index a2861bb..d7d9363 100644
--- a/Library/Application Support/iTerm2/DynamicProfiles/dynamic_profile.json	
+++ b/Library/Application Support/iTerm2/DynamicProfiles/dynamic_profile.json	
@@ -65,6 +65,36 @@
                  "Text" : "01 6e",
                  "Version" : 1
               },
+              "0x68-0x180000-0x4" : {
+                 "Action" : 11,
+                 "Label" : "",
+                 "Text" : "01 68",
+                 "Version" : 1
+              },
+              "0x6a-0x180000-0x26" : {
+                 "Action" : 11,
+                 "Label" : "",
+                 "Text" : "01 6a",
+                 "Version" : 1
+              },
+              "0x6b-0x180000-0x28" : {
+                 "Action" : 11,
+                 "Label" : "",
+                 "Text" : "01 6b",
+                 "Version" : 1
+              },
+              "0x6c-0x180000-0x25" : {
+                 "Action" : 11,
+                 "Label" : "",
+                 "Text" : "01 6c",
+                 "Version" : 1
+              },
+              "0x6e-0x80000-0x2d" : {
+                 "Action" : 11,
+                 "Label" : "",
+                 "Text" : "01 6e",
+                 "Version" : 1
+              },
               "0x70-0x80000-0x23" : {
                  "Action" : 11,
                  "Label" : "",