Merge branch 'master' of ssh://github.com/varp/dotfiles

Author: varp

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"

dotfiles/config/vscode-styles.css

@@ -0,0 +1,3 @@
+* {
+    font-family: "JetBrains Mono", monospace;
+}

dotfiles/shell/functions

@@ -108,7 +108,12 @@ _ppath() {
 ## Shell reload
 
 _reload() {
-  exec -l $SHELL
+  shell_name="$(basename "$SHELL")"
+  if [ "$shell_name" = "zsh" ]; then
+    source "$HOME/.zshrc"
+  else
+    source "$HOME/.bashrc"
+  fi
 }
 
 ## shell reload

dotfiles/ssh/config

@@ -1,26 +1,4 @@
-Include /Users/vardan.pogosyan/.colima/ssh_config
-
-  Host n2-hetzner
-    HostName n2-hetzner
-    User alfa-holod
-
-Host nalog@n2-hetzner
-    HostName n2-hetzner
-    IdentityFile ~/.ssh/id_rsa
-    User nalog
-
-Host tg-check@n2-hetzner
-    HostName n2-hetzner
-    IdentityFile ~/.ssh/id_rsa
-    User tg-check
-
-Host alfacheck@n2-hetzner
-    HostName n2-hetzner
-    User alfacheck
-
-Host eocheck@n2-hetzner
-    HostName n2-hetzner
-    User eocheck
+Include ~/.colima/ssh_config
 
 Host *
     HostName %h

dotfiles/zshrc

@@ -11,7 +11,10 @@ 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,
@@ -127,6 +130,9 @@ autoload -Uz bashcompinit && bashcompinit
 [[ -f "/usr/local/bin/starship" ]] || curl -sS https://starship.rs/install.sh | sh
 eval "$(starship init zsh)"
 
+### custom config which should not be synced with git
+[[ -f "$HOME/.zshrc_profile" ]] && source "$HOME/.zshrc_profile"
+
 ##
 ## PATH without duplicates
 ##

osx/macosx

@@ -31,7 +31,7 @@ defaults write NSGlobalDomain com.apple.springing.delay -float 0.2
 defaults write com.apple.dock mouse-over-hilite-stack -bool true
 
 # Minimize windows into their application’s icon
-defaults write com.apple.dock minimize-to-application -bool true
+defaults write com.apple.dock minimize-to-application -bool false
 
 # Enable spring loading for all Dock items
 # defaults write com.apple.dock enable-spring-load-actions-on-all-items -bool true
@@ -45,6 +45,12 @@ defaults write com.apple.dock mru-spaces -bool false
 # Automatically hide and show the Dock
 # defaults write com.apple.dock autohide -bool true
 
+# Show suggest and recent apps in Dock
+defaults write com.apple.dock show-recents -bool false
+
+# Set display position to right
+defaults write com.apple.dock orientation -string "right"
+
 # Remove the auto-hiding Dock delay
 # defaults write com.apple.dock autohide-delay -float 0.1
 # Remove the animation when hiding/showing the Dock

vscode/keybindings.json

@@ -1,4 +1,4 @@
-// Place your key bindings in this file to override the defaultsauto[]
+// Place your key bindings in this file to override the defaults
 [
   {
     "key": "ctrl+up",
@@ -33,7 +33,7 @@
   },
   {
     "key": "cmd+escape",
-    "command": "workbench.action.showCommands"
+    "command": "workbench.action.quickOpen"
   },
   {
     "key": "shift+cmd+a",
@@ -300,5 +300,5 @@
     "key": "alt+cmd+r",
     "command": "-workbench.action.debug.continue",
     "when": "inDebugMode"
-  },
+  }
 ]