diff --git a/bin/swap_mode.sh b/bin/swap_mode.sh
index a094482..f4a9b27 100755
--- a/bin/swap_mode.sh
+++ b/bin/swap_mode.sh
@@ -28,7 +28,6 @@ else
 fi
 
 # Reload neovim theme
-local keys
 if [ "$MODE" = "light" ]; then
     keys=$'<C-\\><C-n>:silent! let g:light_mode=1 | set background=light |  doautocmd ColorScheme | redraw!<CR>'
 else
diff --git a/config/ghostty/config b/config/ghostty/config
index bd4315e..7815010 100644
--- a/config/ghostty/config
+++ b/config/ghostty/config
@@ -1,12 +1,14 @@
 # --- Basics
 font-family = "IosevkaTermSlab Nerd Font Propo"
 font-style = "Regular"
-font-size = 13
+font-size = 12
 background-opacity = 1.0
+window-decoration = none
+confirm-close-surface = false
 
 # Auto light/dark theme pair that matches your two palettes below
 #theme = dark:my-dark,light:my-light
-theme = zenwritten-light
+theme = zenwritten-dark
 
 # Font-size keybindings (match Ctrl+Shift+j/k from WezTerm)
 keybind = all:ctrl+shift+k=increase_font_size:1
diff --git a/home/.zshrc b/home/.zshrc
index 96fa312..c444029 100644
--- a/home/.zshrc
+++ b/home/.zshrc
@@ -1,7 +1,6 @@
 #==============================================================================
 # Zsh Configuration
 #==============================================================================
-
 # History settings
 HISTFILE=~/.histfile
 HISTSIZE=100000
@@ -79,9 +78,33 @@ zstyle -e ':completion:*:hosts' hosts 'reply=(
 #==============================================================================
 
 # nvm
+# Lazy-load nvm - only initialize when first used
 export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+
+# Function to load nvm (called only once)
+load_nvm() {
+    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+    [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
+}
+
+# Create placeholder functions that load nvm once, then call the real command
+nvm() {
+    unset -f nvm node npm
+    load_nvm
+    nvm "$@"
+}
+
+node() {
+    unset -f nvm node npm  
+    load_nvm
+    node "$@"
+}
+
+npm() {
+    unset -f nvm node npm
+    load_nvm
+    npm "$@"
+}
 
 # ghcup
 [ -f "/home/aselimov/.ghcup/env" ] && . "/home/aselimov/.ghcup/env" # ghcup-env
@@ -119,3 +142,20 @@ bindkey -v
 bindkey '^[[A' history-substring-search-up
 bindkey '^[[B' history-substring-search-down
 
+#==============================================================================
+# OS-Specific Configuration
+#==============================================================================
+
+if [ "$(uname)" = "Darwin" ]; then
+  export PATH="$PATH:/opt/homebrew/bin"
+  alias ls="gls --classify --group-directories-first --color"
+  alias gemini="(source ~/.gemini_project  && gemini)"
+  export NVIM_JDTLS_JAVA_HOME="/Library/Java/JavaVirtualMachines/temurin-21.jdk/Contents/Home/"
+  # I only start tmux by default on Mac because of dwm+swallow patch
+   if [[ -z "$TMUX" ]] && [[ -n "$PS1" ]]; then
+    tmux attach -t dev || tmux new -s dev
+  fi
+else
+  alias ls="ls --classify --group-directories-first --color"
+fi
+