Merge branch 'main' into server

tmux/.tmux.conf

@@ -65,7 +65,6 @@ set -g @yank_action 'copy-pipe'
 
 if '[ `uname` == Darwin ]' \
     'source-file ~/.tmux/.mac_config'
-#source-file ~/.tmux/.tmux_config_powerline
 
 set-option -g set-titles on