From dc206adf5e8587d501238f9adee66e40322da39d Mon Sep 17 00:00:00 2001
From: Vardan Pogosian <vardan.pogosyan@gmail.com>
Date: Fri, 1 Nov 2024 18:49:52 +0300
Subject: [PATCH 1/3] updated aliases and iTerm2 config

---
 dotfiles/shell/aliases            |  2 +-
 iterm/com.googlecode.iterm2.plist | 14 +++-----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/dotfiles/shell/aliases b/dotfiles/shell/aliases
index 2ebd63b..37b0328 100644
--- 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
index cff2e4c..493d485 100644
--- 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>
@@ -720,7 +716,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 +769,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 +1478,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>
@@ -2457,7 +2449,7 @@
 	<key>QuitWhenAllWindowsClosed</key>
 	<true/>
 	<key>ShowFullScreenTabBar</key>
-	<true/>
+	<false/>
 	<key>SmartPlacement</key>
 	<true/>
 	<key>SoundForEsc</key>

From c6e347c740c2a56e6a125b4061df8c4e03707818 Mon Sep 17 00:00:00 2001
From: Vardan Pogosian <vardan.pogosyan@gmail.com>
Date: Fri, 1 Nov 2024 19:21:57 +0300
Subject: [PATCH 2/3] udpated vscode settings and set by default catppuccin
 theme

---
 vscode/settings.json | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/vscode/settings.json b/vscode/settings.json
index c5d0d5a..acdae6b 100644
--- a/vscode/settings.json
+++ b/vscode/settings.json
@@ -97,18 +97,20 @@
         "strings": "on"
     },
     "editor.inlineSuggest.syntaxHighlightingEnabled": true,
+    // for catppuccin theme: we try to make semantic highlighting look good
+    "editor.semanticHighlighting.enabled": true,
     //
     // workbench
     //
     "workbench.editor.closeOnFileDelete": true,
     "workbench.editor.revealIfOpen": true,
-    "workbench.iconTheme": "material-icon-theme",
+    "workbench.iconTheme": "catppuccin-frappe",
     "workbench.list.openMode": "singleClick",
-    "workbench.preferredDarkColorTheme": "One Dark Vivid",
-    "workbench.preferredLightColorTheme": "Default Light+",
+    "workbench.preferredDarkColorTheme": "Catppuccin Frappé",
+    "workbench.preferredLightColorTheme": "Catppuccin Latte",
     "workbench.startupEditor": "newUntitledFile",
-    "workbench.colorTheme": "One Dark",
-    "workbench.tree.renderIndentGuides": "none",
+    "workbench.colorTheme": "Catppuccin Frappé",
+    "workbench.tree.renderIndentGuides": "onHover",
     "workbench.tree.indent": 10,
     "workbench.editor.mouseBackForwardToNavigate": false,
     "workbench.editor.limit.value": 16,
@@ -262,12 +264,16 @@
     "terminal.integrated.cursorBlinking": true,
     "terminal.integrated.tabStopWidth": 4,
     "terminal.integrated.fontSize": 14,
+    // for catppuccin theme: prevent VSCode from modifying the terminal colors
+    "terminal.integrated.minimumContrastRatio": 1,
     //
     // window
     //
     "window.autoDetectColorScheme": true,
     "window.newWindowDimensions": "offset",
     "window.openFilesInNewWindow": "off",
+    // for catppuccin theme: make the window's titlebar use the workbench colors
+    "window.titleBarStyle": "custom",
     //
     // search
     //
@@ -319,6 +325,9 @@
         "CreatedTime"
     ],
     "go.toolsManagement.autoUpdate": true,
+    "gopls": {
+        "ui.semanticTokens": true,
+    },
     "redhat.telemetry.enabled": false,
     "security.workspace.trust.untrustedFiles": "open",
     "telemetry.telemetryLevel": "off"

From 608fcf4d4832faa9678ca9e4491128702631dd64 Mon Sep 17 00:00:00 2001
From: Vardan Pogosian <vardan.pogosyan@gmail.com>
Date: Fri, 1 Nov 2024 19:40:43 +0300
Subject: [PATCH 3/3] iTerm2 settings

---
 iterm/com.googlecode.iterm2.plist | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/iterm/com.googlecode.iterm2.plist b/iterm/com.googlecode.iterm2.plist
index 493d485..86b3609 100644
--- a/iterm/com.googlecode.iterm2.plist
+++ b/iterm/com.googlecode.iterm2.plist
@@ -10,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>
@@ -2440,6 +2448,8 @@
 			<string>kNextWindowPointerAction</string>
 		</dict>
 	</dict>
+	<key>PreserveWindowSizeWhenTabBarVisibilityChanges</key>
+	<true/>
 	<key>Print In Black And White</key>
 	<true/>
 	<key>PromptOnQuit</key>
@@ -2449,11 +2459,17 @@
 	<key>QuitWhenAllWindowsClosed</key>
 	<true/>
 	<key>ShowFullScreenTabBar</key>
-	<false/>
+	<true/>
 	<key>SmartPlacement</key>
 	<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>
@@ -2461,6 +2477,8 @@
 		<key>ssh</key>
 		<string>CF3545AD-DA2C-4933-8241-2EC09851E1CB</string>
 	</dict>
+	<key>UseBorder</key>
+	<false/>
 	<key>VisualIndicatorForEsc</key>
 	<false/>
 	<key>findMode_iTerm</key>