Merge remote-tracking branch 'origin/master' into migrating-to-zinit

varp · Nov 5, 2024 · 539b141 · 539b141
2 parents 649c667 + 608fcf4
commit 539b141
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/dotfiles/shell/aliases b/dotfiles/shell/aliases
@@ -53,4 +53,4 @@ alias ssctl='sudo systemctl'
 
 ## Docker related aliases
 alias dk='docker'
-alias dkc='docker compose'
+alias dkc='docker-compose'
diff --git a/iterm/com.googlecode.iterm2.plist b/iterm/com.googlecode.iterm2.plist
@@ -2,10 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>AiMaxTokens</key>
-	<integer>128000</integer>
-	<key>AiModel</key>
-	<string>gpt-4o</string>
 	<key>AlternateMouseScroll</key>
 	<true/>
 	<key>BracketedPasteMode</key>
@@ -14,10 +10,18 @@
 	<false/>
 	<key>Default Bookmark Guid</key>
 	<string>452B50B6-88DB-4A21-862B-151E319F2089</string>
+	<key>DimBackgroundWindows</key>
+	<true/>
+	<key>DimOnlyText</key>
+	<false/>
+	<key>EnableProxyIcon</key>
+	<false/>
 	<key>EscapeShellCharsWithBackslash</key>
 	<false/>
 	<key>HapticFeedbackForEsc</key>
 	<false/>
+	<key>HideTab</key>
+	<true/>
 	<key>Hotkey</key>
 	<false/>
 	<key>HotkeyChar</key>
@@ -720,7 +724,7 @@
 			<key>Non-ASCII Anti Aliased</key>
 			<true/>
 			<key>Normal Font</key>
-			<string>JetBrainsMonoNLNFM-Regular 15</string>
+			<string>JetBrainsMonoNFM-Regular 15</string>
 			<key>Open Password Manager Automatically</key>
 			<true/>
 			<key>Option Key Sends</key>
@@ -773,10 +777,6 @@
 			<real>0.0</real>
 			<key>Triggers</key>
 			<array/>
-			<key>Unicode Normalization</key>
-			<integer>0</integer>
-			<key>Unicode Version</key>
-			<integer>9</integer>
 			<key>Unlimited Scrollback</key>
 			<true/>
 			<key>Use Bold Font</key>
@@ -1486,7 +1486,7 @@
 			<key>Non-ASCII Anti Aliased</key>
 			<true/>
 			<key>Normal Font</key>
-			<string>JetBrainsMonoNLNF-Regular 15</string>
+			<string>JetBrainsMonoNFM-Regular 15</string>
 			<key>Open Password Manager Automatically</key>
 			<true/>
 			<key>Option Key Sends</key>
@@ -2448,6 +2448,8 @@
 			<string>kNextWindowPointerAction</string>
 		</dict>
 	</dict>
+	<key>PreserveWindowSizeWhenTabBarVisibilityChanges</key>
+	<true/>
 	<key>Print In Black And White</key>
 	<true/>
 	<key>PromptOnQuit</key>
@@ -2462,13 +2464,21 @@
 	<true/>
 	<key>SoundForEsc</key>
 	<false/>
+	<key>StatusBarPosition</key>
+	<integer>0</integer>
+	<key>StretchTabsToFillBar</key>
+	<true/>
+	<key>TabStyleWithAutomaticOption</key>
+	<integer>6</integer>
 	<key>TabTransform</key>
 	<integer>0</integer>
 	<key>URLHandlersByGuid</key>
 	<dict>
 		<key>ssh</key>
 		<string>CF3545AD-DA2C-4933-8241-2EC09851E1CB</string>
 	</dict>
+	<key>UseBorder</key>
+	<false/>
 	<key>VisualIndicatorForEsc</key>
 	<false/>
 	<key>findMode_iTerm</key>