From 5796ee6d7154b932f27cedd78ca94bb4628f68e1 Mon Sep 17 00:00:00 2001
From: Vardan Pogosian <vardan.pogosyan@gmail.com>
Date: Tue, 22 Oct 2024 23:31:12 +0300
Subject: [PATCH] updated zshrc and Brewfile

---
 brew/Brewfile        | 14 +++++++-------
 dotfiles/zshrc       |  2 +-
 vscode/settings.json |  7 +++++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/brew/Brewfile b/brew/Brewfile
index ce1d08d..38a48c2 100644
--- a/brew/Brewfile
+++ b/brew/Brewfile
@@ -3,8 +3,8 @@ tap "homebrew/cask"
 tap "homebrew/core"
 tap "homebrew/services"
 tap "homebrew/cask-fonts"
-tap "shivammathur/php"
-brew "tor", restart_service: true
+#tap "shivammathur/php"
+#brew "tor", restart_service: true
 brew "p7zip"
 brew "bash"
 brew "bash-completion@2"
@@ -18,9 +18,9 @@ brew "micro"
 brew "git"
 brew "git-lfs"
 brew "node"
-brew "composer"
-brew "php@7.4"
-brew "brew-php-switcher"
+#brew "composer"
+#brew "php@7.4"
+#brew "brew-php-switcher"
 brew "go"
 brew "minikube"
 brew "helm"
@@ -42,7 +42,7 @@ cask "whatsapp"
 cask "visual-studio-code"
 cask "dropbox"
 cask "karabiner-elements"
-cask "yandex-disk" # probably stale cask with invalid hash for installer
+#cask "yandex-disk" # probably stale cask with invalid hash for installer
 cask "1password"
 cask "1password/tap/1password-cli"
 cask "postman"
@@ -52,4 +52,4 @@ cask "notion"
 cask "obsidian"
 
 # fonts
-font-jetbrains-mono-nerd-font
+cask "font-jetbrains-mono-nerd-font"
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index 18918c0..63d7c3f 100644
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -11,7 +11,7 @@ source "$HOME/.shell/xvm"
 ##
 export ZSH="$HOME/.oh-my-zsh"
 export KEEP_ZSHRC="yes"
-[[ -d "$ZSH" && -f "$ZSH/oh-my-zsh.sh" ]] || sh -c "export KEEP_ZSHRC=$KEEP_ZSHRC; curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh"
+[[ -d "$ZSH" && -f "$ZSH/oh-my-zsh.sh" ]] || sh -c "$(export KEEP_ZSHRC=$KEEP_ZSHRC; curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
 
 # Set name of the theme to load --- if set to "random", it will
 # load a random theme each time oh-my-zsh is loaded, in which case,
diff --git a/vscode/settings.json b/vscode/settings.json
index ed2b869..d611ff9 100644
--- a/vscode/settings.json
+++ b/vscode/settings.json
@@ -108,7 +108,7 @@
     "workbench.preferredLightColorTheme": "GitHub Light",
     "workbench.sideBar.location": "left",
     "workbench.startupEditor": "newUntitledFile",
-    "workbench.colorTheme": "GitHub Light",
+    "workbench.colorTheme": "One Dark",
     "editor.formatOnPaste": true,
     "editor.formatOnSave": true,
     "editor.formatOnType": true,
@@ -288,5 +288,8 @@
     "workbench.editor.tabActionLocation": "left",
     "editor.accessibilitySupport": "off",
     "github.copilot.editor.enableAutoCompletions": true,
-    "yaml.maxItemsComputed": 10000
+    "yaml.maxItemsComputed": 10000,
+    "[shellscript]": {
+        "editor.defaultFormatter": "foxundermoon.shell-format"
+    }
 }