gitconfig.local

@@ -19,5 +19,3 @@
   ksdiff = difftool -yt Kaleidoscope
 [tig]
   status-show-untracked-files = yes
-[pull]
-  rebase = false

mackup.cfg

@@ -5,4 +5,3 @@ path = dotfiles-local
 [applications_to_sync]
 dash
 iterm2
-xld

vim/vimrc.d/gui.vim

@@ -4,4 +4,7 @@ if has("gui_running") || has("gui_vimr")
   set guioptions-=r
   set guioptions-=L
   set guioptions-=l
+
+  " Color terminal output
+  set guioptions+=!
 endif

yabairc

@@ -47,9 +47,5 @@ yabai -m config window_gap                   8
 yabai -m rule --add app="^System Preferences$" manage=off
 yabai -m rule --add app="^App Store$" manage=off
 yabai -m rule --add app="^PCalc$" manage=off
-yabai -m rule --add app="^Airfoil$" manage=off
-yabai -m rule --add app="^Finder$" title="Copy" manage=off
-yabai -m rule --add title="Preferences" manage=off
-yabai -m rule --add title='Preferences$' manage=off
 
 echo "yabai configuration loaded.."